diff --git a/src/mc/client/common/ClientRewind.h b/src/mc/client/common/ClientRewind.h index 7b2c2635de..c9ebe07301 100644 --- a/src/mc/client/common/ClientRewind.h +++ b/src/mc/client/common/ClientRewind.h @@ -3,26 +3,37 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/common/wrapper/Include.h" -#include "mc/common/wrapper/optional_ref.h" +#include "mc/common/GlobalRead.h" +#include "mc/common/GlobalWrite.h" +#include "mc/common/StrictExecutionContext.h" +#include "mc/common/wrapper/AddRemove.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/deps/core/data/Filter.h" +#include "mc/deps/core/data/Read.h" +#include "mc/deps/core/data/Write.h" +#include "mc/entity/EntityFactoryT.h" #include "mc/world/components/FlagComponent.h" +// auto generated forward declare list +// clang-format off +namespace ClientRewind { struct ApplyReplayStateTrackerRequestComponent; } +// clang-format on + namespace ClientRewind { // NOLINTBEGIN // symbol: -// ?applyData@ClientRewind@@YAXAEBUReplayStateTrackerDiff@@AEAUActorDataFlagComponent@@AEAUActorDataDirtyFlagsComponent@@V?$optional_ref@UActorDataHorseFlagComponent@@@@V?$optional_ref@UActorDataJumpDurationComponent@@@@@Z -MCAPI void -applyData(struct ReplayStateTrackerDiff const&, struct ActorDataFlagComponent&, struct ActorDataDirtyFlagsComponent&, class optional_ref, class optional_ref); - -// symbol: -// ?extractSnapshot@ClientRewind@@YA?AUReplayStateTrackerDiff@@AEBUActorDataFlagComponent@@V?$optional_ref@$$CBUActorDataHorseFlagComponent@@@@V?$optional_ref@$$CBUActorDataJumpDurationComponent@@@@@Z -MCAPI struct ReplayStateTrackerDiff -extractSnapshot(struct ActorDataFlagComponent const&, class optional_ref, class optional_ref); +// ?extractSnapshot@ClientRewind@@YA?AUReplayStateTrackerDiff@@AEBV?$tuple@AEBUActorDataFlagComponent@@V?$Optional@$$CBUActorDataHorseFlagComponent@@@@V?$Optional@$$CBUActorDataJumpDurationComponent@@@@V?$Optional@$$CBUActorDataBoundingBoxComponent@@@@V?$Optional@$$CBUActorDataSeatOffsetComponent@@@@@std@@@Z +MCAPI struct ReplayStateTrackerDiff extractSnapshot(std::tuple< + struct ActorDataFlagComponent const&, + class Optional, + class Optional, + class Optional, + class Optional> const&); // symbol: -// ?tickAccumulate@ClientRewind@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@@entt@@AEAUReplayStateTrackerComponent@@AEBUActorDataFlagComponent@@V?$optional_ref@$$CBUActorDataHorseFlagComponent@@@@V?$optional_ref@$$CBUActorDataJumpDurationComponent@@@@@Z -MCAPI void -tickAccumulate(entt::type_list>>, struct ReplayStateTrackerComponent&, struct ActorDataFlagComponent const&, class optional_ref, class optional_ref); +// ?tickAccumulate@ClientRewind@@YAXAEAUReplayStateTrackerComponent@@AEBV?$tuple@AEBUActorDataFlagComponent@@V?$Optional@$$CBUActorDataHorseFlagComponent@@@@V?$Optional@$$CBUActorDataJumpDurationComponent@@@@V?$Optional@$$CBUActorDataBoundingBoxComponent@@@@V?$Optional@$$CBUActorDataSeatOffsetComponent@@@@@std@@@Z +MCAPI void tickAccumulate(struct ReplayStateTrackerComponent&, std::tuple, class Optional, class Optional, class Optional> const&); // NOLINTEND }; // namespace ClientRewind diff --git a/src/mc/client/network/realms/RealmsStoriesData.h b/src/mc/client/network/realms/RealmsStoriesData.h index 3ff05a5392..7043a917de 100644 --- a/src/mc/client/network/realms/RealmsStoriesData.h +++ b/src/mc/client/network/realms/RealmsStoriesData.h @@ -3,7 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/world/events/RealmsEventId.h" +#include "mc/world/events/RealmEventId.h" class RealmsStoriesData { public: @@ -21,26 +21,26 @@ class RealmsStoriesData { MCAPI void clearAllRealmEventsInLevelData(); // symbol: - // ?getRealmsEventInternalName@RealmsStoriesData@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4RealmsEventId@@@Z - MCAPI std::string const& getRealmsEventInternalName(::RealmsEventId) const; + // ?setPlayerRealmEventPublished@RealmsStoriesData@@QEAAXW4RealmEventId@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI void setPlayerRealmEventPublished(::RealmEventId, std::string const&); - // symbol: - // ?setPlayerRealmsEventPublished@RealmsStoriesData@@QEAAXW4RealmsEventId@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI void setPlayerRealmsEventPublished(::RealmsEventId, std::string const&); - - // symbol: ?setWorldRealmsEventPublished@RealmsStoriesData@@QEAAXW4RealmsEventId@@@Z - MCAPI void setWorldRealmsEventPublished(::RealmsEventId); + // symbol: ?setWorldRealmEventPublished@RealmsStoriesData@@QEAAXW4RealmEventId@@@Z + MCAPI void setWorldRealmEventPublished(::RealmEventId); // symbol: - // ?wasPlayerRealmsEventPublished@RealmsStoriesData@@QEBA_NW4RealmsEventId@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI bool wasPlayerRealmsEventPublished(::RealmsEventId, std::string const&) const; + // ?wasPlayerRealmEventPublished@RealmsStoriesData@@QEBA_NW4RealmEventId@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI bool wasPlayerRealmEventPublished(::RealmEventId, std::string const&) const; - // symbol: ?wasWorldRealmsEventPublished@RealmsStoriesData@@QEBA_NW4RealmsEventId@@@Z - MCAPI bool wasWorldRealmsEventPublished(::RealmsEventId) const; + // symbol: ?wasWorldRealmEventPublished@RealmsStoriesData@@QEBA_NW4RealmEventId@@@Z + MCAPI bool wasWorldRealmEventPublished(::RealmEventId) const; // symbol: ??1RealmsStoriesData@@QEAA@XZ MCAPI ~RealmsStoriesData(); + // symbol: + // ?getRealmEventInternalName@RealmsStoriesData@@SAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4RealmEventId@@@Z + MCAPI static std::string const& getRealmEventInternalName(::RealmEventId); + // symbol: // ?REALMS_STORIES_PREFIX@RealmsStoriesData@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B MCAPI static std::string const REALMS_STORIES_PREFIX; @@ -50,15 +50,15 @@ class RealmsStoriesData { private: // NOLINTBEGIN // symbol: - // ?mRealmsEventInternalNames@RealmsStoriesData@@0V?$map@W4RealmsEventId@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$less@W4RealmsEventId@@@3@V?$allocator@U?$pair@$$CBW4RealmsEventId@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@@3@@std@@B - MCAPI static std::map<::RealmsEventId, std::string> const mRealmsEventInternalNames; + // ?mRealmEventInternalNames@RealmsStoriesData@@0V?$map@W4RealmEventId@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$less@W4RealmEventId@@@3@V?$allocator@U?$pair@$$CBW4RealmEventId@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@@3@@std@@B + MCAPI static std::map<::RealmEventId, std::string> const mRealmEventInternalNames; // NOLINTEND // member accessor public: // NOLINTBEGIN - static auto& $mRealmsEventInternalNames() { return mRealmsEventInternalNames; } + static auto& $mRealmEventInternalNames() { return mRealmEventInternalNames; } // NOLINTEND }; diff --git a/src/mc/client/particle/ServerParticleManager.h b/src/mc/client/particle/ServerParticleManager.h new file mode 100644 index 0000000000..1a27e43537 --- /dev/null +++ b/src/mc/client/particle/ServerParticleManager.h @@ -0,0 +1,28 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/AutomaticID.h" + +class ServerParticleManager { +public: + // prevent constructor by default + ServerParticleManager& operator=(ServerParticleManager const&); + ServerParticleManager(ServerParticleManager const&); + ServerParticleManager(); + +public: + // NOLINTBEGIN + // symbol: ??0ServerParticleManager@@QEAA@_N@Z + MCAPI explicit ServerParticleManager(bool); + + // symbol: ?setPacketSender@ServerParticleManager@@QEAAXAEAVPacketSender@@@Z + MCAPI void setPacketSender(class PacketSender&); + + // symbol: + // ?spawnParticleEffect@ServerParticleManager@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVVec3@@V?$AutomaticID@VDimension@@H@@@Z + MCAPI void spawnParticleEffect(std::string const&, class Vec3 const&, DimensionType); + + // NOLINTEND +}; diff --git a/src/mc/client/social/IdentitySignInTrigger.h b/src/mc/client/social/IdentitySignInTrigger.h new file mode 100644 index 0000000000..3fc23b03c2 --- /dev/null +++ b/src/mc/client/social/IdentitySignInTrigger.h @@ -0,0 +1,9 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace Social { + +enum class IdentitySignInTrigger {}; + +}; diff --git a/src/mc/client/social/OneDSEventListener.h b/src/mc/client/social/OneDSEventListener.h index d34dcdfdaa..5cd31ff850 100644 --- a/src/mc/client/social/OneDSEventListener.h +++ b/src/mc/client/social/OneDSEventListener.h @@ -58,8 +58,8 @@ class OneDSEventListener : public ::Social::Events::AggregationEventListener { // private: // NOLINTBEGIN // symbol: - // ?AddPartA@OneDSEventListener@Events@Social@@AEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVValue@Json@@_N@Z - MCAPI void AddPartA(std::string const& eventName, class Json::Value&, bool); + // ?AddPartA@OneDSEventListener@Events@Social@@AEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVValue@Json@@_J_N@Z + MCAPI void AddPartA(std::string const&, class Json::Value&, int64, bool); // symbol: ?AddPartC@OneDSEventListener@Events@Social@@AEAAXAEBVEvent@23@AEAVValue@Json@@@Z MCAPI void AddPartC(class Social::Events::Event const& event, class Json::Value&); diff --git a/src/mc/common/DurationFieldKeys.h b/src/mc/common/DurationFieldKeys.h new file mode 100644 index 0000000000..cbf3afba23 --- /dev/null +++ b/src/mc/common/DurationFieldKeys.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class DurationFieldKeys { +public: + // prevent constructor by default + DurationFieldKeys& operator=(DurationFieldKeys const&); + DurationFieldKeys(DurationFieldKeys const&); + DurationFieldKeys(); + +public: + // NOLINTBEGIN + // symbol: ??1DurationFieldKeys@@QEAA@XZ + MCAPI ~DurationFieldKeys(); + + // NOLINTEND +}; diff --git a/src/mc/common/GetAttachPositionViews.h b/src/mc/common/GetAttachPositionViews.h index 5200b94cb4..2d58ee09de 100644 --- a/src/mc/common/GetAttachPositionViews.h +++ b/src/mc/common/GetAttachPositionViews.h @@ -6,15 +6,6 @@ struct GetAttachPositionViews { public: // prevent constructor by default GetAttachPositionViews& operator=(GetAttachPositionViews const&); + GetAttachPositionViews(GetAttachPositionViews const&); GetAttachPositionViews(); - -public: - // NOLINTBEGIN - // symbol: ??0GetAttachPositionViews@@QEAA@$$QEAU0@@Z - MCAPI GetAttachPositionViews(struct GetAttachPositionViews&&); - - // symbol: ??0GetAttachPositionViews@@QEAA@AEBU0@@Z - MCAPI GetAttachPositionViews(struct GetAttachPositionViews const&); - - // NOLINTEND }; diff --git a/src/mc/common/IMovementCorrection.h b/src/mc/common/IMovementCorrection.h new file mode 100644 index 0000000000..183dbcddb8 --- /dev/null +++ b/src/mc/common/IMovementCorrection.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct IMovementCorrection { +public: + // prevent constructor by default + IMovementCorrection& operator=(IMovementCorrection const&); + IMovementCorrection(IMovementCorrection const&); + IMovementCorrection(); +}; diff --git a/src/mc/common/StablePriorityQueue.h b/src/mc/common/StablePriorityQueue.h new file mode 100644 index 0000000000..367af46c3d --- /dev/null +++ b/src/mc/common/StablePriorityQueue.h @@ -0,0 +1,12 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +template +struct StablePriorityQueue { +public: + // prevent constructor by default + StablePriorityQueue& operator=(StablePriorityQueue const&); + StablePriorityQueue(StablePriorityQueue const&); + StablePriorityQueue(); +}; diff --git a/src/mc/world/level/block/utils/BlockNameRefAuxVariant.h b/src/mc/common/wrapper/BlockNameRefAuxVariant.h similarity index 83% rename from src/mc/world/level/block/utils/BlockNameRefAuxVariant.h rename to src/mc/common/wrapper/BlockNameRefAuxVariant.h index 2a31c72ac3..87f579d5a9 100644 --- a/src/mc/world/level/block/utils/BlockNameRefAuxVariant.h +++ b/src/mc/common/wrapper/BlockNameRefAuxVariant.h @@ -2,7 +2,7 @@ #include "mc/_HeaderOutputPredefine.h" -namespace SplitBlockUtils { +namespace FlatteningUtils { struct BlockNameRefAuxVariant { public: @@ -12,4 +12,4 @@ struct BlockNameRefAuxVariant { BlockNameRefAuxVariant(); }; -}; // namespace SplitBlockUtils +}; // namespace FlatteningUtils diff --git a/src/mc/common/wrapper/GenerateMessageResult.h b/src/mc/common/wrapper/GenerateMessageResult.h new file mode 100644 index 0000000000..edd56a4463 --- /dev/null +++ b/src/mc/common/wrapper/GenerateMessageResult.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct GenerateMessageResult { +public: + // prevent constructor by default + GenerateMessageResult& operator=(GenerateMessageResult const&); + GenerateMessageResult(GenerateMessageResult const&); + GenerateMessageResult(); + +public: + // NOLINTBEGIN + // symbol: ??1GenerateMessageResult@@QEAA@XZ + MCAPI ~GenerateMessageResult(); + + // NOLINTEND +}; diff --git a/src/mc/common/wrapper/GetMessageResult.h b/src/mc/common/wrapper/GetMessageResult.h deleted file mode 100644 index 9f87905d53..0000000000 --- a/src/mc/common/wrapper/GetMessageResult.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct GetMessageResult { -public: - // prevent constructor by default - GetMessageResult& operator=(GetMessageResult const&); - GetMessageResult(GetMessageResult const&); - GetMessageResult(); - -public: - // NOLINTBEGIN - // symbol: ??1GetMessageResult@@QEAA@XZ - MCAPI ~GetMessageResult(); - - // NOLINTEND -}; diff --git a/src/mc/deps/cereal/BasicFactory.h b/src/mc/deps/cereal/BasicFactory.h new file mode 100644 index 0000000000..a81a579939 --- /dev/null +++ b/src/mc/deps/cereal/BasicFactory.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace cereal { + +template +class BasicFactory { +public: + // prevent constructor by default + BasicFactory& operator=(BasicFactory const&); + BasicFactory(BasicFactory const&); + BasicFactory(); +}; + +}; // namespace cereal diff --git a/src/mc/deps/cereal/CerealComponentItemDataLoader.h b/src/mc/deps/cereal/CerealComponentItemDataLoader.h index 6c9853d70a..70aba5243a 100644 --- a/src/mc/deps/cereal/CerealComponentItemDataLoader.h +++ b/src/mc/deps/cereal/CerealComponentItemDataLoader.h @@ -16,8 +16,8 @@ class CerealComponentItemDataLoader { public: // NOLINTBEGIN - // symbol: ??0CerealComponentItemDataLoader@@QEAA@VSemVersion@@AEAUReflectionCtx@cereal@@@Z - MCAPI CerealComponentItemDataLoader(class SemVersion, struct cereal::ReflectionCtx&); + // symbol: ??0CerealComponentItemDataLoader@@QEAA@VSemVersion@@AEBUReflectionCtx@cereal@@@Z + MCAPI CerealComponentItemDataLoader(class SemVersion, struct cereal::ReflectionCtx const&); // symbol: ??1CerealComponentItemDataLoader@@QEAA@XZ MCAPI ~CerealComponentItemDataLoader(); diff --git a/src/mc/deps/cereal/Factory.h b/src/mc/deps/cereal/Factory.h new file mode 100644 index 0000000000..10f4d6f8e5 --- /dev/null +++ b/src/mc/deps/cereal/Factory.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace cereal { + +template +class Factory { +public: + // prevent constructor by default + Factory& operator=(Factory const&); + Factory(Factory const&); + Factory(); +}; + +}; // namespace cereal diff --git a/src/mc/deps/cereal/FileReference.h b/src/mc/deps/cereal/FileReference.h new file mode 100644 index 0000000000..81277cc052 --- /dev/null +++ b/src/mc/deps/cereal/FileReference.h @@ -0,0 +1,27 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace cereal { struct ReflectionCtx; } +// clang-format on + +namespace CerealHelpers { + +struct FileReference { +public: + // prevent constructor by default + FileReference& operator=(FileReference const&); + FileReference(FileReference const&); + FileReference(); + +public: + // NOLINTBEGIN + // symbol: ?bindType@FileReference@CerealHelpers@@SAXAEAUReflectionCtx@cereal@@@Z + MCAPI static void bindType(struct cereal::ReflectionCtx&); + + // NOLINTEND +}; + +}; // namespace CerealHelpers diff --git a/src/mc/deps/cereal/Identifier.h b/src/mc/deps/cereal/Identifier.h index 15f30b911f..fdc7d2cd47 100644 --- a/src/mc/deps/cereal/Identifier.h +++ b/src/mc/deps/cereal/Identifier.h @@ -14,7 +14,7 @@ namespace cereal::internal { struct ConstraintDescription; } namespace BlockGeometryConstraint { -struct Identifier : public ::cereal::Constraint { +class Identifier : public ::cereal::Constraint { public: // prevent constructor by default Identifier& operator=(Identifier const&); diff --git a/src/mc/deps/cereal/MetaDataPropertyReader.h b/src/mc/deps/cereal/MetaDataPropertyReader.h new file mode 100644 index 0000000000..6a0a322e2a --- /dev/null +++ b/src/mc/deps/cereal/MetaDataPropertyReader.h @@ -0,0 +1,37 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/cereal/PropertyReader.h" + +// auto generated forward declare list +// clang-format off +namespace cereal { class PropertyReader; } +// clang-format on + +namespace cereal { + +class MetaDataPropertyReader : public ::cereal::PropertyReader { +public: + // prevent constructor by default + MetaDataPropertyReader& operator=(MetaDataPropertyReader const&); + MetaDataPropertyReader(MetaDataPropertyReader const&); + MetaDataPropertyReader(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: + // ?getProperty@MetaDataPropertyReader@cereal@@UEBA?AUmeta_prop@entt@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + virtual entt::meta_prop getProperty(std::string const&) const; + + // vIndex: 1, symbol: __gen_??1MetaDataPropertyReader@cereal@@UEAA@XZ + virtual ~MetaDataPropertyReader() = default; + + // symbol: ??0MetaDataPropertyReader@cereal@@QEAA@AEBUmeta_data@entt@@@Z + MCAPI explicit MetaDataPropertyReader(entt::meta_data const&); + + // NOLINTEND +}; + +}; // namespace cereal diff --git a/src/mc/deps/cereal/MetaTypePropertyReader.h b/src/mc/deps/cereal/MetaTypePropertyReader.h new file mode 100644 index 0000000000..6306b7277c --- /dev/null +++ b/src/mc/deps/cereal/MetaTypePropertyReader.h @@ -0,0 +1,37 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/cereal/PropertyReader.h" + +// auto generated forward declare list +// clang-format off +namespace cereal { class PropertyReader; } +// clang-format on + +namespace cereal { + +class MetaTypePropertyReader : public ::cereal::PropertyReader { +public: + // prevent constructor by default + MetaTypePropertyReader& operator=(MetaTypePropertyReader const&); + MetaTypePropertyReader(MetaTypePropertyReader const&); + MetaTypePropertyReader(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: + // ?getProperty@MetaTypePropertyReader@cereal@@UEBA?AUmeta_prop@entt@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + virtual entt::meta_prop getProperty(std::string const&) const; + + // vIndex: 1, symbol: ??1MetaTypePropertyReader@cereal@@UEAA@XZ + virtual ~MetaTypePropertyReader(); + + // symbol: ??0MetaTypePropertyReader@cereal@@QEAA@AEBVmeta_type@entt@@@Z + MCAPI explicit MetaTypePropertyReader(entt::meta_type const&); + + // NOLINTEND +}; + +}; // namespace cereal diff --git a/src/mc/deps/cereal/PropertyReader.h b/src/mc/deps/cereal/PropertyReader.h new file mode 100644 index 0000000000..df2cbda2b3 --- /dev/null +++ b/src/mc/deps/cereal/PropertyReader.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace cereal { + +class PropertyReader { +public: + // prevent constructor by default + PropertyReader& operator=(PropertyReader const&); + PropertyReader(PropertyReader const&); + PropertyReader(); +}; + +}; // namespace cereal diff --git a/src/mc/deps/cereal/RapidJSONSchemaReader.h b/src/mc/deps/cereal/RapidJSONSchemaReader.h index 60768d29b9..4dfc9ebc1d 100644 --- a/src/mc/deps/cereal/RapidJSONSchemaReader.h +++ b/src/mc/deps/cereal/RapidJSONSchemaReader.h @@ -9,8 +9,8 @@ // auto generated forward declare list // clang-format off +namespace cereal { class PropertyReader; } namespace cereal { struct SchemaReader; } -namespace cereal { struct SerializerTraits; } // clang-format on namespace cereal { @@ -37,72 +37,72 @@ class RapidJSONSchemaReader : public ::cereal::SchemaReader { virtual ::cereal::SchemaReaderState isArray() const; // vIndex: 4, symbol: - // ?asBool@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@_NVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asBool(struct cereal::SerializerTraits const&); + // ?asBool@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@_NVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asBool(class cereal::PropertyReader const&); // vIndex: 5, symbol: - // ?asInt8@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@CVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asInt8(struct cereal::SerializerTraits const&); + // ?asInt8@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@CVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asInt8(class cereal::PropertyReader const&); // vIndex: 6, symbol: - // ?asUInt8@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@EVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asUInt8(struct cereal::SerializerTraits const&); + // ?asUInt8@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@EVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asUInt8(class cereal::PropertyReader const&); // vIndex: 7, symbol: - // ?asInt16@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@FVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asInt16(struct cereal::SerializerTraits const&); + // ?asInt16@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@FVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asInt16(class cereal::PropertyReader const&); // vIndex: 8, symbol: - // ?asUInt16@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@GVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asUInt16(struct cereal::SerializerTraits const&); + // ?asUInt16@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@GVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asUInt16(class cereal::PropertyReader const&); // vIndex: 9, symbol: - // ?asInt32@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@HVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asInt32(struct cereal::SerializerTraits const&); + // ?asInt32@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@HVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asInt32(class cereal::PropertyReader const&); // vIndex: 10, symbol: - // ?asUInt32@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@IVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asUInt32(struct cereal::SerializerTraits const&); + // ?asUInt32@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@IVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asUInt32(class cereal::PropertyReader const&); // vIndex: 11, symbol: - // ?asInt64@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@_JVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asInt64(struct cereal::SerializerTraits const&); + // ?asInt64@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@_JVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asInt64(class cereal::PropertyReader const&); // vIndex: 12, symbol: - // ?asUInt64@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@_KVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asUInt64(struct cereal::SerializerTraits const&); + // ?asUInt64@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@_KVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asUInt64(class cereal::PropertyReader const&); // vIndex: 13, symbol: - // ?asFloat@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@MVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asFloat(struct cereal::SerializerTraits const&); + // ?asFloat@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@MVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asFloat(class cereal::PropertyReader const&); // vIndex: 14, symbol: - // ?asDouble@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@NVerror_code@std@@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asDouble(struct cereal::SerializerTraits const&); + // ?asDouble@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@NVerror_code@std@@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asDouble(class cereal::PropertyReader const&); // vIndex: 15, symbol: - // ?asString@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@AEBUSerializerTraits@2@@Z - virtual class Bedrock::Result asString(struct cereal::SerializerTraits const&); + // ?asString@RapidJSONSchemaReader@cereal@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@AEBVPropertyReader@2@@Z + virtual class Bedrock::Result asString(class cereal::PropertyReader const&); - // vIndex: 16, symbol: ?members@RapidJSONSchemaReader@cereal@@UEAA_KAEBUSerializerTraits@2@@Z - virtual uint64 members(struct cereal::SerializerTraits const&); + // vIndex: 16, symbol: ?members@RapidJSONSchemaReader@cereal@@UEAA_KXZ + virtual uint64 members(); - // vIndex: 17, symbol: ?length@RapidJSONSchemaReader@cereal@@UEAA_KAEBUSerializerTraits@2@@Z - virtual uint64 length(struct cereal::SerializerTraits const&); + // vIndex: 17, symbol: ?length@RapidJSONSchemaReader@cereal@@UEAA_KXZ + virtual uint64 length(); // vIndex: 18, symbol: - // ?pushMember@RapidJSONSchemaReader@cereal@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUSerializerTraits@2@@Z - virtual bool pushMember(std::string const&, struct cereal::SerializerTraits const&); + // ?pushMember@RapidJSONSchemaReader@cereal@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPropertyReader@2@@Z + virtual bool pushMember(std::string const&, class cereal::PropertyReader const&); // vIndex: 19, symbol: - // ?pushNextMember@RapidJSONSchemaReader@cereal@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUSerializerTraits@2@@Z - virtual std::string pushNextMember(struct cereal::SerializerTraits const&); + // ?pushNextMember@RapidJSONSchemaReader@cereal@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPropertyReader@2@@Z + virtual std::string pushNextMember(class cereal::PropertyReader const&); - // vIndex: 20, symbol: ?pushElement@RapidJSONSchemaReader@cereal@@UEAAX_KAEBUSerializerTraits@2@@Z - virtual void pushElement(uint64, struct cereal::SerializerTraits const&); + // vIndex: 20, symbol: ?pushElement@RapidJSONSchemaReader@cereal@@UEAAX_KAEBVPropertyReader@2@@Z + virtual void pushElement(uint64, class cereal::PropertyReader const&); - // vIndex: 21, symbol: ?pop@RapidJSONSchemaReader@cereal@@UEAAXAEBUSerializerTraits@2@@Z - virtual void pop(struct cereal::SerializerTraits const&); + // vIndex: 21, symbol: ?pop@RapidJSONSchemaReader@cereal@@UEAAXXZ + virtual void pop(); // vIndex: 22, symbol: ?isSequenceReader@SchemaReader@cereal@@UEBA_NXZ virtual bool isSequenceReader() const; diff --git a/src/mc/deps/cereal/SchemaReader.h b/src/mc/deps/cereal/SchemaReader.h index d127214cf7..afdf8a6abe 100644 --- a/src/mc/deps/cereal/SchemaReader.h +++ b/src/mc/deps/cereal/SchemaReader.h @@ -2,11 +2,6 @@ #include "mc/_HeaderOutputPredefine.h" -// auto generated forward declare list -// clang-format off -namespace cereal { struct SerializerTraits; } -// clang-format on - namespace cereal { struct SchemaReader { @@ -43,8 +38,8 @@ struct SchemaReader { // symbol: ?isSequenceReader@SchemaReader@cereal@@UEBA_NXZ MCVAPI bool isSequenceReader() const; - // symbol: ?scopedPop@SchemaReader@cereal@@QEAA?AUScopedPop@12@AEBUSerializerTraits@2@@Z - MCAPI struct cereal::SchemaReader::ScopedPop scopedPop(struct cereal::SerializerTraits const&); + // symbol: ?scopedPop@SchemaReader@cereal@@QEAA?AUScopedPop@12@XZ + MCAPI struct cereal::SchemaReader::ScopedPop scopedPop(); // NOLINTEND }; diff --git a/src/mc/deps/cereal/SerializerEnumMapping.h b/src/mc/deps/cereal/SerializerEnumMapping.h index d28b7eb2b0..20301cdebb 100644 --- a/src/mc/deps/cereal/SerializerEnumMapping.h +++ b/src/mc/deps/cereal/SerializerEnumMapping.h @@ -8,11 +8,13 @@ class SerializerEnumMapping { public: // prevent constructor by default SerializerEnumMapping& operator=(SerializerEnumMapping const&); - SerializerEnumMapping(SerializerEnumMapping const&); SerializerEnumMapping(); public: // NOLINTBEGIN + // symbol: ??0SerializerEnumMapping@cereal@@QEAA@AEBV01@@Z + MCAPI SerializerEnumMapping(class cereal::SerializerEnumMapping const&); + // symbol: // ?lookup@SerializerEnumMapping@cereal@@QEBA?AV?$optional@_J@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@@Z MCAPI std::optional lookup(std::string const&) const; @@ -28,10 +30,6 @@ class SerializerEnumMapping { std::_Vector_const_iterator>>>> mapping() const; - // symbol: - // ?toString@SerializerEnumMapping@cereal@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - MCAPI std::string toString() const; - // symbol: ??1SerializerEnumMapping@cereal@@QEAA@XZ MCAPI ~SerializerEnumMapping(); diff --git a/src/mc/deps/cereal/SerializerTraits.h b/src/mc/deps/cereal/SerializerTraits.h deleted file mode 100644 index 4e5f6efac7..0000000000 --- a/src/mc/deps/cereal/SerializerTraits.h +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -namespace cereal { - -struct SerializerTraits { -public: - // prevent constructor by default - SerializerTraits& operator=(SerializerTraits const&); - -public: - // NOLINTBEGIN - // symbol: ??0SerializerTraits@cereal@@QEAA@XZ - MCAPI SerializerTraits(); - - // symbol: ??0SerializerTraits@cereal@@QEAA@$$QEAU01@@Z - MCAPI SerializerTraits(struct cereal::SerializerTraits&&); - - // symbol: ??0SerializerTraits@cereal@@QEAA@AEBU01@@Z - MCAPI SerializerTraits(struct cereal::SerializerTraits const&); - - // symbol: ?name@SerializerTraits@cereal@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - MCAPI std::string const& name() const; - - // symbol: - // ?name@SerializerTraits@cereal@@QEAAAEAU12@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI struct cereal::SerializerTraits& name(std::string); - - // symbol: - // ?namedSchema@SerializerTraits@cereal@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - MCAPI std::string const& namedSchema() const; - - // symbol: - // ?namedSchema@SerializerTraits@cereal@@QEAAAEAU12@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI struct cereal::SerializerTraits& namedSchema(std::string); - - // symbol: - // ?setEnumDocumentation@SerializerTraits@cereal@@QEAAXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI void setEnumDocumentation(std::string); - - // symbol: ??1SerializerTraits@cereal@@QEAA@XZ - MCAPI ~SerializerTraits(); - - // NOLINTEND -}; - -}; // namespace cereal diff --git a/src/mc/deps/cereal/cereal.h b/src/mc/deps/cereal/cereal.h index c48a3af21f..bd9e22fd04 100644 --- a/src/mc/deps/cereal/cereal.h +++ b/src/mc/deps/cereal/cereal.h @@ -17,6 +17,7 @@ namespace cereal { class BasicLoader; } namespace cereal { class BasicSaver; } namespace cereal { class Constraint; } namespace cereal { class NumericConstraint; } +namespace cereal { class PropertyReader; } namespace cereal { class SerializerContext; } namespace cereal { class SerializerEnumMapping; } namespace cereal { class StringConstraint; } @@ -24,13 +25,11 @@ namespace cereal { struct ReflectionCtx; } namespace cereal { struct SchemaDescription; } namespace cereal { struct SchemaReader; } namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } namespace cereal::ext { struct JSONSchema; } namespace cereal::ext::internal { struct JSONSchemaBody; } namespace cereal::ext::internal { struct JSONSchemaDef; } namespace cereal::ext::internal { struct JSONSchemaInfo; } namespace cereal::ext::internal { struct JSONSchemaValidation; } -namespace cereal::internal { class BasicCompositeSchema; } namespace cereal::internal { class BasicSchema; } namespace cereal::internal { class SchemaFactory; } namespace cereal::internal { class UndefinedSchema; } @@ -44,19 +43,32 @@ namespace cereal::internal { struct SchemaName; } namespace cereal { // NOLINTBEGIN +// symbol: +// ?documentation@cereal@@YAPEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVmeta_type@entt@@@Z +MCAPI std::string const* documentation(entt::meta_type const&); + +// symbol: +// ?documentation@cereal@@YAPEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVmeta_type@entt@@I@Z +MCAPI std::string const* documentation(entt::meta_type const&, uint); + // symbol: ?enttHash@cereal@@YAIAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI uint enttHash(std::string const&); // symbol: ?fillOptional@cereal@@YA?AVmeta_any@entt@@AEAV23@@Z MCAPI entt::meta_any fillOptional(entt::meta_any&); -// symbol: ?getEnumMapping@cereal@@YAPEBVSerializerEnumMapping@1@AEBVmeta_type@entt@@@Z -MCAPI class cereal::SerializerEnumMapping const* getEnumMapping(entt::meta_type const&); +// symbol: ?getEnumMapping@cereal@@YAPEBVSerializerEnumMapping@1@AEBUReflectionCtx@1@AEBVmeta_type@entt@@@Z +MCAPI class cereal::SerializerEnumMapping const* +getEnumMapping(struct cereal::ReflectionCtx const&, entt::meta_type const&); // symbol: ?getEnumMapping@cereal@@YAPEBVSerializerEnumMapping@1@AEBUReflectionCtx@1@AEBVmeta_type@entt@@I@Z MCAPI class cereal::SerializerEnumMapping const* getEnumMapping(struct cereal::ReflectionCtx const&, entt::meta_type const&, uint); +// symbol: +// ?getName@cereal@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUReflectionCtx@1@AEBVmeta_type@entt@@I@Z +MCAPI std::string getName(struct cereal::ReflectionCtx const&, entt::meta_type const&, uint); + // symbol: // ?getSchemaDescription@cereal@@YA?AUSchemaDescription@1@AEBUReflectionCtx@1@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI struct cereal::SchemaDescription getSchemaDescription(struct cereal::ReflectionCtx const&, std::string const&); @@ -66,18 +78,18 @@ MCAPI struct cereal::SchemaDescription getSchemaDescription(struct cereal::Refle MCAPI std::vector getSchemaDescriptions(struct cereal::ReflectionCtx const&); // symbol: -// ?getSchemaName@cereal@@YAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVmeta_type@entt@@@Z -MCAPI std::string const& getSchemaName(entt::meta_type const&); +// ?getSchemaName@cereal@@YAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUReflectionCtx@1@AEBVmeta_type@entt@@@Z +MCAPI std::string const& getSchemaName(struct cereal::ReflectionCtx const&, entt::meta_type const&); // symbol: ?isOptional@cereal@@YA_NAEBVmeta_type@entt@@@Z MCAPI bool isOptional(entt::meta_type const&); -// symbol: ?metaDataTraits@cereal@@YAPEBUSerializerTraits@1@AEBUmeta_data@entt@@@Z -MCAPI struct cereal::SerializerTraits const* metaDataTraits(entt::meta_data const&); - // symbol: ?resolve@cereal@@YA?AVmeta_type@entt@@AEBUReflectionCtx@1@AEBUtype_info@3@@Z MCAPI entt::meta_type resolve(struct cereal::ReflectionCtx const&, entt::type_info const&); +// symbol: ?resolve@cereal@@YA?AVmeta_type@entt@@AEBUReflectionCtx@1@I@Z +MCAPI entt::meta_type resolve(struct cereal::ReflectionCtx const&, uint); + // symbol: ?tryGetOptionalValue@cereal@@YA?AVmeta_any@entt@@Umeta_handle@3@@Z MCAPI entt::meta_any tryGetOptionalValue(entt::meta_handle); diff --git a/src/mc/deps/cereal/internal/BasicCompositeSchema.h b/src/mc/deps/cereal/internal/BasicCompositeSchema.h deleted file mode 100644 index 9118df9780..0000000000 --- a/src/mc/deps/cereal/internal/BasicCompositeSchema.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/deps/cereal/internal/BasicSchema.h" - -// auto generated forward declare list -// clang-format off -namespace cereal { class SerializerContext; } -namespace cereal { class SerializerEnumMapping; } -namespace cereal { struct SchemaDescription; } -namespace cereal { struct SchemaReader; } -namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } -namespace cereal::internal { class BasicSchema; } -// clang-format on - -namespace cereal::internal { - -class BasicCompositeSchema : public ::cereal::internal::BasicSchema { -public: - // prevent constructor by default - BasicCompositeSchema& operator=(BasicCompositeSchema const&); - BasicCompositeSchema(BasicCompositeSchema const&); - BasicCompositeSchema(); - -public: - // NOLINTBEGIN - // vIndex: 4, symbol: ??1BasicCompositeSchema@internal@cereal@@UEAA@XZ - virtual ~BasicCompositeSchema(); - - // symbol: - // ?addMember@BasicCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@USerializerTraits@3@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@@Z - MCVAPI void - addMember(std::string const&, struct cereal::SerializerTraits, std::unique_ptr); - - // symbol: - // ?addParent@BasicCompositeSchema@internal@cereal@@UEAAXV?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@@Z - MCVAPI void addParent(std::unique_ptr); - - // symbol: - // ?addRequiredMember@BasicCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@USerializerTraits@3@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@@Z - MCVAPI void - addRequiredMember(std::string const&, struct cereal::SerializerTraits, std::unique_ptr); - - // symbol: - // ?addSetter@BasicCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@@Z - MCVAPI void addSetter(std::string const&, std::unique_ptr); - - // symbol: - // ?customError@BasicCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z - MCVAPI void customError(std::string const&, std::string const&); - - // NOLINTEND -}; - -}; // namespace cereal::internal diff --git a/src/mc/deps/cereal/internal/BasicGenericTypeSchema.h b/src/mc/deps/cereal/internal/BasicGenericTypeSchema.h index 97bdd999a7..24ccb7d432 100644 --- a/src/mc/deps/cereal/internal/BasicGenericTypeSchema.h +++ b/src/mc/deps/cereal/internal/BasicGenericTypeSchema.h @@ -10,11 +10,9 @@ namespace cereal { class Constraint; } namespace cereal { class SerializerContext; } namespace cereal { class SerializerEnumMapping; } -namespace cereal { struct ReflectionCtx; } namespace cereal { struct SchemaDescription; } namespace cereal { struct SchemaReader; } namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } namespace cereal::internal { class BasicSchema; } // clang-format on @@ -32,35 +30,26 @@ class BasicGenericTypeSchema : public ::cereal::internal::BasicSchema { // vIndex: 4, symbol: __gen_??1BasicGenericTypeSchema@internal@cereal@@UEAA@XZ virtual ~BasicGenericTypeSchema() = default; - // symbol: - // ??0BasicGenericTypeSchema@internal@cereal@@QEAA@AEBUReflectionCtx@2@V?$unique_ptr@VConstraint@cereal@@U?$default_delete@VConstraint@cereal@@@std@@@std@@@Z - MCAPI BasicGenericTypeSchema(struct cereal::ReflectionCtx const&, std::unique_ptr); - // NOLINTEND // protected: // NOLINTBEGIN // symbol: - // ?doLoadWithSchema@BasicGenericTypeSchema@internal@cereal@@IEBAXAEBVmeta_type@entt@@AEAUSchemaReader@3@AEAVmeta_any@5@AEBUSerializerTraits@3@AEBV75@AEAVSerializerContext@3@AEBUtype_info@5@@Z + // ?doLoadWithSchema@BasicGenericTypeSchema@internal@cereal@@IEBAXAEBVmeta_type@entt@@AEAUSchemaReader@3@AEAVmeta_any@5@AEBV75@AEAVSerializerContext@3@AEBUtype_info@5@@Z MCAPI void - doLoadWithSchema(entt::meta_type const&, struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&, entt::type_info const&) + doLoadWithSchema(entt::meta_type const&, struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&, entt::type_info const&) const; // symbol: - // ?doSaveWithSchema@BasicGenericTypeSchema@internal@cereal@@IEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEBUSerializerTraits@3@AEAVSerializerContext@3@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + // ?doSaveWithSchema@BasicGenericTypeSchema@internal@cereal@@IEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEAVSerializerContext@3@AEBUtype_info@6@@Z MCAPI void - doSaveWithSchema(struct cereal::SchemaWriter&, entt::meta_any const&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&, std::string const&) + doSaveWithSchema(struct cereal::SchemaWriter&, entt::meta_any const&, class cereal::SerializerContext&, entt::type_info const&) const; // symbol: - // ?lookupSchema@BasicGenericTypeSchema@internal@cereal@@IEBAPEBVBasicSchema@23@AEAVSerializerContext@3@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI class cereal::internal::BasicSchema const* - lookupSchema(class cereal::SerializerContext&, std::string const&) const; - - // symbol: - // ?unpackWithInfo@BasicGenericTypeSchema@internal@cereal@@IEBAXAEBUtype_info@entt@@AEAV?$vector@V?$reference_wrapper@$$CBVBasicSchema@internal@cereal@@@std@@V?$allocator@V?$reference_wrapper@$$CBVBasicSchema@internal@cereal@@@std@@@2@@std@@AEAV?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@@std@@@2@@5@@Z + // ?unpackWithInfo@BasicGenericTypeSchema@internal@cereal@@IEBAXAEBUtype_info@entt@@AEAV?$vector@V?$reference_wrapper@$$CBUSetterDescriptor@BasicSchema@internal@cereal@@@std@@V?$allocator@V?$reference_wrapper@$$CBUSetterDescriptor@BasicSchema@internal@cereal@@@std@@@2@@std@@AEAV?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@@std@@@2@@5@@Z MCAPI void - unpackWithInfo(entt::type_info const&, std::vector>&, entt::dense_map>&) + unpackWithInfo(entt::type_info const&, std::vector>&, entt::dense_map>&) const; // NOLINTEND diff --git a/src/mc/deps/cereal/internal/BasicSchema.h b/src/mc/deps/cereal/internal/BasicSchema.h index e6040ac3bb..86fed569cf 100644 --- a/src/mc/deps/cereal/internal/BasicSchema.h +++ b/src/mc/deps/cereal/internal/BasicSchema.h @@ -11,7 +11,6 @@ namespace cereal { struct ReflectionCtx; } namespace cereal { struct SchemaDescription; } namespace cereal { struct SchemaReader; } namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } // clang-format on namespace cereal::internal { @@ -21,6 +20,7 @@ class BasicSchema { // BasicSchema inner types declare // clang-format off struct MemberDescriptor; + struct SetterDescriptor; // clang-format on // BasicSchema inner types define @@ -33,16 +33,27 @@ class BasicSchema { public: // NOLINTBEGIN - // symbol: ??4MemberDescriptor@BasicSchema@internal@cereal@@QEAAAEAU0123@$$QEAU0123@@Z - MCAPI struct cereal::internal::BasicSchema::MemberDescriptor& - operator=(struct cereal::internal::BasicSchema::MemberDescriptor&&); - // symbol: ??1MemberDescriptor@BasicSchema@internal@cereal@@QEAA@XZ MCAPI ~MemberDescriptor(); // NOLINTEND }; + struct SetterDescriptor { + public: + // prevent constructor by default + SetterDescriptor& operator=(SetterDescriptor const&); + SetterDescriptor(SetterDescriptor const&); + SetterDescriptor(); + + public: + // NOLINTBEGIN + // symbol: ??1SetterDescriptor@BasicSchema@internal@cereal@@QEAA@XZ + MCAPI ~SetterDescriptor(); + + // NOLINTEND + }; + public: // prevent constructor by default BasicSchema& operator=(BasicSchema const&); @@ -52,42 +63,62 @@ class BasicSchema { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?doLoad@BasicSchema@internal@cereal@@EEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBUSerializerTraits@3@AEBV56@AEAVSerializerContext@3@@Z + // ?doLoad@BasicSchema@internal@cereal@@EEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBV56@AEAVSerializerContext@3@@Z virtual void - doLoad(struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&) + doLoad(struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&) const; // vIndex: 1, symbol: - // ?doSave@BasicSchema@internal@cereal@@EEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEBUSerializerTraits@3@AEAVSerializerContext@3@@Z - virtual void - doSave(struct cereal::SchemaWriter&, entt::meta_any const&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&) - const; + // ?doSave@BasicSchema@internal@cereal@@EEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEAVSerializerContext@3@@Z + virtual void doSave(struct cereal::SchemaWriter&, entt::meta_any const&, class cereal::SerializerContext&) const; // vIndex: 2, symbol: ?doVerifyInitialization@BasicSchema@internal@cereal@@EEBA_NAEBVmeta_any@entt@@@Z virtual bool doVerifyInitialization(entt::meta_any const&) const; - // vIndex: 3, symbol: ?makeDescription@?$CompositeSchema@_NX@internal@cereal@@EEBA?AUSchemaDescription@3@XZ + // vIndex: 3, symbol: ?makeDescription@?$TypeSchema@_NX@internal@cereal@@EEBA?AUSchemaDescription@3@XZ virtual struct cereal::SchemaDescription makeDescription() const = 0; // vIndex: 4, symbol: ??1BasicSchema@internal@cereal@@UEAA@XZ virtual ~BasicSchema(); // vIndex: 5, symbol: - // ?unpack@BasicSchema@internal@cereal@@UEBAXAEAV?$vector@V?$reference_wrapper@$$CBVBasicSchema@internal@cereal@@@std@@V?$allocator@V?$reference_wrapper@$$CBVBasicSchema@internal@cereal@@@std@@@2@@std@@AEAV?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@@std@@@2@@entt@@@Z + // ?unpack@BasicSchema@internal@cereal@@UEBAXAEAV?$vector@V?$reference_wrapper@$$CBUSetterDescriptor@BasicSchema@internal@cereal@@@std@@V?$allocator@V?$reference_wrapper@$$CBUSetterDescriptor@BasicSchema@internal@cereal@@@std@@@2@@std@@AEAV?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@@std@@@2@@entt@@@Z virtual void - unpack(std::vector>&, entt::dense_map>&) + unpack(std::vector>&, entt::dense_map>&) const; - // vIndex: 6, symbol: ?enumMapping@BasicSchema@internal@cereal@@UEBAPEBVSerializerEnumMapping@3@XZ + // vIndex: 6, symbol: ?enumMapping@BasicSchema@internal@cereal@@UEAAXVSerializerEnumMapping@3@@Z + virtual void enumMapping(class cereal::SerializerEnumMapping); + + // vIndex: 7, symbol: ?enumMapping@BasicSchema@internal@cereal@@UEBAPEBVSerializerEnumMapping@3@XZ virtual class cereal::SerializerEnumMapping const* enumMapping() const; + // vIndex: 8, symbol: + // ?addParent@BasicSchema@internal@cereal@@UEAAXV?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@@Z + virtual void addParent(std::unique_ptr); + + // vIndex: 9, symbol: + // ?addSetter@BasicSchema@internal@cereal@@UEAAXV?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@AEBUtype_info@entt@@@Z + virtual void addSetter(std::unique_ptr, entt::type_info const&); + + // vIndex: 10, symbol: + // ?addMember@BasicSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@_N@Z + virtual void addMember(std::string const&, std::unique_ptr, bool); + + // vIndex: 11, symbol: + // ?customError@BasicSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z + virtual void customError(std::string const&, std::string const&); + + // vIndex: 12, symbol: + // ?constraint@BasicSchema@internal@cereal@@UEAAXV?$unique_ptr@VConstraint@cereal@@U?$default_delete@VConstraint@cereal@@@std@@@std@@@Z + virtual void constraint(std::unique_ptr); + + // vIndex: 13, symbol: ?constraint@BasicSchema@internal@cereal@@UEBAPEBVConstraint@3@XZ + virtual class cereal::Constraint const* constraint() const; + // symbol: ??0BasicSchema@internal@cereal@@QEAA@AEBUReflectionCtx@2@@Z MCAPI explicit BasicSchema(struct cereal::ReflectionCtx const&); - // symbol: - // ??0BasicSchema@internal@cereal@@QEAA@AEBUReflectionCtx@2@V?$unique_ptr@VConstraint@cereal@@U?$default_delete@VConstraint@cereal@@@std@@@std@@@Z - MCAPI BasicSchema(struct cereal::ReflectionCtx const&, std::unique_ptr); - // symbol: ?ctx@BasicSchema@internal@cereal@@QEBAAEBUReflectionCtx@3@XZ MCAPI struct cereal::ReflectionCtx const& ctx() const; @@ -102,27 +133,15 @@ class BasicSchema { MCAPI bool isProperlyInitialized(entt::meta_any const&) const; // symbol: - // ?load@BasicSchema@internal@cereal@@QEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBUSerializerTraits@3@AEBV56@AEAVSerializerContext@3@@Z + // ?load@BasicSchema@internal@cereal@@QEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBV56@AEAVSerializerContext@3@@Z MCAPI void - load(struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&) - const; + load(struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&) const; - // symbol: - // ?save@BasicSchema@internal@cereal@@QEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEBUSerializerTraits@3@AEAVSerializerContext@3@@Z - MCAPI void - save(struct cereal::SchemaWriter&, entt::meta_any const&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&) - const; + // symbol: ?save@BasicSchema@internal@cereal@@QEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEAVSerializerContext@3@@Z + MCAPI void save(struct cereal::SchemaWriter&, entt::meta_any const&, class cereal::SerializerContext&) const; - // symbol: ?traits@BasicSchema@internal@cereal@@QEBAAEBUSerializerTraits@3@XZ - MCAPI struct cereal::SerializerTraits const& traits() const; - - // symbol: ?traits@BasicSchema@internal@cereal@@QEAAXUSerializerTraits@3@@Z - MCAPI void traits(struct cereal::SerializerTraits); - - // symbol: - // ?lookup@BasicSchema@internal@cereal@@SAAEBV123@AEBUReflectionCtx@3@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI static class cereal::internal::BasicSchema const& - lookup(struct cereal::ReflectionCtx const&, std::string const&); + // symbol: ?lookup@BasicSchema@internal@cereal@@SAAEBV123@AEBUReflectionCtx@3@I@Z + MCAPI static class cereal::internal::BasicSchema const& lookup(struct cereal::ReflectionCtx const&, uint); // NOLINTEND }; diff --git a/src/mc/deps/cereal/internal/DefaultCompositeSchema.h b/src/mc/deps/cereal/internal/DefaultCompositeSchema.h index 741c6d1d9b..67756f5766 100644 --- a/src/mc/deps/cereal/internal/DefaultCompositeSchema.h +++ b/src/mc/deps/cereal/internal/DefaultCompositeSchema.h @@ -3,25 +3,23 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/deps/cereal/internal/BasicCompositeSchema.h" #include "mc/deps/cereal/internal/BasicSchema.h" // auto generated forward declare list // clang-format off +namespace cereal { class Constraint; } namespace cereal { class SerializerContext; } namespace cereal { class SerializerEnumMapping; } namespace cereal { struct ReflectionCtx; } namespace cereal { struct SchemaDescription; } namespace cereal { struct SchemaReader; } namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } -namespace cereal::internal { class BasicCompositeSchema; } namespace cereal::internal { class BasicSchema; } // clang-format on namespace cereal::internal { -class DefaultCompositeSchema : public ::cereal::internal::BasicCompositeSchema { +class DefaultCompositeSchema : public ::cereal::internal::BasicSchema { public: // prevent constructor by default DefaultCompositeSchema& operator=(DefaultCompositeSchema const&); @@ -31,46 +29,35 @@ class DefaultCompositeSchema : public ::cereal::internal::BasicCompositeSchema { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?doLoad@DefaultCompositeSchema@internal@cereal@@EEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBUSerializerTraits@3@AEBV56@AEAVSerializerContext@3@@Z + // ?doLoad@DefaultCompositeSchema@internal@cereal@@EEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBV56@AEAVSerializerContext@3@@Z virtual void - doLoad(struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&) + doLoad(struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&) const; // vIndex: 1, symbol: - // ?doSave@DefaultCompositeSchema@internal@cereal@@EEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEBUSerializerTraits@3@AEAVSerializerContext@3@@Z - virtual void - doSave(struct cereal::SchemaWriter&, entt::meta_any const&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&) - const; - - // vIndex: 3, symbol: ?makeDescription@DefaultCompositeSchema@internal@cereal@@EEBA?AUSchemaDescription@3@XZ - virtual struct cereal::SchemaDescription makeDescription() const; + // ?doSave@DefaultCompositeSchema@internal@cereal@@EEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEAVSerializerContext@3@@Z + virtual void doSave(struct cereal::SchemaWriter&, entt::meta_any const&, class cereal::SerializerContext&) const; - // vIndex: 4, symbol: ??1DefaultCompositeSchema@internal@cereal@@UEAA@XZ - virtual ~DefaultCompositeSchema(); + // vIndex: 4, symbol: __gen_??1DefaultCompositeSchema@internal@cereal@@UEAA@XZ + virtual ~DefaultCompositeSchema() = default; // vIndex: 5, symbol: - // ?unpack@DefaultCompositeSchema@internal@cereal@@UEBAXAEAV?$vector@V?$reference_wrapper@$$CBVBasicSchema@internal@cereal@@@std@@V?$allocator@V?$reference_wrapper@$$CBVBasicSchema@internal@cereal@@@std@@@2@@std@@AEAV?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@@std@@@2@@entt@@@Z + // ?unpack@DefaultCompositeSchema@internal@cereal@@UEBAXAEAV?$vector@V?$reference_wrapper@$$CBUSetterDescriptor@BasicSchema@internal@cereal@@@std@@V?$allocator@V?$reference_wrapper@$$CBUSetterDescriptor@BasicSchema@internal@cereal@@@std@@@2@@std@@AEAV?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$reference_wrapper@$$CBUMemberDescriptor@BasicSchema@internal@cereal@@@2@@std@@@2@@entt@@@Z virtual void - unpack(std::vector>&, entt::dense_map>&) + unpack(std::vector>&, entt::dense_map>&) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?addParent@DefaultCompositeSchema@internal@cereal@@UEAAXV?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@@Z virtual void addParent(std::unique_ptr); - // vIndex: 8, symbol: - // ?addSetter@DefaultCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@@Z - virtual void addSetter(std::string const&, std::unique_ptr); - // vIndex: 9, symbol: - // ?addMember@DefaultCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@USerializerTraits@3@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@@Z - virtual void - addMember(std::string const&, struct cereal::SerializerTraits, std::unique_ptr); + // ?addSetter@DefaultCompositeSchema@internal@cereal@@UEAAXV?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@AEBUtype_info@entt@@@Z + virtual void addSetter(std::unique_ptr, entt::type_info const&); // vIndex: 10, symbol: - // ?addRequiredMember@DefaultCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@USerializerTraits@3@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@@Z - virtual void - addRequiredMember(std::string const&, struct cereal::SerializerTraits, std::unique_ptr); + // ?addMember@DefaultCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@5@_N@Z + virtual void addMember(std::string const&, std::unique_ptr, bool); // vIndex: 11, symbol: // ?customError@DefaultCompositeSchema@internal@cereal@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z @@ -81,19 +68,11 @@ class DefaultCompositeSchema : public ::cereal::internal::BasicCompositeSchema { // NOLINTEND - // private: + // protected: // NOLINTBEGIN // symbol: - // ?loadMember@DefaultCompositeSchema@internal@cereal@@AEBAXAEBVBasicSchema@23@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAUSchemaReader@3@AEAVmeta_any@entt@@AEBUSerializerTraits@3@AEBV89@AEAVSerializerContext@3@@Z - MCAPI void - loadMember(class cereal::internal::BasicSchema const&, std::string const&, struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&) - const; - - // symbol: - // ?loadSetter@DefaultCompositeSchema@internal@cereal@@AEBAXAEBVBasicSchema@23@AEAUSchemaReader@3@AEAVmeta_any@entt@@AEBUSerializerTraits@3@AEBV67@AEAVSerializerContext@3@@Z - MCAPI void - loadSetter(class cereal::internal::BasicSchema const&, struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&) - const; + // ?makeDescriptionForType@DefaultCompositeSchema@internal@cereal@@IEBA?AUSchemaDescription@3@AEBVmeta_type@entt@@@Z + MCAPI struct cereal::SchemaDescription makeDescriptionForType(entt::meta_type const&) const; // NOLINTEND }; diff --git a/src/mc/deps/cereal/internal/Schema.h b/src/mc/deps/cereal/internal/Schema.h index 46a04026a0..aa314968ea 100644 --- a/src/mc/deps/cereal/internal/Schema.h +++ b/src/mc/deps/cereal/internal/Schema.h @@ -29,9 +29,8 @@ struct Schema { // symbol: ??0Schema@internal@cereal@@QEAA@AEBVBasicSchema@12@@Z MCAPI explicit Schema(class cereal::internal::BasicSchema const&); - // symbol: - // ??0Schema@internal@cereal@@QEAA@AEBUReflectionCtx@2@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI Schema(struct cereal::ReflectionCtx const&, std::string const&); + // symbol: ??0Schema@internal@cereal@@QEAA@AEBUReflectionCtx@2@I@Z + MCAPI Schema(struct cereal::ReflectionCtx const&, uint); // symbol: // ?getErrors@Schema@internal@cereal@@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@@XZ @@ -41,6 +40,9 @@ struct Schema { // ?getLog@Schema@internal@cereal@@QEBAAEBV?$vector@ULogEntry@SerializerContext@cereal@@V?$allocator@ULogEntry@SerializerContext@cereal@@@std@@@std@@XZ MCAPI std::vector const& getLog() const; + // symbol: ?isDefined@Schema@internal@cereal@@QEBA_NXZ + MCAPI bool isDefined() const; + // symbol: ?load@Schema@internal@cereal@@QEAA_NAEAUSchemaReader@3@Umeta_handle@entt@@AEBVmeta_any@6@@Z MCAPI bool load(struct cereal::SchemaReader&, entt::meta_handle, entt::meta_any const&); diff --git a/src/mc/deps/cereal/internal/SchemaFactory.h b/src/mc/deps/cereal/internal/SchemaFactory.h index 89bc92f9aa..30e3df6100 100644 --- a/src/mc/deps/cereal/internal/SchemaFactory.h +++ b/src/mc/deps/cereal/internal/SchemaFactory.h @@ -4,8 +4,10 @@ // auto generated forward declare list // clang-format off +namespace cereal { class Constraint; } +namespace cereal { class SerializerEnumMapping; } namespace cereal { struct ReflectionCtx; } -namespace cereal::internal { class BasicCompositeSchema; } +namespace cereal::internal { class BasicSchema; } // clang-format on namespace cereal::internal { @@ -19,6 +21,12 @@ class SchemaFactory { public: // NOLINTBEGIN + // symbol: ?context@SchemaFactory@internal@cereal@@QEBAAEAUReflectionCtx@3@XZ + MCAPI struct cereal::ReflectionCtx& context() const; + + // symbol: ?enumMapping@SchemaFactory@internal@cereal@@QEAAXVSerializerEnumMapping@3@@Z + MCAPI void enumMapping(class cereal::SerializerEnumMapping); + // symbol: // ?error@SchemaFactory@internal@cereal@@QEAAAEAV123@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI class cereal::internal::SchemaFactory& error(std::string const&); @@ -32,9 +40,23 @@ class SchemaFactory { // private: // NOLINTBEGIN // symbol: - // ??0SchemaFactory@internal@cereal@@AEAA@AEAUReflectionCtx@2@V?$unique_ptr@VBasicCompositeSchema@internal@cereal@@U?$default_delete@VBasicCompositeSchema@internal@cereal@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@@Z - MCAPI - SchemaFactory(struct cereal::ReflectionCtx&, std::unique_ptr, std::string const&); + // ??0SchemaFactory@internal@cereal@@AEAA@AEAUReflectionCtx@2@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@I@Z + MCAPI SchemaFactory( + struct cereal::ReflectionCtx&, + std::unique_ptr, + std::string const&, + uint + ); + + // symbol: + // ?doBind@SchemaFactory@internal@cereal@@AEAAAEAV123@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@_NV?$unique_ptr@VConstraint@cereal@@U?$default_delete@VConstraint@cereal@@@std@@@5@V?$optional@VSerializerEnumMapping@cereal@@@5@@Z + MCAPI class cereal::internal::SchemaFactory& + doBind(std::unique_ptr, std::string const&, bool, std::unique_ptr, std::optional); + + // symbol: + // ?doSetter@SchemaFactory@internal@cereal@@AEAAAEAV123@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@AEBUtype_info@entt@@V?$unique_ptr@VConstraint@cereal@@U?$default_delete@VConstraint@cereal@@@std@@@5@@Z + MCAPI class cereal::internal::SchemaFactory& + doSetter(std::unique_ptr, entt::type_info const&, std::unique_ptr); // NOLINTEND }; diff --git a/src/mc/deps/cereal/internal/SetterGetterSchema.h b/src/mc/deps/cereal/internal/SetterGetterSchema.h new file mode 100644 index 0000000000..ec47e348ba --- /dev/null +++ b/src/mc/deps/cereal/internal/SetterGetterSchema.h @@ -0,0 +1,64 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/cereal/internal/BasicSchema.h" + +// auto generated forward declare list +// clang-format off +namespace cereal { class Constraint; } +namespace cereal { class SerializerContext; } +namespace cereal { class SerializerEnumMapping; } +namespace cereal { struct ReflectionCtx; } +namespace cereal { struct SchemaDescription; } +namespace cereal { struct SchemaReader; } +namespace cereal { struct SchemaWriter; } +namespace cereal::internal { class BasicSchema; } +// clang-format on + +namespace cereal::internal { + +class SetterGetterSchema : public ::cereal::internal::BasicSchema { +public: + // prevent constructor by default + SetterGetterSchema& operator=(SetterGetterSchema const&); + SetterGetterSchema(SetterGetterSchema const&); + SetterGetterSchema(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: + // ?doLoad@SetterGetterSchema@internal@cereal@@EEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBV56@AEAVSerializerContext@3@@Z + virtual void + doLoad(struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&) + const; + + // vIndex: 1, symbol: + // ?doSave@SetterGetterSchema@internal@cereal@@EEBAXAEAUSchemaWriter@3@AEBVmeta_any@entt@@AEAVSerializerContext@3@@Z + virtual void doSave(struct cereal::SchemaWriter&, entt::meta_any const&, class cereal::SerializerContext&) const; + + // vIndex: 2, symbol: ?doVerifyInitialization@SetterGetterSchema@internal@cereal@@EEBA_NAEBVmeta_any@entt@@@Z + virtual bool doVerifyInitialization(entt::meta_any const&) const; + + // vIndex: 3, symbol: ?makeDescription@SetterGetterSchema@internal@cereal@@EEBA?AUSchemaDescription@3@XZ + virtual struct cereal::SchemaDescription makeDescription() const; + + // vIndex: 4, symbol: __gen_??1SetterGetterSchema@internal@cereal@@UEAA@XZ + virtual ~SetterGetterSchema() = default; + + // vIndex: 6, symbol: ?enumMapping@SetterGetterSchema@internal@cereal@@UEAAXVSerializerEnumMapping@3@@Z + virtual void enumMapping(class cereal::SerializerEnumMapping); + + // vIndex: 7, symbol: ?enumMapping@SetterGetterSchema@internal@cereal@@UEBAPEBVSerializerEnumMapping@3@XZ + virtual class cereal::SerializerEnumMapping const* enumMapping() const; + + // symbol: + // ??0SetterGetterSchema@internal@cereal@@QEAA@AEBUReflectionCtx@2@V?$unique_ptr@VBasicSchema@internal@cereal@@U?$default_delete@VBasicSchema@internal@cereal@@@std@@@std@@1@Z + MCAPI + SetterGetterSchema(struct cereal::ReflectionCtx const&, std::unique_ptr, std::unique_ptr); + + // NOLINTEND +}; + +}; // namespace cereal::internal diff --git a/src/mc/deps/cereal/internal/UndefinedSchema.h b/src/mc/deps/cereal/internal/UndefinedSchema.h index 976f14fe8b..ad51a73c97 100644 --- a/src/mc/deps/cereal/internal/UndefinedSchema.h +++ b/src/mc/deps/cereal/internal/UndefinedSchema.h @@ -7,12 +7,12 @@ // auto generated forward declare list // clang-format off +namespace cereal { class Constraint; } namespace cereal { class SerializerContext; } namespace cereal { class SerializerEnumMapping; } namespace cereal { struct SchemaDescription; } namespace cereal { struct SchemaReader; } namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } namespace cereal::internal { class BasicSchema; } // clang-format on @@ -28,9 +28,9 @@ class UndefinedSchema : public ::cereal::internal::BasicSchema { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?doLoad@UndefinedSchema@internal@cereal@@EEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBUSerializerTraits@3@AEBV56@AEAVSerializerContext@3@@Z + // ?doLoad@UndefinedSchema@internal@cereal@@EEBAXAEAUSchemaReader@3@AEAVmeta_any@entt@@AEBV56@AEAVSerializerContext@3@@Z virtual void - doLoad(struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&) + doLoad(struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&) const; // vIndex: 3, symbol: ?makeDescription@UndefinedSchema@internal@cereal@@EEBA?AUSchemaDescription@3@XZ diff --git a/src/mc/deps/cereal/internal/internal.h b/src/mc/deps/cereal/internal/internal.h index 3aead760f2..33709db2c9 100644 --- a/src/mc/deps/cereal/internal/internal.h +++ b/src/mc/deps/cereal/internal/internal.h @@ -16,8 +16,6 @@ namespace cereal { struct ReflectionCtx; } namespace cereal { struct SchemaDescription; } namespace cereal { struct SchemaReader; } namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } -namespace cereal::internal { class BasicCompositeSchema; } namespace cereal::internal { class BasicSchema; } namespace cereal::internal { class SchemaFactory; } namespace cereal::internal { class UndefinedSchema; } @@ -32,39 +30,35 @@ namespace cereal::internal { struct SchemaName; } namespace cereal::internal { // NOLINTBEGIN // symbol: -// ?derefAndLoad@internal@cereal@@YAXAEBVBasicSchema@12@AEAUSchemaReader@2@AEAVmeta_any@entt@@AEBUSerializerTraits@2@AEBV56@AEAVSerializerContext@2@@Z +// ?derefAndLoad@internal@cereal@@YAXAEBVBasicSchema@12@AEAUSchemaReader@2@AEAVmeta_any@entt@@AEBV56@AEAVSerializerContext@2@@Z MCAPI void -derefAndLoad(class cereal::internal::BasicSchema const&, struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&); +derefAndLoad(class cereal::internal::BasicSchema const&, struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&); // symbol: -// ?derefAndSave@internal@cereal@@YAXAEBVBasicSchema@12@AEAUSchemaWriter@2@AEBVmeta_any@entt@@AEBUSerializerTraits@2@AEAVSerializerContext@2@@Z +// ?derefAndSave@internal@cereal@@YAXAEBVBasicSchema@12@AEAUSchemaWriter@2@AEBVmeta_any@entt@@AEAVSerializerContext@2@@Z MCAPI void -derefAndSave(class cereal::internal::BasicSchema const&, struct cereal::SchemaWriter&, entt::meta_any const&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&); +derefAndSave(class cereal::internal::BasicSchema const&, struct cereal::SchemaWriter&, entt::meta_any const&, class cereal::SerializerContext&); -// symbol: ?getMapper@internal@cereal@@YAPEBVSerializerEnumMapping@2@AEBVmeta_type@entt@@PEBV32@@Z +// symbol: ?getMapper@internal@cereal@@YAPEBVSerializerEnumMapping@2@AEBUReflectionCtx@2@AEBVmeta_type@entt@@PEBV32@@Z MCAPI class cereal::SerializerEnumMapping const* -getMapper(entt::meta_type const&, class cereal::SerializerEnumMapping const*); +getMapper(struct cereal::ReflectionCtx const&, entt::meta_type const&, class cereal::SerializerEnumMapping const*); // symbol: -// ?getMapperAndLoad@internal@cereal@@YAXAEBVmeta_type@entt@@PEBVSerializerEnumMapping@2@AEAUSchemaReader@2@AEAVmeta_any@4@AEBUSerializerTraits@2@AEAVSerializerContext@2@P6A_N_J3@Z@Z +// ?getMapperAndLoad@internal@cereal@@YAXAEBUReflectionCtx@2@AEBVmeta_type@entt@@PEBVSerializerEnumMapping@2@AEAUSchemaReader@2@AEAVmeta_any@5@AEAVSerializerContext@2@P6A_N_J4@Z@Z MCAPI void getMapperAndLoad( + struct cereal::ReflectionCtx const&, entt::meta_type const&, class cereal::SerializerEnumMapping const*, struct cereal::SchemaReader&, entt::meta_any&, - struct cereal::SerializerTraits const&, class cereal::SerializerContext&, bool (*)(int64, entt::meta_any&) ); // symbol: -// ?getMapperAndSave@internal@cereal@@YAXAEBVmeta_any@entt@@AEBVmeta_type@4@PEBVSerializerEnumMapping@2@AEAUSchemaWriter@2@AEBUSerializerTraits@2@AEAVSerializerContext@2@@Z +// ?getMapperAndSave@internal@cereal@@YAXAEBUReflectionCtx@2@AEBVmeta_any@entt@@AEBVmeta_type@5@PEBVSerializerEnumMapping@2@AEAUSchemaWriter@2@AEAVSerializerContext@2@@Z MCAPI void -getMapperAndSave(entt::meta_any const&, entt::meta_type const&, class cereal::SerializerEnumMapping const*, struct cereal::SchemaWriter&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&); - -// symbol: ?getReflectedSchema@internal@cereal@@YAPEBVBasicSchema@12@AEBUReflectionCtx@2@AEBVmeta_type@entt@@@Z -MCAPI class cereal::internal::BasicSchema const* -getReflectedSchema(struct cereal::ReflectionCtx const&, entt::meta_type const&); +getMapperAndSave(struct cereal::ReflectionCtx const&, entt::meta_any const&, entt::meta_type const&, class cereal::SerializerEnumMapping const*, struct cereal::SchemaWriter&, class cereal::SerializerContext&); // symbol: ?getReflectedType@internal@cereal@@YA?AW4ReflectedType@12@AEBVmeta_type@entt@@@Z MCAPI ::cereal::internal::ReflectedType getReflectedType(entt::meta_type const&); @@ -74,32 +68,29 @@ MCAPI ::cereal::internal::ReflectedType getReflectedType(entt::meta_type const&) MCAPI std::string getSchemaName(struct cereal::ReflectionCtx const&, entt::type_info const&); // symbol: -// ?iterateAssociativeContainer@internal@cereal@@YAXAEBUReflectionCtx@2@AEBVmeta_type@entt@@11AEBVBasicSchema@12@2AEAUSchemaReader@2@AEAVmeta_any@5@AEBUSerializerTraits@2@AEBV85@AEAVSerializerContext@2@@Z -MCAPI void -iterateAssociativeContainer(struct cereal::ReflectionCtx const&, entt::meta_type const&, entt::meta_type const&, entt::meta_type const&, class cereal::internal::BasicSchema const&, class cereal::internal::BasicSchema const&, struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&); +// ?iterateAssociativeContainer@internal@cereal@@YAXAEBUReflectionCtx@2@AEBVmeta_type@entt@@11AEBVBasicSchema@12@2AEAUSchemaReader@2@AEAVmeta_any@5@AEBV85@AEAVSerializerContext@2@@Z +MCAPI void iterateAssociativeContainer(struct cereal::ReflectionCtx const&, entt::meta_type const&, entt::meta_type const&, entt::meta_type const&, class cereal::internal::BasicSchema const&, class cereal::internal::BasicSchema const&, struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&); // symbol: -// ?iterateSequenceContainer@internal@cereal@@YAXAEBVBasicSchema@12@AEBVmeta_type@entt@@AEAUSchemaReader@2@AEAVmeta_any@5@AEBUSerializerTraits@2@AEBV75@AEAVSerializerContext@2@@Z +// ?iterateSequenceContainer@internal@cereal@@YAXAEBVBasicSchema@12@AEBVmeta_type@entt@@AEAUSchemaReader@2@AEAVmeta_any@5@AEBV75@AEAVSerializerContext@2@@Z MCAPI void -iterateSequenceContainer(class cereal::internal::BasicSchema const&, entt::meta_type const&, struct cereal::SchemaReader&, entt::meta_any&, struct cereal::SerializerTraits const&, entt::meta_any const&, class cereal::SerializerContext&); +iterateSequenceContainer(class cereal::internal::BasicSchema const&, entt::meta_type const&, struct cereal::SchemaReader&, entt::meta_any&, entt::meta_any const&, class cereal::SerializerContext&); -// symbol: -// ?lookup@internal@cereal@@YAPEBVBasicCompositeSchema@12@AEBUReflectionCtx@2@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z -MCAPI class cereal::internal::BasicCompositeSchema const* -lookup(struct cereal::ReflectionCtx const&, std::string const&); +// symbol: ?lookup@internal@cereal@@YAPEBVBasicSchema@12@AEBUReflectionCtx@2@I@Z +MCAPI class cereal::internal::BasicSchema const* lookup(struct cereal::ReflectionCtx const&, uint); // symbol: ??8internal@cereal@@YA_NAEBUSchemaName@01@0@Z MCAPI bool operator==(struct cereal::internal::SchemaName const&, struct cereal::internal::SchemaName const&); // symbol: -// ?saveAssociativeContainer@internal@cereal@@YAXAEBUReflectionCtx@2@AEBVmeta_type@entt@@AEBVmeta_any@5@AEBVBasicSchema@12@3AEAUSchemaWriter@2@AEBUSerializerTraits@2@AEAVSerializerContext@2@@Z +// ?saveAssociativeContainer@internal@cereal@@YAXAEBUReflectionCtx@2@AEBVmeta_type@entt@@AEBVmeta_any@5@AEBVBasicSchema@12@3AEAUSchemaWriter@2@AEAVSerializerContext@2@@Z MCAPI void -saveAssociativeContainer(struct cereal::ReflectionCtx const&, entt::meta_type const&, entt::meta_any const&, class cereal::internal::BasicSchema const&, class cereal::internal::BasicSchema const&, struct cereal::SchemaWriter&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&); +saveAssociativeContainer(struct cereal::ReflectionCtx const&, entt::meta_type const&, entt::meta_any const&, class cereal::internal::BasicSchema const&, class cereal::internal::BasicSchema const&, struct cereal::SchemaWriter&, class cereal::SerializerContext&); // symbol: -// ?saveSequenceContainer@internal@cereal@@YAXAEBVBasicSchema@12@AEAUSchemaWriter@2@AEBVmeta_any@entt@@AEBUSerializerTraits@2@AEAVSerializerContext@2@@Z +// ?saveSequenceContainer@internal@cereal@@YAXAEBVBasicSchema@12@AEAUSchemaWriter@2@AEBVmeta_any@entt@@AEAVSerializerContext@2@@Z MCAPI void -saveSequenceContainer(class cereal::internal::BasicSchema const&, struct cereal::SchemaWriter&, entt::meta_any const&, struct cereal::SerializerTraits const&, class cereal::SerializerContext&); +saveSequenceContainer(class cereal::internal::BasicSchema const&, struct cereal::SchemaWriter&, entt::meta_any const&, class cereal::SerializerContext&); // symbol: ?shouldHavename@internal@cereal@@YA_NW4ReflectedType@12@@Z MCAPI bool shouldHavename(::cereal::internal::ReflectedType); diff --git a/src/mc/deps/core/Core.h b/src/mc/deps/core/Core.h index fdfb775014..14328301c9 100644 --- a/src/mc/deps/core/Core.h +++ b/src/mc/deps/core/Core.h @@ -22,6 +22,7 @@ #include "mc/deps/core/common/bedrock/NonOwnerPointer.h" #include "mc/deps/core/common/bedrock/Result.h" #include "mc/deps/core/common/bedrock/ThreadLocalObject.h" +#include "mc/deps/core/common/bedrock/UniqueLock.h" // auto generated forward declare list // clang-format off diff --git a/src/mc/deps/core/FileImpl.h b/src/mc/deps/core/FileImpl.h index 9b3a6527e0..033b1bdf26 100644 --- a/src/mc/deps/core/FileImpl.h +++ b/src/mc/deps/core/FileImpl.h @@ -4,6 +4,7 @@ // auto generated inclusion list #include "mc/deps/core/PathBuffer.h" +#include "mc/deps/core/common/bedrock/UniqueLock.h" // auto generated forward declare list // clang-format off @@ -132,6 +133,9 @@ class FileImpl { // private: // NOLINTBEGIN + // symbol: ?_lockIfWriteBuffered@FileImpl@Core@@AEAA?AV?$UniqueLock@Vrecursive_mutex@std@@@Threading@Bedrock@@_N@Z + MCAPI class Bedrock::Threading::UniqueLock _lockIfWriteBuffered(bool); + // symbol: ?_writeOperation@FileImpl@Core@@AEAA?AVResult@2@$$QEAV32@_K@Z MCAPI class Core::Result _writeOperation(class Core::Result&& result, uint64 numBytesWritten); diff --git a/src/mc/deps/core/common/bedrock/Bedrock.h b/src/mc/deps/core/common/bedrock/Bedrock.h index bcbef24f16..a24d3d1a85 100644 --- a/src/mc/deps/core/common/bedrock/Bedrock.h +++ b/src/mc/deps/core/common/bedrock/Bedrock.h @@ -21,6 +21,7 @@ #include "mc/deps/core/common/bedrock/PlatformBootstrap.h" #include "mc/deps/core/common/bedrock/RequestPriority.h" #include "mc/deps/core/common/bedrock/ResponseBodyType.h" +#include "mc/deps/core/common/bedrock/StaticOptimizedString.h" #include "mc/deps/core/common/bedrock/WorkerTaskStats.h" #include "mc/deps/core/common/bedrock/list.h" #include "mc/deps/core/common/bedrock/pubsub/ConnectPosition.h" @@ -42,6 +43,7 @@ namespace Bedrock { class FilePickerManager; } namespace Bedrock { class IApplicationDataStores; } namespace Bedrock { class IIslandCore; } namespace Bedrock { class PlatformBootstrap; } +namespace Bedrock { class StaticOptimizedString; } namespace Bedrock { class WorkerPoolHandleInterface; } namespace Bedrock { class WorkerPoolManager; } namespace Bedrock { struct CallStack; } @@ -91,6 +93,7 @@ namespace Bedrock::Threading { class OSThreadPriority; } namespace Bedrock::Threading { class SharedRecursiveMutexBase; } namespace Bedrock::Threading::AsyncResult { class ToXAsyncBlock; } namespace Core { class Path; } +namespace Core { class Result; } // clang-format on namespace Bedrock { diff --git a/src/mc/deps/core/common/bedrock/FlushingIOController.h b/src/mc/deps/core/common/bedrock/FlushingIOController.h new file mode 100644 index 0000000000..e7f34337fc --- /dev/null +++ b/src/mc/deps/core/common/bedrock/FlushingIOController.h @@ -0,0 +1,27 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace Core { class Result; } +// clang-format on + +namespace Bedrock { + +class FlushingIOController { +public: + // prevent constructor by default + FlushingIOController& operator=(FlushingIOController const&); + FlushingIOController(FlushingIOController const&); + FlushingIOController(); + +public: + // NOLINTBEGIN + // symbol: ?flush@FlushingIOController@Bedrock@@QEAA?AVResult@Core@@XZ + MCAPI class Core::Result flush(); + + // NOLINTEND +}; + +}; // namespace Bedrock diff --git a/src/mc/deps/core/common/bedrock/IDimensionFactory.h b/src/mc/deps/core/common/bedrock/IDimensionFactory.h deleted file mode 100644 index 2b64e3bbf5..0000000000 --- a/src/mc/deps/core/common/bedrock/IDimensionFactory.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" - -// auto generated forward declare list -// clang-format off -namespace Bedrock { class EnableNonOwnerReferences; } -// clang-format on - -class IDimensionFactory : public ::Bedrock::EnableNonOwnerReferences { -public: - // prevent constructor by default - IDimensionFactory& operator=(IDimensionFactory const&); - IDimensionFactory(IDimensionFactory const&); - IDimensionFactory(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: ??1IDimensionFactory@@UEAA@XZ - virtual ~IDimensionFactory(); - - // NOLINTEND -}; diff --git a/src/mc/deps/core/common/bedrock/ServerTextSettings.h b/src/mc/deps/core/common/bedrock/ServerTextSettings.h new file mode 100644 index 0000000000..1650c28b37 --- /dev/null +++ b/src/mc/deps/core/common/bedrock/ServerTextSettings.h @@ -0,0 +1,32 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" + +// auto generated forward declare list +// clang-format off +namespace Bedrock { class EnableNonOwnerReferences; } +// clang-format on + +class ServerTextSettings : public ::Bedrock::EnableNonOwnerReferences { +public: + // prevent constructor by default + ServerTextSettings& operator=(ServerTextSettings const&); + ServerTextSettings(ServerTextSettings const&); + ServerTextSettings(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ServerTextSettings@@UEAA@XZ + virtual ~ServerTextSettings() = default; + + // symbol: ??0ServerTextSettings@@QEAA@AEBV?$bitset@$02@std@@@Z + MCAPI explicit ServerTextSettings(std::bitset<3> const&); + + // symbol: ?getEnabledServerTextEvents@ServerTextSettings@@QEBAAEBV?$bitset@$02@std@@XZ + MCAPI std::bitset<3> const& getEnabledServerTextEvents() const; + + // NOLINTEND +}; diff --git a/src/mc/deps/core/common/bedrock/StaticOptimizedString.h b/src/mc/deps/core/common/bedrock/StaticOptimizedString.h new file mode 100644 index 0000000000..c76924c38c --- /dev/null +++ b/src/mc/deps/core/common/bedrock/StaticOptimizedString.h @@ -0,0 +1,38 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace Bedrock { + +class StaticOptimizedString { +public: + // StaticOptimizedString inner types define + enum class StorageType {}; + +public: + // prevent constructor by default + StaticOptimizedString& operator=(StaticOptimizedString const&); + StaticOptimizedString(); + +public: + // NOLINTBEGIN + // symbol: ??0StaticOptimizedString@Bedrock@@QEAA@$$QEAV01@@Z + MCAPI StaticOptimizedString(class Bedrock::StaticOptimizedString&&); + + // symbol: ??0StaticOptimizedString@Bedrock@@QEAA@AEBV01@@Z + MCAPI StaticOptimizedString(class Bedrock::StaticOptimizedString const&); + + // symbol: ??1StaticOptimizedString@Bedrock@@QEAA@XZ + MCAPI ~StaticOptimizedString(); + + // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: ?_set@StaticOptimizedString@Bedrock@@AEAAXPEBD_KW4StorageType@12@@Z + MCAPI void _set(char const*, uint64, ::Bedrock::StaticOptimizedString::StorageType); + + // NOLINTEND +}; + +}; // namespace Bedrock diff --git a/src/mc/deps/core/debug/log/ContentLog.h b/src/mc/deps/core/debug/log/ContentLog.h index 8dfa55eeee..18e4d76261 100644 --- a/src/mc/deps/core/debug/log/ContentLog.h +++ b/src/mc/deps/core/debug/log/ContentLog.h @@ -7,6 +7,11 @@ #include "mc/enums/LogAreaID.h" #include "mc/enums/LogLevel.h" +// auto generated forward declare list +// clang-format off +namespace Bedrock { class StaticOptimizedString; } +// clang-format on + class ContentLog { public: // ContentLog inner types declare @@ -41,8 +46,8 @@ class ContentLog { public: // NOLINTBEGIN - // symbol: ??0ContentLogScope@ContentLog@@QEAA@VContentScopeString@@@Z - MCAPI explicit ContentLogScope(class ContentScopeString); + // symbol: ??0ContentLogScope@ContentLog@@QEAA@VStaticOptimizedString@Bedrock@@@Z + MCAPI explicit ContentLogScope(class Bedrock::StaticOptimizedString); // symbol: ??1ContentLogScope@ContentLog@@QEAA@XZ MCAPI ~ContentLogScope(); diff --git a/src/mc/deps/core/debug/log/ContentScopeString.h b/src/mc/deps/core/debug/log/ContentScopeString.h deleted file mode 100644 index 451abffcbf..0000000000 --- a/src/mc/deps/core/debug/log/ContentScopeString.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -class ContentScopeString { -public: - // prevent constructor by default - ContentScopeString& operator=(ContentScopeString const&); - ContentScopeString(ContentScopeString const&); - ContentScopeString(); - -public: - // NOLINTBEGIN - // symbol: ??0ContentScopeString@@QEAA@PEBD@Z - MCAPI explicit ContentScopeString(char const*); - - // symbol: ??0ContentScopeString@@QEAA@$$QEAV0@@Z - MCAPI ContentScopeString(class ContentScopeString&&); - - // symbol: ??0ContentScopeString@@QEAA@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI explicit ContentScopeString(std::string); - - // symbol: ??0ContentScopeString@@QEAA@V?$basic_string_view@DU?$char_traits@D@std@@@std@@@Z - MCAPI explicit ContentScopeString(std::string_view); - - // symbol: ?getScopeString@ContentScopeString@@QEBA?AV?$basic_string_view@DU?$char_traits@D@std@@@std@@XZ - MCAPI std::string_view getScopeString() const; - - // symbol: ??1ContentScopeString@@QEAA@XZ - MCAPI ~ContentScopeString(); - - // NOLINTEND -}; diff --git a/src/mc/deps/core/utility/CrashDumpLog.h b/src/mc/deps/core/utility/CrashDumpLog.h index 820f10d8e9..0192065ed0 100644 --- a/src/mc/deps/core/utility/CrashDumpLog.h +++ b/src/mc/deps/core/utility/CrashDumpLog.h @@ -28,6 +28,10 @@ class CrashDumpLog { // symbol: ?setAssertMessage@CrashDumpLog@@SAXPEBDH00@Z MCAPI static void setAssertMessage(char const*, int, char const*, char const*); + // symbol: + // ?setBehaviorPackIds@CrashDumpLog@@SAXAEBV?$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@@@Z + MCAPI static void setBehaviorPackIds(std::vector const&); + // symbol: ?setDeviceSessionID@CrashDumpLog@@SA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI static bool setDeviceSessionID(std::string const&); diff --git a/src/mc/deps/core/utility/CrashDumpLogHelper.h b/src/mc/deps/core/utility/CrashDumpLogHelper.h new file mode 100644 index 0000000000..6ad8836c61 --- /dev/null +++ b/src/mc/deps/core/utility/CrashDumpLogHelper.h @@ -0,0 +1,12 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace CrashDumpLogHelper { +// NOLINTBEGIN +// symbol: +// ?writeStringsToBuffer@CrashDumpLogHelper@@YAXAEBV?$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@@PEAD_K@Z +MCAPI void writeStringsToBuffer(std::vector const&, char*, uint64); +// NOLINTEND + +}; // namespace CrashDumpLogHelper diff --git a/src/mc/deps/core/utility/FallDistanceUtility.h b/src/mc/deps/core/utility/FallDistanceUtility.h deleted file mode 100644 index 40313690b8..0000000000 --- a/src/mc/deps/core/utility/FallDistanceUtility.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -namespace FallDistanceUtility { -// NOLINTBEGIN -// symbol: ?computeAdjustedFallDistance@FallDistanceUtility@@YAMMMM@Z -MCAPI float computeAdjustedFallDistance(float, float, float); -// NOLINTEND - -}; // namespace FallDistanceUtility diff --git a/src/mc/deps/core/utility/LootTableUtils.h b/src/mc/deps/core/utility/LootTableUtils.h index 1b26ed3a83..21839de966 100644 --- a/src/mc/deps/core/utility/LootTableUtils.h +++ b/src/mc/deps/core/utility/LootTableUtils.h @@ -34,6 +34,10 @@ class LootTableUtils { public: // NOLINTBEGIN + // symbol: + // ?convertFromJavaLootTableName@LootTableUtils@Util@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV34@@Z + MCAPI static std::string convertFromJavaLootTableName(std::string const&); + // symbol: // ?dropItems@LootTableUtils@Util@@SAHAEAVBlockSource@@AEAVSpawner@@PEAVActor@@AEBV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEBVBlockPos@@@Z MCAPI static int dropItems( diff --git a/src/mc/deps/core/utility/ReadOnlyBinaryStream.h b/src/mc/deps/core/utility/ReadOnlyBinaryStream.h index 9706a6bb6f..5c215a7137 100644 --- a/src/mc/deps/core/utility/ReadOnlyBinaryStream.h +++ b/src/mc/deps/core/utility/ReadOnlyBinaryStream.h @@ -81,12 +81,12 @@ class ReadOnlyBinaryStream { MCAPI class Bedrock::Result getSignedShort(); // symbol: - // ?getString@ReadOnlyBinaryStream@@QEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@XZ - MCAPI class Bedrock::Result getString(); + // ?getString@ReadOnlyBinaryStream@@QEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@_K@Z + MCAPI class Bedrock::Result getString(uint64); // symbol: - // ?getString@ReadOnlyBinaryStream@@QEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI class Bedrock::Result getString(std::string&); + // ?getString@ReadOnlyBinaryStream@@QEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_K@Z + MCAPI class Bedrock::Result getString(std::string&, uint64); // symbol: ?getUnsignedChar@ReadOnlyBinaryStream@@QEAA?AV?$Result@EVerror_code@std@@@Bedrock@@XZ MCAPI class Bedrock::Result getUnsignedChar(); diff --git a/src/mc/deps/core/utility/TradeAnimationsUtility.h b/src/mc/deps/core/utility/TradeAnimationsUtility.h new file mode 100644 index 0000000000..26360c050f --- /dev/null +++ b/src/mc/deps/core/utility/TradeAnimationsUtility.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace TradeAnimationsUtility { +// NOLINTBEGIN +// symbol: ?updateRaiseArmAmount@TradeAnimationsUtility@@YAX_NAEAM@Z +MCAPI void updateRaiseArmAmount(bool, float&); +// NOLINTEND + +}; // namespace TradeAnimationsUtility diff --git a/src/mc/deps/core/utility/WindBurstUtility.h b/src/mc/deps/core/utility/WindBurstUtility.h new file mode 100644 index 0000000000..9e907e154a --- /dev/null +++ b/src/mc/deps/core/utility/WindBurstUtility.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace WindBurstUtility { +// NOLINTBEGIN +// symbol: ?burst@WindBurstUtility@@YAXAEBUWindBurstComponent@@AEAVActor@@AEBVVec3@@@Z +MCAPI void burst(struct WindBurstComponent const&, class Actor&, class Vec3 const&); +// NOLINTEND + +}; // namespace WindBurstUtility diff --git a/src/mc/deps/json/JsonUtil.h b/src/mc/deps/json/JsonUtil.h index d4134dc7dc..4ffbf771f5 100644 --- a/src/mc/deps/json/JsonUtil.h +++ b/src/mc/deps/json/JsonUtil.h @@ -69,6 +69,9 @@ MCAPI bool parseItemColor(::ItemColor&, class Json::Value const& root); // symbol: ?parseRange@JsonUtil@@YA_NAEBVValue@Json@@AEAH1@Z MCAPI bool parseRange(class Json::Value const& root, int& outMin, int& outMax); +// symbol: ?parseVec2@JsonUtil@@YA_NAEAVVec2@@AEBVValue@Json@@@Z +MCAPI bool parseVec2(class Vec2&, class Json::Value const&); + // symbol: ?parseVec3@JsonUtil@@YA_NAEAVVec3@@AEBVValue@Json@@@Z MCAPI bool parseVec3(class Vec3& outVec, class Json::Value const& root); diff --git a/src/mc/deps/puv/CerealUpgraderBase.h b/src/mc/deps/puv/CerealUpgraderBase.h index 3c105ecd38..2258dca460 100644 --- a/src/mc/deps/puv/CerealUpgraderBase.h +++ b/src/mc/deps/puv/CerealUpgraderBase.h @@ -76,10 +76,16 @@ class CerealUpgraderBase { // private: // NOLINTBEGIN // symbol: - // ?copy@CerealUpgraderBase@internal@Puv@@AEBAXAEAVmeta_any@entt@@0AEAUUpgradeState@123@PEBVSerializerEnumMapping@cereal@@2@Z - MCAPI void - copy(entt::meta_any&, entt::meta_any&, struct Puv::internal::CerealUpgraderBase::UpgradeState&, class cereal::SerializerEnumMapping const*, class cereal::SerializerEnumMapping const*) - const; + // ?copy@CerealUpgraderBase@internal@Puv@@AEBAXAEAVmeta_any@entt@@0AEAUUpgradeState@123@AEBVmeta_type@5@I2I@Z + MCAPI void copy( + entt::meta_any&, + entt::meta_any&, + struct Puv::internal::CerealUpgraderBase::UpgradeState&, + entt::meta_type const&, + uint, + entt::meta_type const&, + uint + ) const; // symbol: // ?copyAssociative@CerealUpgraderBase@internal@Puv@@AEBAXVmeta_associative_container@entt@@AEAVmeta_any@5@AEAUUpgradeState@123@@Z @@ -121,18 +127,14 @@ class CerealUpgraderBase { unwrapOrCopy(entt::meta_any&, entt::meta_any&, struct Puv::internal::CerealUpgraderBase::UpgradeState&) const; // symbol: - // ?buildPath@CerealUpgraderBase@internal@Puv@@CA?AV?$vector@U?$pair@W4ContextType@SerializerContext@cereal@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@V?$allocator@U?$pair@W4ContextType@SerializerContext@cereal@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@@2@@std@@AEBV?$vector@UPathElement@internal@Puv@@V?$allocator@UPathElement@internal@Puv@@@std@@@5@@Z + // ?buildPath@CerealUpgraderBase@internal@Puv@@CA?AV?$vector@U?$pair@W4ContextType@SerializerContext@cereal@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@V?$allocator@U?$pair@W4ContextType@SerializerContext@cereal@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@@2@@std@@AEBV?$vector@UPathElement@internal@Puv@@V?$allocator@UPathElement@internal@Puv@@@std@@@5@AEBUReflectionCtx@cereal@@@Z MCAPI static std::vector> - buildPath(std::vector const&); + buildPath(std::vector const&, struct cereal::ReflectionCtx const&); // symbol: - // ?constructOrLog@CerealUpgraderBase@internal@Puv@@CA?AVmeta_any@entt@@AEBVmeta_type@5@AEAUUpgradeState@123@@Z + // ?constructOrLog@CerealUpgraderBase@internal@Puv@@CA?AVmeta_any@entt@@AEBUReflectionCtx@cereal@@AEBVmeta_type@5@AEAUUpgradeState@123@@Z MCAPI static entt::meta_any - constructOrLog(entt::meta_type const&, struct Puv::internal::CerealUpgraderBase::UpgradeState&); - - // symbol: - // ?hash@CerealUpgraderBase@internal@Puv@@CA?AV?$vector@UPathElement@internal@Puv@@V?$allocator@UPathElement@internal@Puv@@@std@@@std@@V?$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@@5@@Z - MCAPI static std::vector hash(std::vector); + constructOrLog(struct cereal::ReflectionCtx const&, entt::meta_type const&, struct Puv::internal::CerealUpgraderBase::UpgradeState&); // NOLINTEND }; diff --git a/src/mc/deps/puv/PathElement.h b/src/mc/deps/puv/PathElement.h index 677b89a8fb..727a1e6bc4 100644 --- a/src/mc/deps/puv/PathElement.h +++ b/src/mc/deps/puv/PathElement.h @@ -16,9 +16,12 @@ struct PathElement { public: // NOLINTBEGIN + // symbol: ??0PathElement@internal@Puv@@QEAA@$$QEAU012@@Z + MCAPI PathElement(struct Puv::internal::PathElement&&); + // symbol: - // ??0PathElement@internal@Puv@@QEAA@IV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4ContextType@SerializerContext@cereal@@@Z - MCAPI PathElement(uint, std::string, ::cereal::SerializerContext::ContextType); + // ??0PathElement@internal@Puv@@QEAA@Vmeta_type@entt@@IV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4ContextType@SerializerContext@cereal@@@Z + MCAPI PathElement(entt::meta_type, uint, std::string, ::cereal::SerializerContext::ContextType); // symbol: ??1PathElement@internal@Puv@@QEAA@XZ MCAPI ~PathElement(); diff --git a/src/mc/deps/puv/PathHandler.h b/src/mc/deps/puv/ScopedPath.h similarity index 50% rename from src/mc/deps/puv/PathHandler.h rename to src/mc/deps/puv/ScopedPath.h index 70d7d00eff..1e67c554e9 100644 --- a/src/mc/deps/puv/PathHandler.h +++ b/src/mc/deps/puv/ScopedPath.h @@ -4,17 +4,17 @@ namespace Puv::internal { -class PathHandler { +class ScopedPath { public: // prevent constructor by default - PathHandler& operator=(PathHandler const&); - PathHandler(PathHandler const&); - PathHandler(); + ScopedPath& operator=(ScopedPath const&); + ScopedPath(ScopedPath const&); + ScopedPath(); public: // NOLINTBEGIN - // symbol: ??1PathHandler@internal@Puv@@QEAA@XZ - MCAPI ~PathHandler(); + // symbol: ??1ScopedPath@internal@Puv@@QEAA@XZ + MCAPI ~ScopedPath(); // NOLINTEND }; diff --git a/src/mc/entity/EntitySensorUtils.h b/src/mc/entity/EntitySensorUtils.h index 1d56c2e9eb..489f18b451 100644 --- a/src/mc/entity/EntitySensorUtils.h +++ b/src/mc/entity/EntitySensorUtils.h @@ -4,8 +4,8 @@ namespace EntitySensorUtils { // NOLINTBEGIN -// symbol: ?getSensorBox@EntitySensorUtils@@YA?AVAABB@@AEBVActor@@_NM@Z -MCAPI class AABB getSensorBox(class Actor const&, bool, float); +// symbol: ?getSensorBox@EntitySensorUtils@@YA?AVAABB@@AEBVActor@@_NAEBVVec3@@@Z +MCAPI class AABB getSensorBox(class Actor const&, bool, class Vec3 const&); // NOLINTEND }; // namespace EntitySensorUtils diff --git a/src/mc/entity/components/CheckFallDamageRequestComponent.h b/src/mc/entity/components/CheckFallDamageRequestComponent.h deleted file mode 100644 index 7c0f40bb15..0000000000 --- a/src/mc/entity/components/CheckFallDamageRequestComponent.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct CheckFallDamageRequestComponent { -public: - // prevent constructor by default - CheckFallDamageRequestComponent& operator=(CheckFallDamageRequestComponent const&); - CheckFallDamageRequestComponent(CheckFallDamageRequestComponent const&); - CheckFallDamageRequestComponent(); -}; diff --git a/src/mc/entity/components/ClientReplayStatePolicy.h b/src/mc/entity/components/ClientReplayStatePolicy.h index 3146d42aa4..f4d7d502bd 100644 --- a/src/mc/entity/components/ClientReplayStatePolicy.h +++ b/src/mc/entity/components/ClientReplayStatePolicy.h @@ -32,12 +32,11 @@ class ClientReplayStatePolicy : public ::IReplayStatePolicy { // vIndex: 4, symbol: ?flagUnsupportedMovement@ClientReplayStatePolicy@@UEAAX_K@Z virtual void flagUnsupportedMovement(uint64 frame); - // vIndex: 5, symbol: - // ?storeCurrentFrameSupported@ClientReplayStatePolicy@@UEAAX_KAEAVEntityContext@@AEBVIConstBlockSource@@@Z - virtual void storeCurrentFrameSupported(uint64, class EntityContext&, class IConstBlockSource const&); + // vIndex: 5, symbol: ?storeCurrentFrameSupported@ClientReplayStatePolicy@@UEAAX_KAEAVEntityContext@@@Z + virtual void storeCurrentFrameSupported(uint64, class EntityContext&); - // symbol: ?_checkSupportedFrame@ClientReplayStatePolicy@@QEBA_NAEAVEntityContext@@AEBVIConstBlockSource@@@Z - MCAPI bool _checkSupportedFrame(class EntityContext&, class IConstBlockSource const&) const; + // symbol: ?_checkSupportedFrame@ClientReplayStatePolicy@@QEBA_NAEAVEntityContext@@@Z + MCAPI bool _checkSupportedFrame(class EntityContext&) const; // symbol: ?_isSupportedMovementMode@ClientReplayStatePolicy@@SA_NAEBVEntityContext@@@Z MCAPI static bool _isSupportedMovementMode(class EntityContext const&); diff --git a/src/mc/entity/components/DamageSensorComponent.h b/src/mc/entity/components/DamageSensorComponent.h index 7b9bde4b05..f383cb34bb 100644 --- a/src/mc/entity/components/DamageSensorComponent.h +++ b/src/mc/entity/components/DamageSensorComponent.h @@ -16,49 +16,32 @@ class DamageSensorComponent { // symbol: ??0DamageSensorComponent@@QEAA@XZ MCAPI DamageSensorComponent(); + // symbol: ?getAdjustedDamage@DamageSensorComponent@@QEBAMAEAVActor@@AEBVActorDamageSource@@M@Z + MCAPI float getAdjustedDamage(class Actor&, class ActorDamageSource const&, float) const; + // symbol: ?getCause@DamageSensorComponent@@QEBA?AW4ActorDamageCause@@XZ MCAPI ::ActorDamageCause getCause() const; - // symbol: ?getDamageModifier@DamageSensorComponent@@QEAAMXZ - MCAPI float getDamageModifier(); - - // symbol: ?getDamageMultipler@DamageSensorComponent@@QEAAMXZ - MCAPI float getDamageMultipler(); - // symbol: ?isFatal@DamageSensorComponent@@QEBA_NXZ MCAPI bool isFatal() const; // symbol: ??4DamageSensorComponent@@QEAAAEAV0@$$QEAV0@@Z MCAPI class DamageSensorComponent& operator=(class DamageSensorComponent&&); - // symbol: ?recordDamage@DamageSensorComponent@@QEAA_NAEAVActor@@PEAV2@W4ActorDamageCause@@H_NVBlockPos@@@Z - MCAPI bool recordDamage( - class Actor& owner, - class Actor* sender, - ::ActorDamageCause cause, - int amount, - bool fatal, - class BlockPos - ); + // symbol: ?recordDamage@DamageSensorComponent@@QEAA_NAEAVActor@@PEAV2@W4ActorDamageCause@@MVBlockPos@@@Z + MCAPI bool recordDamage(class Actor&, class Actor*, ::ActorDamageCause, float, class BlockPos); // symbol: - // ?recordDamage@DamageSensorComponent@@QEAA_NAEAVActor@@PEAV2@W4ActorDamageCause@@H_NVVariantParameterList@@@Z - MCAPI bool recordDamage( - class Actor& owner, - class Actor* sender, - ::ActorDamageCause cause, - int amount, - bool fatal, - class VariantParameterList parameters - ); + // ?recordDamage@DamageSensorComponent@@QEAA_NAEAVActor@@PEAV2@W4ActorDamageCause@@MVVariantParameterList@@@Z + MCAPI bool recordDamage(class Actor&, class Actor*, ::ActorDamageCause, float, class VariantParameterList); // symbol: - // ?recordDamage@DamageSensorComponent@@QEAA_NAEAVActor@@AEBVActorDamageSource@@H_NVVariantParameterList@@2@Z + // ?recordDamage@DamageSensorComponent@@QEAA_NAEAVActor@@AEBVActorDamageSource@@MMVVariantParameterList@@_N@Z MCAPI bool recordDamage( class Actor& owner, class ActorDamageSource const& source, - int amount, - bool fatal, + float amount, + float fatal, class VariantParameterList parameters, bool ); @@ -67,18 +50,8 @@ class DamageSensorComponent { // private: // NOLINTBEGIN - // symbol: - // ?_recordDamage@DamageSensorComponent@@AEAA_NAEAVActor@@PEAV2@AEBW4ActorDamageCause@@1H_NVVariantParameterList@@3@Z - MCAPI bool _recordDamage( - class Actor& owner, - class Actor* sender, - ::ActorDamageCause const& cause, - class Actor*, - int amount, - bool fatal, - class VariantParameterList parameters, - bool - ); + // symbol: ?_fillParameters@DamageSensorComponent@@CAXAEAVVariantParameterList@@AEAVActor@@PEAV3@2@Z + MCAPI static void _fillParameters(class VariantParameterList&, class Actor&, class Actor*, class Actor*); // NOLINTEND }; diff --git a/src/mc/entity/components/DimensionTransitionComponent.h b/src/mc/entity/components/DimensionTransitionComponent.h index 1f8ebb088d..b55bd59c63 100644 --- a/src/mc/entity/components/DimensionTransitionComponent.h +++ b/src/mc/entity/components/DimensionTransitionComponent.h @@ -14,6 +14,9 @@ struct DimensionTransitionComponent { // symbol: ?addAdditionalSaveData@DimensionTransitionComponent@@QEBAXAEAVCompoundTag@@@Z MCAPI void addAdditionalSaveData(class CompoundTag& tag) const; + // symbol: ??4DimensionTransitionComponent@@QEAAAEAU0@$$QEAU0@@Z + MCAPI struct DimensionTransitionComponent& operator=(struct DimensionTransitionComponent&&); + // symbol: // ?readAdditionalSaveData@DimensionTransitionComponent@@QEAAXAEAVActor@@AEBVCompoundTag@@AEAVDataLoadHelper@@@Z MCAPI void diff --git a/src/mc/entity/components/JumpTicksComponent.h b/src/mc/entity/components/JumpTicksComponent.h new file mode 100644 index 0000000000..597baaacf0 --- /dev/null +++ b/src/mc/entity/components/JumpTicksComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct JumpTicksComponent { +public: + // prevent constructor by default + JumpTicksComponent& operator=(JumpTicksComponent const&); + JumpTicksComponent(JumpTicksComponent const&); + JumpTicksComponent(); +}; diff --git a/src/mc/entity/components/MountTamingComponent.h b/src/mc/entity/components/MountTamingComponent.h index 46886754f2..adf6bf988b 100644 --- a/src/mc/entity/components/MountTamingComponent.h +++ b/src/mc/entity/components/MountTamingComponent.h @@ -51,5 +51,9 @@ class MountTamingComponent { // symbol: ?_autoReject@MountTamingComponent@@CA_NAEBVItemStack@@PEBVMountTameableDefinition@@@Z MCAPI static bool _autoReject(class ItemStack const& item, class MountTameableDefinition const*); + // symbol: ?_canTame@MountTamingComponent@@CA_NAEAVActor@@AEAVPlayer@@AEBVItemStack@@PEBVMountTameableDefinition@@@Z + MCAPI static bool + _canTame(class Actor& owner, class Player&, class ItemStack const& item, class MountTameableDefinition const*); + // NOLINTEND }; diff --git a/src/mc/entity/components/MoveRequestComponent.h b/src/mc/entity/components/MoveRequestComponent.h index a10192eb91..7cf78d4c4d 100644 --- a/src/mc/entity/components/MoveRequestComponent.h +++ b/src/mc/entity/components/MoveRequestComponent.h @@ -11,6 +11,9 @@ struct MoveRequestComponent { public: // NOLINTBEGIN + // symbol: ??0MoveRequestComponent@@QEAA@$$QEAU0@@Z + MCAPI MoveRequestComponent(struct MoveRequestComponent&&); + // symbol: ??4MoveRequestComponent@@QEAAAEAU0@$$QEAU0@@Z MCAPI struct MoveRequestComponent& operator=(struct MoveRequestComponent&&); diff --git a/src/mc/entity/components/PlayerPaddleComponent.h b/src/mc/entity/components/PlayerPaddleComponent.h deleted file mode 100644 index a247860238..0000000000 --- a/src/mc/entity/components/PlayerPaddleComponent.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct PlayerPaddleComponent { -public: - // prevent constructor by default - PlayerPaddleComponent& operator=(PlayerPaddleComponent const&); - PlayerPaddleComponent(PlayerPaddleComponent const&); - PlayerPaddleComponent(); -}; diff --git a/src/mc/entity/components/PostTickPositionDeltaComponent.h b/src/mc/entity/components/PostTickPositionDeltaComponent.h new file mode 100644 index 0000000000..800bbc733e --- /dev/null +++ b/src/mc/entity/components/PostTickPositionDeltaComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct PostTickPositionDeltaComponent { +public: + // prevent constructor by default + PostTickPositionDeltaComponent& operator=(PostTickPositionDeltaComponent const&); + PostTickPositionDeltaComponent(PostTickPositionDeltaComponent const&); + PostTickPositionDeltaComponent(); +}; diff --git a/src/mc/entity/components/PushActorsRequestComponent.h b/src/mc/entity/components/PushActorsRequestComponent.h new file mode 100644 index 0000000000..73fe9e364f --- /dev/null +++ b/src/mc/entity/components/PushActorsRequestComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct PushActorsRequestComponent { +public: + // prevent constructor by default + PushActorsRequestComponent& operator=(PushActorsRequestComponent const&); + PushActorsRequestComponent(PushActorsRequestComponent const&); + PushActorsRequestComponent(); +}; diff --git a/src/mc/entity/components/PushableComponent.h b/src/mc/entity/components/PushableComponent.h index aaff8b2566..8c57ba3b76 100644 --- a/src/mc/entity/components/PushableComponent.h +++ b/src/mc/entity/components/PushableComponent.h @@ -31,6 +31,12 @@ class PushableComponent { // symbol: ?push@PushableComponent@@QEAAXAEAVActor@@0_N@Z MCAPI void push(class Actor& owner, class Actor& other, bool pushSelfOnly); + // symbol: ?pullToRide@PushableComponent@@SAXAEAVActor@@0@Z + MCAPI static void pullToRide(class Actor&, class Actor&); + + // symbol: ?skipPush@PushableComponent@@SA_NAEAVActor@@0@Z + MCAPI static bool skipPush(class Actor&, class Actor&); + // NOLINTEND // private: diff --git a/src/mc/entity/components/RandomComponent.h b/src/mc/entity/components/RandomComponent.h new file mode 100644 index 0000000000..4b31f2cdfc --- /dev/null +++ b/src/mc/entity/components/RandomComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct RandomComponent { +public: + // prevent constructor by default + RandomComponent& operator=(RandomComponent const&); + RandomComponent(RandomComponent const&); + RandomComponent(); +}; diff --git a/src/mc/entity/components/RandomReferenceComponent.h b/src/mc/entity/components/RandomReferenceComponent.h new file mode 100644 index 0000000000..6f33c1a7d6 --- /dev/null +++ b/src/mc/entity/components/RandomReferenceComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct RandomReferenceComponent { +public: + // prevent constructor by default + RandomReferenceComponent& operator=(RandomReferenceComponent const&); + RandomReferenceComponent(RandomReferenceComponent const&); + RandomReferenceComponent(); +}; diff --git a/src/mc/entity/components/ReplayStateComponent.h b/src/mc/entity/components/ReplayStateComponent.h index 7647aafc38..2c2dfc82b7 100644 --- a/src/mc/entity/components/ReplayStateComponent.h +++ b/src/mc/entity/components/ReplayStateComponent.h @@ -2,6 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/AdvanceFrameResult.h" +#include "mc/common/wrapper/ReplayCorrectionResult.h" + class ReplayStateComponent { public: // prevent constructor by default @@ -18,12 +22,14 @@ class ReplayStateComponent { // ??0ReplayStateComponent@@QEAA@V?$unique_ptr@VActorHistory@@U?$default_delete@VActorHistory@@@std@@@std@@V?$unique_ptr@UIReplayStatePolicy@@U?$default_delete@UIReplayStatePolicy@@@std@@@2@@Z MCAPI ReplayStateComponent(std::unique_ptr, std::unique_ptr policy); - // symbol: ?addInputToCurrentFrame@ReplayStateComponent@@QEBAXV?$shared_ptr@UIReplayableActorInput@@@std@@@Z - MCAPI void addInputToCurrentFrame(std::shared_ptr input) const; - // symbol: ?addInputToFrontOfCurrentFrame@ReplayStateComponent@@QEBAXV?$shared_ptr@UIReplayableActorInput@@@std@@@Z MCAPI void addInputToFrontOfCurrentFrame(std::shared_ptr) const; + // symbol: + // ?applyFrameCorrection@ReplayStateComponent@@QEAA?AW4ReplayCorrectionResult@@AEAVActor@@V?$shared_ptr@UIMovementCorrection@@@std@@_K@Z + MCAPI ::ReplayCorrectionResult + applyFrameCorrection(class Actor&, std::shared_ptr, uint64); + // symbol: ?clearHistory@ReplayStateComponent@@QEAAXXZ MCAPI void clearHistory(); @@ -45,4 +51,13 @@ class ReplayStateComponent { MCAPI ~ReplayStateComponent(); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: + // ?_applyCorrection@ReplayStateComponent@@AEBA?AW4AdvanceFrameResult@@V?$shared_ptr@UIMovementCorrection@@@std@@AEAVActor@@_K_N@Z + MCAPI ::AdvanceFrameResult + _applyCorrection(std::shared_ptr, class Actor&, uint64, bool) const; + + // NOLINTEND }; diff --git a/src/mc/entity/components/ReplayStateFlagDiff.h b/src/mc/entity/components/ReplayStateFlagDiff.h new file mode 100644 index 0000000000..f0af122783 --- /dev/null +++ b/src/mc/entity/components/ReplayStateFlagDiff.h @@ -0,0 +1,12 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +template +struct ReplayStateFlagDiff { +public: + // prevent constructor by default + ReplayStateFlagDiff& operator=(ReplayStateFlagDiff const&); + ReplayStateFlagDiff(ReplayStateFlagDiff const&); + ReplayStateFlagDiff(); +}; diff --git a/src/mc/entity/components/ServerCorrectionPolicy.h b/src/mc/entity/components/ServerCorrectionPolicy.h index f8dfc90ffd..b65366dd23 100644 --- a/src/mc/entity/components/ServerCorrectionPolicy.h +++ b/src/mc/entity/components/ServerCorrectionPolicy.h @@ -32,9 +32,8 @@ class ServerCorrectionPolicy : public ::IReplayStatePolicy { // vIndex: 4, symbol: ?flagUnsupportedMovement@ServerCorrectionPolicy@@UEAAX_K@Z virtual void flagUnsupportedMovement(uint64); - // vIndex: 5, symbol: - // ?storeCurrentFrameSupported@ServerCorrectionPolicy@@UEAAX_KAEAVEntityContext@@AEBVIConstBlockSource@@@Z - virtual void storeCurrentFrameSupported(uint64, class EntityContext&, class IConstBlockSource const&); + // vIndex: 5, symbol: ?storeCurrentFrameSupported@ServerCorrectionPolicy@@UEAAX_KAEAVEntityContext@@@Z + virtual void storeCurrentFrameSupported(uint64, class EntityContext&); // NOLINTEND }; diff --git a/src/mc/entity/components/SlideOffsetComponent.h b/src/mc/entity/components/SlideOffsetComponent.h deleted file mode 100644 index 884d1c5386..0000000000 --- a/src/mc/entity/components/SlideOffsetComponent.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct SlideOffsetComponent { -public: - // prevent constructor by default - SlideOffsetComponent& operator=(SlideOffsetComponent const&); - SlideOffsetComponent(SlideOffsetComponent const&); - SlideOffsetComponent(); -}; diff --git a/src/mc/entity/components/StateVectorComponent.h b/src/mc/entity/components/StateVectorComponent.h index cbf9af113f..5189c1bc47 100644 --- a/src/mc/entity/components/StateVectorComponent.h +++ b/src/mc/entity/components/StateVectorComponent.h @@ -13,5 +13,8 @@ struct StateVectorComponent { // symbol: ??4StateVectorComponent@@QEAAAEAU0@AEBU0@@Z MCAPI struct StateVectorComponent& operator=(struct StateVectorComponent const&); + // symbol: ?ABS_LIMIT@StateVectorComponent@@2VVec3@@B + MCAPI static class Vec3 const ABS_LIMIT; + // NOLINTEND }; diff --git a/src/mc/entity/flags/DolphinFlag.h b/src/mc/entity/flags/DolphinFlag.h new file mode 100644 index 0000000000..965503d6d9 --- /dev/null +++ b/src/mc/entity/flags/DolphinFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct DolphinFlag { +public: + // prevent constructor by default + DolphinFlag& operator=(DolphinFlag const&); + DolphinFlag(DolphinFlag const&); + DolphinFlag(); +}; diff --git a/src/mc/entity/flags/EnderManFlag.h b/src/mc/entity/flags/EnderManFlag.h new file mode 100644 index 0000000000..f3802c3dcf --- /dev/null +++ b/src/mc/entity/flags/EnderManFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct EnderManFlag { +public: + // prevent constructor by default + EnderManFlag& operator=(EnderManFlag const&); + EnderManFlag(EnderManFlag const&); + EnderManFlag(); +}; diff --git a/src/mc/entity/flags/EyeOfEnderFlag.h b/src/mc/entity/flags/EyeOfEnderFlag.h new file mode 100644 index 0000000000..7805e7a762 --- /dev/null +++ b/src/mc/entity/flags/EyeOfEnderFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct EyeOfEnderFlag { +public: + // prevent constructor by default + EyeOfEnderFlag& operator=(EyeOfEnderFlag const&); + EyeOfEnderFlag(EyeOfEnderFlag const&); + EyeOfEnderFlag(); +}; diff --git a/src/mc/entity/flags/GlobalActorFlag.h b/src/mc/entity/flags/GlobalActorFlag.h new file mode 100644 index 0000000000..2e2656a63e --- /dev/null +++ b/src/mc/entity/flags/GlobalActorFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct GlobalActorFlag { +public: + // prevent constructor by default + GlobalActorFlag& operator=(GlobalActorFlag const&); + GlobalActorFlag(GlobalActorFlag const&); + GlobalActorFlag(); +}; diff --git a/src/mc/entity/flags/GuardianFlag.h b/src/mc/entity/flags/GuardianFlag.h new file mode 100644 index 0000000000..b360c5d5d5 --- /dev/null +++ b/src/mc/entity/flags/GuardianFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct GuardianFlag { +public: + // prevent constructor by default + GuardianFlag& operator=(GuardianFlag const&); + GuardianFlag(GuardianFlag const&); + GuardianFlag(); +}; diff --git a/src/mc/entity/flags/IllagerBeastFlag.h b/src/mc/entity/flags/IllagerBeastFlag.h new file mode 100644 index 0000000000..cc834788b4 --- /dev/null +++ b/src/mc/entity/flags/IllagerBeastFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct IllagerBeastFlag { +public: + // prevent constructor by default + IllagerBeastFlag& operator=(IllagerBeastFlag const&); + IllagerBeastFlag(IllagerBeastFlag const&); + IllagerBeastFlag(); +}; diff --git a/src/mc/entity/flags/SendPlayerOnGroundRequestFlag.h b/src/mc/entity/flags/SendPlayerOnGroundRequestFlag.h deleted file mode 100644 index 49d5dd3b81..0000000000 --- a/src/mc/entity/flags/SendPlayerOnGroundRequestFlag.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct SendPlayerOnGroundRequestFlag { -public: - // prevent constructor by default - SendPlayerOnGroundRequestFlag& operator=(SendPlayerOnGroundRequestFlag const&); - SendPlayerOnGroundRequestFlag(SendPlayerOnGroundRequestFlag const&); - SendPlayerOnGroundRequestFlag(); -}; diff --git a/src/mc/entity/flags/SheepFlag.h b/src/mc/entity/flags/SheepFlag.h new file mode 100644 index 0000000000..0370599fd9 --- /dev/null +++ b/src/mc/entity/flags/SheepFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct SheepFlag { +public: + // prevent constructor by default + SheepFlag& operator=(SheepFlag const&); + SheepFlag(SheepFlag const&); + SheepFlag(); +}; diff --git a/src/mc/entity/flags/VillagerV2Flag.h b/src/mc/entity/flags/VillagerV2Flag.h new file mode 100644 index 0000000000..b07550ff8a --- /dev/null +++ b/src/mc/entity/flags/VillagerV2Flag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct VillagerV2Flag { +public: + // prevent constructor by default + VillagerV2Flag& operator=(VillagerV2Flag const&); + VillagerV2Flag(VillagerV2Flag const&); + VillagerV2Flag(); +}; diff --git a/src/mc/entity/flags/WaterAnimalFlag.h b/src/mc/entity/flags/WaterAnimalFlag.h new file mode 100644 index 0000000000..4a7e379ea7 --- /dev/null +++ b/src/mc/entity/flags/WaterAnimalFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct WaterAnimalFlag { +public: + // prevent constructor by default + WaterAnimalFlag& operator=(WaterAnimalFlag const&); + WaterAnimalFlag(WaterAnimalFlag const&); + WaterAnimalFlag(); +}; diff --git a/src/mc/entity/flags/WitchFlag.h b/src/mc/entity/flags/WitchFlag.h new file mode 100644 index 0000000000..249cc71b77 --- /dev/null +++ b/src/mc/entity/flags/WitchFlag.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct WitchFlag { +public: + // prevent constructor by default + WitchFlag& operator=(WitchFlag const&); + WitchFlag(WitchFlag const&); + WitchFlag(); +}; diff --git a/src/mc/entity/systems/ActorUpdatePostTickPositionDeltaSystem.h b/src/mc/entity/systems/ActorUpdatePostTickPositionDeltaSystem.h index a16a1f8832..7debf50baf 100644 --- a/src/mc/entity/systems/ActorUpdatePostTickPositionDeltaSystem.h +++ b/src/mc/entity/systems/ActorUpdatePostTickPositionDeltaSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class ActorUpdatePostTickPositionDeltaSystem { public: // prevent constructor by default @@ -16,4 +21,17 @@ class ActorUpdatePostTickPositionDeltaSystem { MCAPI static struct TickingSystemWithInfo createActorUpdatePostTickPositionDeltaSystem(); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: + // ?_tickActorUpdatePostTickPositionDeltaSystem@ActorUpdatePostTickPositionDeltaSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUStateVectorComponent@@UPostTickPositionDeltaComponent@@@@@Z + MCAPI static void + _tickActorUpdatePostTickPositionDeltaSystem(class ViewT< + class StrictEntityContext, + struct Include>, + struct StateVectorComponent const, + struct PostTickPositionDeltaComponent> view); + + // NOLINTEND }; diff --git a/src/mc/entity/systems/BoatPaddleInputSystem.h b/src/mc/entity/systems/BoatPaddleInputSystem.h index c781de47a9..aab9ac8844 100644 --- a/src/mc/entity/systems/BoatPaddleInputSystem.h +++ b/src/mc/entity/systems/BoatPaddleInputSystem.h @@ -16,9 +16,9 @@ MCAPI struct TickingSystemWithInfo createPassengerSystem(); MCAPI struct TickingSystemWithInfo createVehicleSystem(); // symbol: -// ?doPassengerTick@BoatPaddleInputSystem@@YAXU?$type_list@U?$Include@UPlayerInputRequestComponent@@@@@entt@@AEBVStrictEntityContext@@AEBUMoveInputComponent@@AEBUPlayerInputModeComponent@@AEBUPassengerComponent@@AEBUPlayerPaddleComponent@@AEBV?$Optional@$$CBUPlayerInteractionModelComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBUActorRotationComponent@@$$CBUBoatPaddleComponent@@UVehicleInputIntentComponent@@@@@Z +// ?doPassengerTick@BoatPaddleInputSystem@@YAXU?$type_list@U?$Include@UPlayerInputRequestComponent@@@@@entt@@AEBVStrictEntityContext@@AEBUMoveInputComponent@@AEBUPlayerInputModeComponent@@AEBUPassengerComponent@@AEBV?$Optional@$$CBUPlayerInteractionModelComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBUActorRotationComponent@@$$CBUBoatPaddleComponent@@UVehicleInputIntentComponent@@@@@Z MCAPI void -doPassengerTick(entt::type_list>, class StrictEntityContext const&, struct MoveInputComponent const&, struct PlayerInputModeComponent const&, struct PassengerComponent const&, struct PlayerPaddleComponent const&, class Optional const&, class ViewT const&); +doPassengerTick(entt::type_list>, class StrictEntityContext const&, struct MoveInputComponent const&, struct PlayerInputModeComponent const&, struct PassengerComponent const&, class Optional const&, class ViewT const&); // NOLINTEND }; // namespace BoatPaddleInputSystem diff --git a/src/mc/entity/systems/BounceEventingSystem.h b/src/mc/entity/systems/BounceEventingSystem.h index 6bb8ca4699..827cbe36b1 100644 --- a/src/mc/entity/systems/BounceEventingSystem.h +++ b/src/mc/entity/systems/BounceEventingSystem.h @@ -3,7 +3,9 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" class BounceEventingSystem { public: @@ -14,6 +16,10 @@ class BounceEventingSystem { public: // NOLINTBEGIN + // symbol: + // ?_tickBounceEventingSystem@BounceEventingSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@$$CBUStateVectorComponent@@$$CBUActorUniqueIDComponent@@$$CBUEventingDispatcherComponent@@UBounceComponent@@@@V?$ViewT@VStrictEntityContext@@UEventingRequestQueueComponent@@@@@Z + MCAPI static void _tickBounceEventingSystem(class ViewT, class FlagComponent>, struct StateVectorComponent const, struct ActorUniqueIDComponent const, struct EventingDispatcherComponent const, struct BounceComponent> view, class ViewT); + // symbol: ?createSystem@BounceEventingSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); diff --git a/src/mc/entity/systems/BuoyancySystem.h b/src/mc/entity/systems/BuoyancySystem.h index fba1d8b483..cfc699576e 100644 --- a/src/mc/entity/systems/BuoyancySystem.h +++ b/src/mc/entity/systems/BuoyancySystem.h @@ -3,7 +3,10 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" namespace BuoyancySystem { // NOLINTBEGIN @@ -12,6 +15,10 @@ namespace BuoyancySystem { MCAPI void checkAndAddFloatRequest(class StrictEntityContext const&, struct StateVectorComponent const&, class BuoyancyComponent&, class EntityModifier&, class IConstBlockSource const&); +// symbol: +// ?increaseBuoyancyTimerSystem@BuoyancySystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UShouldBeSimulatedFlag@@@@@@@entt@@AEBURandomReferenceComponent@@AEBUStateVectorComponent@@AEAVBuoyancyComponent@@AEBV?$ViewT@VStrictEntityContext@@URandomComponent@@@@@Z +MCAPI void increaseBuoyancyTimerSystem(entt::type_list, class FlagComponent>>, struct RandomReferenceComponent const&, struct StateVectorComponent const&, class BuoyancyComponent&, class ViewT const&); + // symbol: ?registerSystems@BuoyancySystem@@YAXAEAVEntitySystems@@_N@Z MCAPI void registerSystems(class EntitySystems&, bool); // NOLINTEND diff --git a/src/mc/entity/systems/CheckFallDamageInMoveSystem.h b/src/mc/entity/systems/CheckFallDamageInMoveSystem.h deleted file mode 100644 index 3eb035760f..0000000000 --- a/src/mc/entity/systems/CheckFallDamageInMoveSystem.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -class CheckFallDamageInMoveSystem { -public: - // prevent constructor by default - CheckFallDamageInMoveSystem& operator=(CheckFallDamageInMoveSystem const&); - CheckFallDamageInMoveSystem(CheckFallDamageInMoveSystem const&); - CheckFallDamageInMoveSystem(); - -public: - // NOLINTBEGIN - // symbol: ?createSystem@CheckFallDamageInMoveSystem@@SA?AUTickingSystemWithInfo@@XZ - MCAPI static struct TickingSystemWithInfo createSystem(); - - // NOLINTEND -}; diff --git a/src/mc/entity/systems/CheckFallDamageSystem.h b/src/mc/entity/systems/CheckFallDamageSystem.h index 7e4b3ae537..bd897a1a10 100644 --- a/src/mc/entity/systems/CheckFallDamageSystem.h +++ b/src/mc/entity/systems/CheckFallDamageSystem.h @@ -14,5 +14,8 @@ class CheckFallDamageSystem { // symbol: ?createSystem@CheckFallDamageSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); + // symbol: ?createVehicleResetFallDistanceSystem@CheckFallDamageSystem@@SA?AUTickingSystemWithInfo@@XZ + MCAPI static struct TickingSystemWithInfo createVehicleResetFallDistanceSystem(); + // NOLINTEND }; diff --git a/src/mc/entity/systems/CurrentSwimAmountSystem.h b/src/mc/entity/systems/CurrentSwimAmountSystem.h index 78fb17dc13..32fad8d01b 100644 --- a/src/mc/entity/systems/CurrentSwimAmountSystem.h +++ b/src/mc/entity/systems/CurrentSwimAmountSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class CurrentSwimAmountSystem { public: // prevent constructor by default @@ -14,6 +19,14 @@ class CurrentSwimAmountSystem { // symbol: ?createSystem@CurrentSwimAmountSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); + // symbol: + // ?tick@CurrentSwimAmountSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@USwimAmountComponent@@$$CBUActorDataFlagComponent@@@@@Z + MCAPI static void tick(class ViewT< + class StrictEntityContext, + struct Include>, + struct SwimAmountComponent, + struct ActorDataFlagComponent const> view); + // NOLINTEND // private: diff --git a/src/mc/entity/systems/DimensionTransitionSystem.h b/src/mc/entity/systems/DimensionTransitionSystem.h index 102902830d..df8b1d420f 100644 --- a/src/mc/entity/systems/DimensionTransitionSystem.h +++ b/src/mc/entity/systems/DimensionTransitionSystem.h @@ -29,6 +29,15 @@ class DimensionTransitionSystem { class EntityModifier mod ); + // symbol: + // ?_tickReadyToContinueServer@DimensionTransitionSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Exclude@UPassengerComponent@@UVehicleComponent@@UDimensionTransitionComponent@@@@UPlayerChangeDimensionRequestComponent@@@@@Z + MCAPI static void _tickReadyToContinueServer( + class ViewT< + class StrictEntityContext, + struct Exclude, + struct PlayerChangeDimensionRequestComponent> view + ); + // symbol: // ?_tickVehicleDismount@DimensionTransitionSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@UPlayerChangeDimensionRequestComponent@@UPassengerComponent@@@@@@V?$ViewT@VStrictEntityContext@@U?$Include@UPlayerChangeDimensionRequestComponent@@@@$$CBUVehicleComponent@@@@V?$EntityModifier@V?$FlagComponent@UStopRidingRequestFlag@@@@V?$FlagComponent@UExitFromPassengerFlag@@@@@@@Z MCAPI static void _tickVehicleDismount( diff --git a/src/mc/entity/systems/DolphinBoostSystem.h b/src/mc/entity/systems/DolphinBoostSystem.h index 364406771d..8e871f96f0 100644 --- a/src/mc/entity/systems/DolphinBoostSystem.h +++ b/src/mc/entity/systems/DolphinBoostSystem.h @@ -3,7 +3,9 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -16,6 +18,31 @@ class DolphinBoostSystem { public: // NOLINTBEGIN + // symbol: + // ?_scanSystem@DolphinBoostSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUActorDataFlagComponent@@UScanForDolphinTimerComponent@@@@V?$EntityModifier@V?$FlagComponent@UScanForDolphin@@@@@@@Z + MCAPI static void _scanSystem( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct ActorDataFlagComponent const, + struct ScanForDolphinTimerComponent> view, + class EntityModifier> modifier + ); + + // symbol: + // ?_swimSpeedModifierSystem@DolphinBoostSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUActorDataFlagComponent@@USwimSpeedMultiplierComponent@@V?$Optional@V?$FlagComponent@UScanForDolphin@@@@@@V?$Optional@V?$FlagComponent@UIsNearDolphinsFlag@@@@@@@@@Z + MCAPI static void _swimSpeedModifierSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct ActorDataFlagComponent const, + struct SwimSpeedMultiplierComponent, + class Optional>, + class Optional>> view); + // symbol: // ?_tickScan@DolphinBoostSystem@@SAXAEBVStrictEntityContext@@AEBUActorDataFlagComponent@@AEAUScanForDolphinTimerComponent@@V?$EntityModifier@V?$FlagComponent@UScanForDolphin@@@@@@@Z MCAPI static void diff --git a/src/mc/entity/systems/EntitySensorSystem.h b/src/mc/entity/systems/EntitySensorSystem.h index dba430aa67..6171315985 100644 --- a/src/mc/entity/systems/EntitySensorSystem.h +++ b/src/mc/entity/systems/EntitySensorSystem.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/OptionalGlobal.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class EntitySensorSystem { public: // prevent constructor by default @@ -18,6 +24,11 @@ class EntitySensorSystem { // private: // NOLINTBEGIN + // symbol: + // ?_tick@EntitySensorSystem@@CAXV?$OptionalGlobal@$$CBUCurrentTickComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@$$CBV?$FlagComponent@UActorTickedFlag@@@@@@VActorOwnerComponent@@VEntitySensorComponent@@@@@Z + MCAPI static void + _tick(class OptionalGlobal, class ViewT const>, class ActorOwnerComponent, class EntitySensorComponent>); + // symbol: // ?_tickEntitySensorComponent@EntitySensorSystem@@CAXAEAVStrictEntityContext@@AEAVActorOwnerComponent@@AEAVEntitySensorComponent@@AEBUCurrentTickComponent@@@Z MCAPI static void diff --git a/src/mc/entity/systems/EntitySystems.h b/src/mc/entity/systems/EntitySystems.h index 367d255431..01ac64ed23 100644 --- a/src/mc/entity/systems/EntitySystems.h +++ b/src/mc/entity/systems/EntitySystems.h @@ -57,6 +57,9 @@ class EntitySystems : public IEntitySystems, public ::Bedrock::EnableNonOwnerRef // symbol: ?registerEvents@EntitySystems@@QEAAXAEAVEntityRegistry@@@Z MCAPI void registerEvents(class EntityRegistry& registry); + // symbol: ?registerGameOnlyMovementTickingSystem@EntitySystems@@QEAAX$$QEAUTickingSystemWithInfo@@@Z + MCAPI void registerGameOnlyMovementTickingSystem(struct TickingSystemWithInfo&& system); + // symbol: ?registerGameOnlyTickingSystem@EntitySystems@@QEAAX$$QEAUTickingSystemWithInfo@@@Z MCAPI void registerGameOnlyTickingSystem(struct TickingSystemWithInfo&& system); diff --git a/src/mc/entity/systems/ExitVehicleSystem.h b/src/mc/entity/systems/ExitVehicleSystem.h index 60ef06d16a..7070b90b9b 100644 --- a/src/mc/entity/systems/ExitVehicleSystem.h +++ b/src/mc/entity/systems/ExitVehicleSystem.h @@ -11,8 +11,8 @@ class ExitVehicleSystem { public: // NOLINTBEGIN - // symbol: ?createSystem@ExitVehicleSystem@@SA?AUTickingSystemWithInfo@@AEBVBaseGameVersion@@@Z - MCAPI static struct TickingSystemWithInfo createSystem(class BaseGameVersion const& version); + // symbol: ?createSystem@ExitVehicleSystem@@SA?AUTickingSystemWithInfo@@AEBVBaseGameVersion@@_N@Z + MCAPI static struct TickingSystemWithInfo createSystem(class BaseGameVersion const&, bool); // NOLINTEND }; diff --git a/src/mc/entity/systems/ExitVehicleSystemImpl.h b/src/mc/entity/systems/ExitVehicleSystemImpl.h index 5756b1a19c..bbddfd0b5a 100644 --- a/src/mc/entity/systems/ExitVehicleSystemImpl.h +++ b/src/mc/entity/systems/ExitVehicleSystemImpl.h @@ -41,7 +41,7 @@ struct ExitVehicleSystemImpl { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@ExitVehicleSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UPassengerComponent@@UVehicleComponent@@UOffsetsComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@ExitVehicleSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@UPostTickPositionDeltaComponent@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< @@ -55,123 +55,41 @@ struct ExitVehicleSystemImpl { class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, + struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorDataFlagComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, + struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, struct DimensionTypeComponent, - struct PassengerComponent, - struct VehicleComponent, - struct OffsetsComponent, - class FlagComponent>, + class FlagComponent, + struct PostTickPositionDeltaComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, - struct EntityFactoryT<>>& executionContext); + struct EntityFactoryT<>>&); // vIndex: 6, symbol: - // ?singleTick@ExitVehicleSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UPassengerComponent@@UVehicleComponent@@UOffsetsComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z - virtual void singleTick( - class StrictExecutionContext< - struct Filter< - class FlagComponent, - class FlagComponent, - class FlagComponent, - class FlagComponent, - class FlagComponent, - struct VehicleComponent, - class FlagComponent, - class FlagComponent, - class FlagComponent>, - struct Read< - struct MovementAbilitiesComponent, - struct ActorTypeComponent, - struct FallDistanceComponent, - struct ActorGameTypeComponent, - struct MobBodyRotationComponent, - struct RenderRotationComponent, - struct StandAnimationComponent, - struct ActorDataFlagComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, - struct VanillaOffsetComponent, - struct PassengerRenderingRidingOffsetComponent, - struct DimensionTypeComponent, - struct PassengerComponent, - struct VehicleComponent, - struct OffsetsComponent, - class FlagComponent>, - struct Write, - struct AddRemove, - struct GlobalRead, - struct GlobalWrite<>, - struct EntityFactoryT<>>& executionContext, - class StrictEntityContext& entityContext - ); + // ?singleTick@ExitVehicleSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@UPostTickPositionDeltaComponent@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct PostTickPositionDeltaComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // symbol: - // ?_tickExitVehicle@ExitVehicleSystemImpl@@SAXAEBVStrictEntityContext@@AEBUPassengerComponent@@AEBUAABBShapeComponent@@AEBUStateVectorComponent@@AEBUOffsetsComponent@@AEAUActorRotationComponent@@V?$Optional@$$CBV?$FlagComponent@UExitFromPassengerFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UActorIsBeingDestroyedFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UEjectedByActivatorRailFlag@@@@@@AEBVBaseGameVersion@@V?$ViewT@VStrictEntityContext@@$$CBUVehicleComponent@@$$CBUStateVectorComponent@@@@AEAV?$EntityModifier@UActorSetPositionRequestComponent@@@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UPassengerComponent@@UVehicleComponent@@UOffsetsComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEBVIConstBlockSource@@@Z - MCAPI static void _tickExitVehicle( - class StrictEntityContext const& entity, - struct PassengerComponent const&, - struct AABBShapeComponent const& aabb, - struct StateVectorComponent const&, - struct OffsetsComponent const&, - struct ActorRotationComponent& rotation, - class Optional const>, - class Optional const>, - class Optional const>, - class BaseGameVersion const& baseGameVersion, - class ViewT, - class EntityModifier& modifier, - class StrictExecutionContext< - struct Filter< - class FlagComponent, - class FlagComponent, - class FlagComponent, - class FlagComponent, - class FlagComponent, - struct VehicleComponent, - class FlagComponent, - class FlagComponent, - class FlagComponent>, - struct Read< - struct MovementAbilitiesComponent, - struct ActorTypeComponent, - struct FallDistanceComponent, - struct ActorGameTypeComponent, - struct MobBodyRotationComponent, - struct RenderRotationComponent, - struct StandAnimationComponent, - struct ActorDataFlagComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, - struct VanillaOffsetComponent, - struct PassengerRenderingRidingOffsetComponent, - struct DimensionTypeComponent, - struct PassengerComponent, - struct VehicleComponent, - struct OffsetsComponent, - class FlagComponent>, - struct Write, - struct AddRemove, - struct GlobalRead, - struct GlobalWrite<>, - struct EntityFactoryT<>>& executionContext, - class IConstBlockSource const& region - ); + // ?_tickExitVehicle@ExitVehicleSystemImpl@@SAXAEBVStrictEntityContext@@AEBUPassengerComponent@@AEBUAABBShapeComponent@@AEBUStateVectorComponent@@AEBUOffsetsComponent@@AEAUActorRotationComponent@@V?$Optional@$$CBV?$FlagComponent@UExitFromPassengerFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UActorIsBeingDestroyedFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UEjectedByActivatorRailFlag@@@@@@AEBVBaseGameVersion@@V?$ViewT@VStrictEntityContext@@$$CBUVehicleComponent@@$$CBUStateVectorComponent@@V?$Optional@$$CBUPostTickPositionDeltaComponent@@@@@@AEAV?$EntityModifier@UActorSetPositionRequestComponent@@@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@UPostTickPositionDeltaComponent@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@_NAEBVIConstBlockSource@@@Z + MCAPI static void + _tickExitVehicle(class StrictEntityContext const&, struct PassengerComponent const&, struct AABBShapeComponent const&, struct StateVectorComponent const&, struct OffsetsComponent const&, struct ActorRotationComponent&, class Optional const>, class Optional const>, class Optional const>, class BaseGameVersion const&, class ViewT>, class EntityModifier&, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct PostTickPositionDeltaComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, bool, class IConstBlockSource const&); // symbol: - // ?createViews@ExitVehicleSystemImpl@@SA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UPassengerComponent@@UVehicleComponent@@UOffsetsComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?createViews@ExitVehicleSystemImpl@@SA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@V?$FlagComponent@UEjectedByActivatorRailFlag@@@@UPostTickPositionDeltaComponent@@@@U?$Write@UAABBShapeComponent@@UActorRotationComponent@@UStateVectorComponent@@@@U?$AddRemove@UActorSetPositionRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z MCAPI static auto createViews(class StrictExecutionContext< struct Filter< @@ -185,28 +103,29 @@ struct ExitVehicleSystemImpl { class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, + struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorDataFlagComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, + struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, struct DimensionTypeComponent, - struct PassengerComponent, - struct VehicleComponent, - struct OffsetsComponent, - class FlagComponent>, + class FlagComponent, + struct PostTickPositionDeltaComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, - struct EntityFactoryT<>>& context); + struct EntityFactoryT<>>&); // NOLINTEND }; diff --git a/src/mc/entity/systems/EyeOfEnderPreNormalTickSystem.h b/src/mc/entity/systems/EyeOfEnderPreNormalTickSystem.h index e657ec8a3c..ff16370838 100644 --- a/src/mc/entity/systems/EyeOfEnderPreNormalTickSystem.h +++ b/src/mc/entity/systems/EyeOfEnderPreNormalTickSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class EyeOfEnderPreNormalTickSystem { public: // prevent constructor by default @@ -22,5 +27,14 @@ class EyeOfEnderPreNormalTickSystem { // ?_doEyeOfEnderPreNormalTickSystem@EyeOfEnderPreNormalTickSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doEyeOfEnderPreNormalTickSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickEyeOfEnderPreNormalTickSystem@EyeOfEnderPreNormalTickSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UEyeOfEnderFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickEyeOfEnderPreNormalTickSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/FinalizeMoveSystem.h b/src/mc/entity/systems/FinalizeMoveSystem.h index 67b55b5548..bd6f423da9 100644 --- a/src/mc/entity/systems/FinalizeMoveSystem.h +++ b/src/mc/entity/systems/FinalizeMoveSystem.h @@ -21,8 +21,9 @@ class FinalizeMoveSystem { MCAPI static struct TickingSystemWithInfo create(); // symbol: - // ?tick@FinalizeMoveSystem@@SAXV?$ViewT@VStrictEntityContext@@$$CBUAABBShapeComponent@@$$CBUMoveRequestComponent@@$$CBUOffsetsComponent@@UStateVectorComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBUMovementAbilitiesComponent@@@@V?$Optional@USlideOffsetComponent@@@@@@V?$EntityModifier@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UCollisionFlag@@@@V?$FlagComponent@UHorizontalCollisionFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@@Z - MCAPI static void tick(class ViewT const>, class Optional, class Optional>, class EntityModifier, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>); + // ?tick@FinalizeMoveSystem@@SAXV?$ViewT@VStrictEntityContext@@$$CBUAABBShapeComponent@@$$CBUMoveRequestComponent@@$$CBUOffsetsComponent@@UStateVectorComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBUMovementAbilitiesComponent@@@@@@V?$EntityModifier@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UCollisionFlag@@@@V?$FlagComponent@UHorizontalCollisionFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@@Z + MCAPI static void + tick(class ViewT const>, class Optional>, class EntityModifier, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>); // NOLINTEND }; diff --git a/src/mc/entity/systems/IllagerBeastPostAIStepSystem.h b/src/mc/entity/systems/IllagerBeastPostAIStepSystem.h index 310d99225a..1eda29a182 100644 --- a/src/mc/entity/systems/IllagerBeastPostAIStepSystem.h +++ b/src/mc/entity/systems/IllagerBeastPostAIStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class IllagerBeastPostAIStepSystem { public: // prevent constructor by default @@ -23,5 +28,15 @@ class IllagerBeastPostAIStepSystem { MCAPI static void _doIllagerBeastPostAIStepSystem(class StrictEntityContext const&, struct StateVectorComponent const&, struct SubBBsComponent&); + // symbol: + // ?_tickIllagerBeastPostAIStepSystem@IllagerBeastPostAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UIllagerBeastFlag@@@@@@$$CBUStateVectorComponent@@USubBBsComponent@@@@@Z + MCAPI static void _tickIllagerBeastPostAIStepSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct StateVectorComponent const, + struct SubBBsComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/InLavaSensingSystem.h b/src/mc/entity/systems/InLavaSensingSystem.h index abc36aae57..6e9254f015 100644 --- a/src/mc/entity/systems/InLavaSensingSystem.h +++ b/src/mc/entity/systems/InLavaSensingSystem.h @@ -28,9 +28,9 @@ class InLavaSensingSystem { ); // symbol: - // ?tickSystem@InLavaSensingSystem@@SAXV?$ViewT@VStrictEntityContext@@$$CBUUpdateWaterStateRequestComponent@@@@V?$EntityModifier@V?$FlagComponent@UInLavaFlag@@@@@@@Z + // ?singleTickSystem@InLavaSensingSystem@@SAXAEAVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@$$CBUUpdateWaterStateRequestComponent@@@@V?$EntityModifier@V?$FlagComponent@UInLavaFlag@@@@@@@Z MCAPI static void - tickSystem(class ViewT, class EntityModifier>); + singleTickSystem(class StrictEntityContext&, class ViewT, class EntityModifier>); // NOLINTEND }; diff --git a/src/mc/entity/systems/InWaterSensingSystem.h b/src/mc/entity/systems/InWaterSensingSystem.h index f392f2053c..20836a9af9 100644 --- a/src/mc/entity/systems/InWaterSensingSystem.h +++ b/src/mc/entity/systems/InWaterSensingSystem.h @@ -30,6 +30,11 @@ class InWaterSensingSystem { MCAPI static void doInWaterSensing(class StrictEntityContext& entity, struct UpdateWaterStateRequestComponent const&, struct FallDistanceComponent&, class Optional const>, class Optional, class Optional const>, class EntityModifier, struct WaterSplashEffectRequestComponent> modifier, class ViewT, struct VehicleComponent>>); + // symbol: + // ?singleTickInWaterSensing@InWaterSensingSystem@@CAXAEAVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@$$CBUUpdateWaterStateRequestComponent@@UFallDistanceComponent@@V?$Optional@$$CBV?$FlagComponent@UFallingBlockFlag@@@@@@V?$Optional@$$CBUPassengerComponent@@@@V?$Optional@$$CBV?$FlagComponent@UInWaterFlag@@@@@@@@V?$EntityModifier@V?$FlagComponent@UInWaterFlag@@@@UWaterSplashEffectRequestComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UBoatFlag@@@@UVehicleComponent@@@@@@@Z + MCAPI static void + singleTickInWaterSensing(class StrictEntityContext&, class ViewT const>, class Optional, class Optional const>>, class EntityModifier, struct WaterSplashEffectRequestComponent>, class ViewT, struct VehicleComponent>>); + // symbol: // ?tickInWaterSensing@InWaterSensingSystem@@CAXV?$ViewT@VStrictEntityContext@@$$CBUUpdateWaterStateRequestComponent@@UFallDistanceComponent@@V?$Optional@$$CBV?$FlagComponent@UFallingBlockFlag@@@@@@V?$Optional@$$CBUPassengerComponent@@@@V?$Optional@$$CBV?$FlagComponent@UInWaterFlag@@@@@@@@V?$EntityModifier@V?$FlagComponent@UInWaterFlag@@@@UWaterSplashEffectRequestComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UBoatFlag@@@@UVehicleComponent@@@@@@@Z MCAPI static void tickInWaterSensing(class ViewT const>, class Optional, class Optional const>> view, class EntityModifier, struct WaterSplashEffectRequestComponent> modifier, class ViewT, struct VehicleComponent>>); diff --git a/src/mc/entity/systems/InitialTickFilterSystem.h b/src/mc/entity/systems/InitialTickFilterSystem.h index 9532163f7c..ec3be47326 100644 --- a/src/mc/entity/systems/InitialTickFilterSystem.h +++ b/src/mc/entity/systems/InitialTickFilterSystem.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" #include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/OptionalGlobal.h" #include "mc/common/wrapper/ViewT.h" @@ -46,6 +47,21 @@ class InitialTickFilterSystem { // private: // NOLINTBEGIN + // symbol: + // ?_blockFilterTickView@InitialTickFilterSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUStateVectorComponent@@U?$Exclude@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UGlobalActorFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUDimensionTypeComponent@@@@V?$OptionalGlobal@$$CBULocalConstBlockSourceFactoryComponent@@@@V?$EntityModifier@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@@Z + MCAPI static void _blockFilterTickView( + class ViewT< + class StrictEntityContext, + struct Include>, + struct StateVectorComponent const, + struct Exclude< + class FlagComponent, + class FlagComponent>> view, + class ViewT, + class OptionalGlobal factory, + class EntityModifier> modifier + ); + // symbol: // ?_tickingAreaFilterTickView@InitialTickFilterSystem@@CAXV?$OptionalGlobal@$$CBUCurrentTickComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@VTickWorldComponent@@@@V?$EntityModifier@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@@Z MCAPI static void _tickingAreaFilterTickView( diff --git a/src/mc/entity/systems/JumpInputSystem.h b/src/mc/entity/systems/JumpInputSystem.h index e54e3cf574..e7c36240f7 100644 --- a/src/mc/entity/systems/JumpInputSystem.h +++ b/src/mc/entity/systems/JumpInputSystem.h @@ -3,6 +3,9 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/common/wrapper/optional_ref.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -29,5 +32,17 @@ class JumpInputSystem { class EntityModifier> mod ); + // symbol: + // ?tickJumpInputSystem@JumpInputSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@UPlayerInputRequestComponent@@@@V?$Optional@$$CBV?$FlagComponent@UAutoJumpingFlag@@@@@@$$CBUMovementAbilitiesComponent@@$$CBUMoveInputComponent@@@@V?$EntityModifier@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@Z + MCAPI static void tickJumpInputSystem( + class ViewT< + class StrictEntityContext, + struct Include, + class Optional const>, + struct MovementAbilitiesComponent const, + struct MoveInputComponent const> view, + class EntityModifier> mod + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/LiquidSplashSystem.h b/src/mc/entity/systems/LiquidSplashSystem.h index fa553619db..c7e195809a 100644 --- a/src/mc/entity/systems/LiquidSplashSystem.h +++ b/src/mc/entity/systems/LiquidSplashSystem.h @@ -28,6 +28,11 @@ class LiquidSplashSystem { MCAPI static void _emitWaterSplashEffect(class ActorOwnerComponent&, struct WaterSplashEffectRequestComponent const&); + // symbol: + // ?_singleTickLiquidSplash@LiquidSplashSystem@@CAXAEBVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@$$CBUWaterSplashEffectRequestComponent@@VActorOwnerComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPostSplashGameEventRequestFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void + _singleTickLiquidSplash(class StrictEntityContext const&, class ViewT, class ViewT>, class ActorOwnerComponent>); + // symbol: // ?_tickLiquidSplash@LiquidSplashSystem@@CAXV?$ViewT@VStrictEntityContext@@$$CBUWaterSplashEffectRequestComponent@@VActorOwnerComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPostSplashGameEventRequestFlag@@@@@@VActorOwnerComponent@@@@@Z MCAPI static void diff --git a/src/mc/entity/systems/MinecartComeOffRailSystem.h b/src/mc/entity/systems/MinecartComeOffRailSystem.h index 8657b0ee3d..dbcbe0b632 100644 --- a/src/mc/entity/systems/MinecartComeOffRailSystem.h +++ b/src/mc/entity/systems/MinecartComeOffRailSystem.h @@ -3,7 +3,10 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -30,4 +33,21 @@ class MinecartComeOffRailSystem { MCAPI static struct TickingSystemWithInfo createSystem(); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: + // ?_tickMinecartComeOffRailSystem@MinecartComeOffRailSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Exclude@USnapOnRailComponent@@@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBVRailMovementComponent@@UStateVectorComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@@@V?$EntityModifier@UMoveRequestComponent@@@@@Z + MCAPI static void _tickMinecartComeOffRailSystem( + class ViewT< + class StrictEntityContext, + struct Exclude, + struct Include>, + class RailMovementComponent const, + struct StateVectorComponent, + class Optional const>> view, + class EntityModifier mod + ); + + // NOLINTEND }; diff --git a/src/mc/entity/systems/MinecartMoveAlongRailSystem.h b/src/mc/entity/systems/MinecartMoveAlongRailSystem.h index 945f73caa5..0f101f802c 100644 --- a/src/mc/entity/systems/MinecartMoveAlongRailSystem.h +++ b/src/mc/entity/systems/MinecartMoveAlongRailSystem.h @@ -65,5 +65,22 @@ class MinecartMoveAlongRailSystem { MCAPI static void _preRailMovementCalculateMinecartPositionSystem(class StrictEntityContext const& context, struct OffsetsComponent const&, struct StateVectorComponent const&, struct FallDistanceComponent&, struct SnapOnRailComponent&, class EntityModifier mod, class IConstBlockSource const&); + // symbol: + // ?_tickCalculateRailMovementSystem@MinecartMoveAlongRailSystem@@CAXV?$ViewT@VStrictEntityContext@@$$CBVRailMovementComponent@@USnapOnRailComponent@@UStateVectorComponent@@V?$Optional@$$CBUVehicleComponent@@@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@@@$$CBUActorRotationComponent@@$$CBULocalMoveVelocityComponent@@@@V?$EntityModifier@UMoveRequestComponent@@@@@Z + MCAPI static void _tickCalculateRailMovementSystem( + class ViewT< + class StrictEntityContext, + class RailMovementComponent const, + struct SnapOnRailComponent, + struct StateVectorComponent, + class Optional> view, + class ViewT< + class StrictEntityContext, + struct Include>, + struct ActorRotationComponent const, + struct LocalMoveVelocityComponent const>, + class EntityModifier mod + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/MinecartPreNormalTickSystem.h b/src/mc/entity/systems/MinecartPreNormalTickSystem.h index 109a310516..913875c400 100644 --- a/src/mc/entity/systems/MinecartPreNormalTickSystem.h +++ b/src/mc/entity/systems/MinecartPreNormalTickSystem.h @@ -3,7 +3,10 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" class MinecartPreNormalTickSystem { public: @@ -29,5 +32,17 @@ class MinecartPreNormalTickSystem { class EntityModifier mod ); + // symbol: + // ?_tickMinecartPreNormalTickSystem@MinecartPreNormalTickSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UMinecartFlag@@@@@@VActorOwnerComponent@@@@V?$EntityModifier@UMinecartPreNormalTickBlockPosComponent@@@@@Z + MCAPI static void _tickMinecartPreNormalTickSystem( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view, + class EntityModifier mod + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/MoveCollisionSystem.h b/src/mc/entity/systems/MoveCollisionSystem.h index 01005a7c4c..ff819e6845 100644 --- a/src/mc/entity/systems/MoveCollisionSystem.h +++ b/src/mc/entity/systems/MoveCollisionSystem.h @@ -16,6 +16,11 @@ #include "mc/entity/EntityFactoryT.h" #include "mc/world/components/FlagComponent.h" +// auto generated forward declare list +// clang-format off +namespace BlockSourceVisitor { struct CollisionShape; } +// clang-format on + namespace MoveCollisionSystem { // NOLINTBEGIN // symbol: ?createCollisionShapesCopySystem@MoveCollisionSystem@@YA?AUTickingSystemWithInfo@@XZ @@ -25,9 +30,9 @@ MCAPI struct TickingSystemWithInfo createCollisionShapesCopySystem(); MCAPI struct TickingSystemWithInfo createSystem(); // symbol: -// ?fetchCollisionShapes@MoveCollisionSystem@@YAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUMaxAutoStepComponent@@AEBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UCollidableMobNearFlag@@@@@@AEAUMoveRequestComponent@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UCollidableMobFlag@@@@@@$$CBUAABBShapeComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBUAABBShapeComponent@@$$CBUActorDataFlagComponent@@@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UFallingBlockFlag@@@@@@@@AEBVIConstBlockSource@@AEAVLocalSpatialEntityFetcher@@AEBVGetCollisionShapeInterface@@@Z +// ?fetchCollisionShapes@MoveCollisionSystem@@YAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUMaxAutoStepComponent@@AEBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UCollidableMobNearFlag@@@@@@AEAUMoveRequestComponent@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UCollidableMobFlag@@@@@@$$CBUAABBShapeComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBUAABBShapeComponent@@$$CBUActorDataFlagComponent@@@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UFallingBlockFlag@@@@@@@@AEBVIConstBlockSource@@AEAVLocalSpatialEntityFetcher@@AEBVGetCollisionShapeInterface@@AEAV?$vector@UCollisionShape@BlockSourceVisitor@@V?$allocator@UCollisionShape@BlockSourceVisitor@@@std@@@std@@@Z MCAPI void -fetchCollisionShapes(class StrictEntityContext const&, struct AABBShapeComponent const&, struct MaxAutoStepComponent const&, struct ActorDataFlagComponent const&, class Optional const>, struct MoveRequestComponent&, class ViewT>, struct AABBShapeComponent const> const&, class ViewT const&, class ViewT>> const&, class IConstBlockSource const&, class LocalSpatialEntityFetcher&, class GetCollisionShapeInterface const&); +fetchCollisionShapes(class StrictEntityContext const&, struct AABBShapeComponent const&, struct MaxAutoStepComponent const&, struct ActorDataFlagComponent const&, class Optional const>, struct MoveRequestComponent&, class ViewT>, struct AABBShapeComponent const> const&, class ViewT const&, class ViewT>> const&, class IConstBlockSource const&, class LocalSpatialEntityFetcher&, class GetCollisionShapeInterface const&, std::vector&); // NOLINTEND }; // namespace MoveCollisionSystem diff --git a/src/mc/entity/systems/MoveSpeedCapSystem.h b/src/mc/entity/systems/MoveSpeedCapSystem.h index b3d05612c4..24ff567774 100644 --- a/src/mc/entity/systems/MoveSpeedCapSystem.h +++ b/src/mc/entity/systems/MoveSpeedCapSystem.h @@ -2,6 +2,13 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class MoveSpeedCapSystem { public: // prevent constructor by default @@ -14,5 +21,9 @@ class MoveSpeedCapSystem { // symbol: ?create@MoveSpeedCapSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo create(); + // symbol: + // ?tick@MoveSpeedCapSystem@@SAXV?$ViewT@VStrictEntityContext@@UMoveRequestComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsImmobileFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@@@$$CBUMovementAttributesComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsKnockedBackOnDeathFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@U?$Include@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UHorseFlag@@@@@@U?$Exclude@V?$FlagComponent@UMobAllowStandSlidingFlag@@@@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@V?$FlagComponent@UHorseFlag@@@@@@V?$ViewT@VStrictEntityContext@@$$CBV?$FlagComponent@UPlayerIsSleepingFlag@@@@$$CBV?$FlagComponent@UPlayerComponentFlag@@@@@@@Z + MCAPI static void tick(class ViewT view, class ViewT const>>, class ViewT>, struct MovementAttributesComponent const, class Optional const>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/NeedSetPreviousPosition.h b/src/mc/entity/systems/NeedSetPreviousPosition.h new file mode 100644 index 0000000000..2228f1a9c1 --- /dev/null +++ b/src/mc/entity/systems/NeedSetPreviousPosition.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct NeedSetPreviousPosition { +public: + // prevent constructor by default + NeedSetPreviousPosition& operator=(NeedSetPreviousPosition const&); + NeedSetPreviousPosition(NeedSetPreviousPosition const&); + NeedSetPreviousPosition(); +}; diff --git a/src/mc/entity/systems/NoClipOrNoBlockMoveFilterSystem.h b/src/mc/entity/systems/NoClipOrNoBlockMoveFilterSystem.h index 19280e12d2..ba23d7cd5b 100644 --- a/src/mc/entity/systems/NoClipOrNoBlockMoveFilterSystem.h +++ b/src/mc/entity/systems/NoClipOrNoBlockMoveFilterSystem.h @@ -3,7 +3,6 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/common/wrapper/Optional.h" #include "mc/entity/EntityModifier.h" class NoClipOrNoBlockMoveFilterSystem { @@ -19,19 +18,9 @@ class NoClipOrNoBlockMoveFilterSystem { MCAPI static struct TickingSystemWithInfo create(); // symbol: - // ?tick@NoClipOrNoBlockMoveFilterSystem@@SAXAEBVStrictEntityContext@@AEBUMoveRequestComponent@@AEBUOffsetsComponent@@V?$Optional@$$CBUSlideOffsetComponent@@@@AEBUActorDataFlagComponent@@AEAUAABBShapeComponent@@AEAUStateVectorComponent@@AEAUSubBBsComponent@@V?$EntityModifier@UMoveRequestComponent@@@@AEBVIConstBlockSource@@@Z - MCAPI static void tick( - class StrictEntityContext const& context, - struct MoveRequestComponent const&, - struct OffsetsComponent const&, - class Optional, - struct ActorDataFlagComponent const&, - struct AABBShapeComponent& aabb, - struct StateVectorComponent& state, - struct SubBBsComponent&, - class EntityModifier mod, - class IConstBlockSource const& region - ); + // ?tick@NoClipOrNoBlockMoveFilterSystem@@SAXAEBVStrictEntityContext@@AEBUMoveRequestComponent@@AEBUOffsetsComponent@@AEBUActorDataFlagComponent@@AEAUAABBShapeComponent@@AEAUStateVectorComponent@@AEAUSubBBsComponent@@V?$EntityModifier@UMoveRequestComponent@@@@AEBVIConstBlockSource@@@Z + MCAPI static void + tick(class StrictEntityContext const&, struct MoveRequestComponent const&, struct OffsetsComponent const&, struct ActorDataFlagComponent const&, struct AABBShapeComponent&, struct StateVectorComponent&, struct SubBBsComponent&, class EntityModifier, class IConstBlockSource const&); // NOLINTEND }; diff --git a/src/mc/entity/systems/PassengerFreezeMovementSystem.h b/src/mc/entity/systems/PassengerFreezeMovementSystem.h index 1c4cb5c411..e26675a714 100644 --- a/src/mc/entity/systems/PassengerFreezeMovementSystem.h +++ b/src/mc/entity/systems/PassengerFreezeMovementSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class PassengerFreezeMovementSystem { public: // prevent constructor by default @@ -17,5 +22,14 @@ class PassengerFreezeMovementSystem { // symbol: ?freezeMovement@PassengerFreezeMovementSystem@@SAXAEAVStrictEntityContext@@AEAUStateVectorComponent@@@Z MCAPI static void freezeMovement(class StrictEntityContext&, struct StateVectorComponent&); + // symbol: + // ?tickPassengerFreezeMovementSystem@PassengerFreezeMovementSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@UPassengerComponent@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@UStateVectorComponent@@@@@Z + MCAPI static void tickPassengerFreezeMovementSystem( + class ViewT< + class StrictEntityContext, + struct Include>, + struct StateVectorComponent> view + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/PassengerTickSystem.h b/src/mc/entity/systems/PassengerTickSystem.h index 161bf8902f..7c4092d3b5 100644 --- a/src/mc/entity/systems/PassengerTickSystem.h +++ b/src/mc/entity/systems/PassengerTickSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class PassengerTickSystem { public: // prevent constructor by default @@ -17,5 +22,25 @@ class PassengerTickSystem { // symbol: ?createPlayerPostPassengerTickSystem@PassengerTickSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createPlayerPostPassengerTickSystem(); + // symbol: + // ?tickMob@PassengerTickSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@@@UFallDistanceComponent@@@@@Z + MCAPI static void tickMob(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent, + struct PassengerComponent>, + struct FallDistanceComponent> view); + + // symbol: + // ?tickPlayer@PassengerTickSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@@@VActorOwnerComponent@@@@@Z + MCAPI static void tickPlayer(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent, + struct PassengerComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/PushActorsSystem.h b/src/mc/entity/systems/PushActorsSystem.h index d3c294fedd..6f6a9d8209 100644 --- a/src/mc/entity/systems/PushActorsSystem.h +++ b/src/mc/entity/systems/PushActorsSystem.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + class PushActorsSystem { public: // prevent constructor by default @@ -11,6 +17,19 @@ class PushActorsSystem { public: // NOLINTBEGIN + // symbol: + // ?_tickPushActors@PushActorsSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UMobFlag@@@@UPushActorsRequestComponent@@@@VActorOwnerComponent@@@@V?$EntityModifier@UPushActorsRequestComponent@@@@@Z + MCAPI static void _tickPushActors( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent, + struct PushActorsRequestComponent>, + class ActorOwnerComponent> view, + class EntityModifier mod + ); + // symbol: ?createSystem@PushActorsSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); diff --git a/src/mc/entity/systems/RemovePassengersWithoutSeatSystem.h b/src/mc/entity/systems/RemovePassengersWithoutSeatSystem.h index c5c35d5045..ad8fa68aef 100644 --- a/src/mc/entity/systems/RemovePassengersWithoutSeatSystem.h +++ b/src/mc/entity/systems/RemovePassengersWithoutSeatSystem.h @@ -3,6 +3,8 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -28,4 +30,19 @@ class RemovePassengersWithoutSeatSystem { ); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: + // ?_tickRemovePassengersWithoutSeat@RemovePassengersWithoutSeatSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBVRideableComponent@@UVehicleComponent@@@@V?$EntityModifier@V?$FlagComponent@UStopRidingRequestFlag@@@@@@@Z + MCAPI static void _tickRemovePassengersWithoutSeat( + class ViewT< + class StrictEntityContext, + struct Include>, + class RideableComponent const, + struct VehicleComponent> view, + class EntityModifier> modifier + ); + + // NOLINTEND }; diff --git a/src/mc/entity/systems/ReplayStateSystem.h b/src/mc/entity/systems/ReplayStateSystem.h index 46e172463f..8a4f2f3b15 100644 --- a/src/mc/entity/systems/ReplayStateSystem.h +++ b/src/mc/entity/systems/ReplayStateSystem.h @@ -2,10 +2,19 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + namespace ReplayStateSystem { // NOLINTBEGIN -// symbol: ?createReplayStateSystem@ReplayStateSystem@@YA?AUTickingSystemWithInfo@@XZ -MCAPI struct TickingSystemWithInfo createReplayStateSystem(); +// symbol: +// ?_tickReplayStateSystem@ReplayStateSystem@@YAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUPlayerCurrentTickComponent@@VReplayStateComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUVehicleInputIntentComponent@@VReplayStateComponent@@@@@Z +MCAPI void _tickReplayStateSystem(class ViewT>, struct PlayerCurrentTickComponent const, class ReplayStateComponent>, class ViewT>, struct VehicleInputIntentComponent const, class ReplayStateComponent>); + +// symbol: ?registerSystems@ReplayStateSystem@@YAXAEAVEntitySystems@@@Z +MCAPI void registerSystems(class EntitySystems&); // NOLINTEND }; // namespace ReplayStateSystem diff --git a/src/mc/entity/systems/ResetActionStopSystem.h b/src/mc/entity/systems/ResetActionStopSystem.h index ed68d65e94..3a8508e60d 100644 --- a/src/mc/entity/systems/ResetActionStopSystem.h +++ b/src/mc/entity/systems/ResetActionStopSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class ResetActionStopSystem { public: // prevent constructor by default @@ -14,5 +19,14 @@ class ResetActionStopSystem { // symbol: ?createResetActionStopSystem@ResetActionStopSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createResetActionStopSystem(); + // symbol: + // ?tickResetActionStopSystem@ResetActionStopSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@@@UActionOrStopComponent@@@@@Z + MCAPI static void tickResetActionStopSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct ActionOrStopComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/ResetJumpRidingScaleSystem.h b/src/mc/entity/systems/ResetJumpRidingScaleSystem.h index 97af09ad00..ed27fb0e38 100644 --- a/src/mc/entity/systems/ResetJumpRidingScaleSystem.h +++ b/src/mc/entity/systems/ResetJumpRidingScaleSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class ResetJumpRidingScaleSystem { public: // prevent constructor by default @@ -14,6 +19,15 @@ class ResetJumpRidingScaleSystem { // symbol: ?createSystem@ResetJumpRidingScaleSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); + // symbol: + // ?tick@ResetJumpRidingScaleSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPlayerInputRequestComponent@@@@UJumpRidingScaleComponent@@UVanillaClientGameplayComponent@@@@@Z + MCAPI static void + tick(class ViewT< + class StrictEntityContext, + struct Include, struct PlayerInputRequestComponent>, + struct JumpRidingScaleComponent, + struct VanillaClientGameplayComponent> view); + // NOLINTEND // private: diff --git a/src/mc/entity/systems/ResetSlideOffSetSystem.h b/src/mc/entity/systems/ResetSlideOffSetSystem.h deleted file mode 100644 index 8a33d331ca..0000000000 --- a/src/mc/entity/systems/ResetSlideOffSetSystem.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/Exclude.h" -#include "mc/common/wrapper/ViewT.h" -#include "mc/world/components/FlagComponent.h" - -class ResetSlideOffSetSystem { -public: - // prevent constructor by default - ResetSlideOffSetSystem& operator=(ResetSlideOffSetSystem const&); - ResetSlideOffSetSystem(ResetSlideOffSetSystem const&); - ResetSlideOffSetSystem(); - -public: - // NOLINTBEGIN - // symbol: ?createResetSlideOffSetSystem@ResetSlideOffSetSystem@@SA?AUTickingSystemWithInfo@@XZ - MCAPI static struct TickingSystemWithInfo createResetSlideOffSetSystem(); - - // symbol: - // ?tickResetSlideOffSetSystem@ResetSlideOffSetSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Exclude@V?$FlagComponent@UAutoStepRequestFlag@@@@@@$$CBUMoveRequestComponent@@USlideOffsetComponent@@@@@Z - MCAPI static void tickResetSlideOffSetSystem(class ViewT< - class StrictEntityContext, - struct Exclude>, - struct MoveRequestComponent const, - struct SlideOffsetComponent> view); - - // NOLINTEND -}; diff --git a/src/mc/entity/systems/ScaleByAgeSystem.h b/src/mc/entity/systems/ScaleByAgeSystem.h index 14c98f75b9..a44115cb63 100644 --- a/src/mc/entity/systems/ScaleByAgeSystem.h +++ b/src/mc/entity/systems/ScaleByAgeSystem.h @@ -3,31 +3,19 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/entity/systems/ITickingSystem.h" - -class ScaleByAgeSystem : public ::ITickingSystem { -public: - // prevent constructor by default - ScaleByAgeSystem& operator=(ScaleByAgeSystem const&); - ScaleByAgeSystem(ScaleByAgeSystem const&); - ScaleByAgeSystem(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1ScaleByAgeSystem@@UEAA@XZ - virtual ~ScaleByAgeSystem() = default; - - // vIndex: 1, symbol: ?registerEvents@ISystem@@UEAAXAEAV?$basic_dispatcher@V?$allocator@X@std@@@entt@@@Z - virtual void registerEvents(entt::dispatcher&); - - // vIndex: 2, symbol: ?tick@ScaleByAgeSystem@@UEAAXAEAVEntityRegistry@@@Z - virtual void tick(class EntityRegistry& registry); - - // vIndex: 3, symbol: ?singleTick@ITickingSystem@@UEAAXAEAVEntityRegistry@@AEAVEntityContext@@@Z - virtual void singleTick(class EntityRegistry& registry, class EntityContext& entity); - - // vIndex: 4, symbol: ?singleTick@ITickingSystem@@UEAAXAEAVEntityRegistry@@AEAVStrictEntityContext@@@Z - virtual void singleTick(class EntityRegistry& registry, class StrictEntityContext& entity); - - // NOLINTEND -}; +#include "mc/common/wrapper/Include.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + +namespace ScaleByAgeSystem { +// NOLINTBEGIN +// symbol: +// ?_tick@ScaleByAgeSystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorTickedFlag@@@@@@@entt@@AEBVStrictEntityContext@@AEBVAgeableComponent@@AEAUActorDataBoundingBoxComponent@@AEAUActorDataDirtyFlagsComponent@@AEAVActorOwnerComponent@@AEAVScaleByAgeComponent@@V?$EntityModifier@UShouldUpdateBoundingBoxRequestComponent@@@@@Z +MCAPI void +_tick(entt::type_list>>, class StrictEntityContext const&, class AgeableComponent const&, struct ActorDataBoundingBoxComponent&, struct ActorDataDirtyFlagsComponent&, class ActorOwnerComponent&, class ScaleByAgeComponent&, class EntityModifier); + +// symbol: ?registerSystems@ScaleByAgeSystem@@YAXAEAVEntitySystems@@AEBVBaseGameVersion@@@Z +MCAPI void registerSystems(class EntitySystems&, class BaseGameVersion const&); +// NOLINTEND + +}; // namespace ScaleByAgeSystem diff --git a/src/mc/entity/systems/ServerPlayerFallDamageSystem.h b/src/mc/entity/systems/ServerPlayerFallDamageSystem.h index bb4c0a3798..288a37ca91 100644 --- a/src/mc/entity/systems/ServerPlayerFallDamageSystem.h +++ b/src/mc/entity/systems/ServerPlayerFallDamageSystem.h @@ -17,28 +17,11 @@ class ServerPlayerFallDamageSystem { public: // NOLINTBEGIN // symbol: - // ?_doServerPlayerFallDamageSystem@ServerPlayerFallDamageSystem@@SAXAEBVStrictEntityContext@@AEBUMovementAbilitiesComponent@@AEBUActorDataFlagComponent@@AEBUStateVectorComponent@@AEAUFallDistanceComponent@@V?$Optional@$$CBV?$FlagComponent@UWasOnGroundFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UHasTeleportedFlag@@@@@@V?$EntityModifier@V?$FlagComponent@UHasTeleportedFlag@@@@V?$FlagComponent@USendPlayerOnGroundRequestFlag@@@@UCheckFallDamageRequestComponent@@V?$FlagComponent@UWasOnGroundFlag@@@@@@@Z - MCAPI static void _doServerPlayerFallDamageSystem( - class StrictEntityContext const& entity, - struct MovementAbilitiesComponent const&, - struct ActorDataFlagComponent const&, - struct StateVectorComponent const&, - struct FallDistanceComponent&, - class Optional const>, - class Optional const>, - class Optional const>, - class EntityModifier< - class FlagComponent, - class FlagComponent, - struct CheckFallDamageRequestComponent, - class FlagComponent> mod - ); + // ?_doServerPlayerFallDamageSystem@ServerPlayerFallDamageSystem@@SAXAEBVStrictEntityContext@@AEBUMovementAbilitiesComponent@@AEBUActorDataFlagComponent@@AEBUStateVectorComponent@@AEAVActorOwnerComponent@@AEAUFallDistanceComponent@@V?$Optional@$$CBV?$FlagComponent@UWasOnGroundFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UHasTeleportedFlag@@@@@@V?$EntityModifier@V?$FlagComponent@UHasTeleportedFlag@@@@V?$FlagComponent@UWasOnGroundFlag@@@@@@@Z + MCAPI static void _doServerPlayerFallDamageSystem(class StrictEntityContext const&, struct MovementAbilitiesComponent const&, struct ActorDataFlagComponent const&, struct StateVectorComponent const&, class ActorOwnerComponent&, struct FallDistanceComponent&, class Optional const>, class Optional const>, class Optional const>, class EntityModifier, class FlagComponent>); // symbol: ?createSystem@ServerPlayerFallDamageSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); - // symbol: ?createVehicleResetFallDistanceSystem@ServerPlayerFallDamageSystem@@SA?AUTickingSystemWithInfo@@XZ - MCAPI static struct TickingSystemWithInfo createVehicleResetFallDistanceSystem(); - // NOLINTEND }; diff --git a/src/mc/entity/systems/ServerPlayerInputSystem.h b/src/mc/entity/systems/ServerPlayerInputSystem.h index 1b0c06b1d3..e29cc66a63 100644 --- a/src/mc/entity/systems/ServerPlayerInputSystem.h +++ b/src/mc/entity/systems/ServerPlayerInputSystem.h @@ -8,13 +8,16 @@ namespace ServerPlayerInputSystem { // NOLINTBEGIN // symbol: -// ?_tickPlayerMovement@ServerPlayerInputSystem@@YAXAEAVStrictEntityContext@@AEBUPlayerCurrentTickComponent@@AEAUServerPlayerMovementComponent@@V?$EntityModifier@UServerPlayerCurrentMovementComponent@@UServerPlayerMoveAbsoluteComponent@@UServerPlayerInventoryTransactionComponent@@@@@Z +// ?_tickPlayerMovement@ServerPlayerInputSystem@@YAXAEAVStrictEntityContext@@AEBUPlayerCurrentTickComponent@@AEAUServerPlayerMovementComponent@@V?$EntityModifier@UServerPlayerCurrentMovementComponent@@UServerPlayerMoveAbsoluteComponent@@UServerPlayerInventoryTransactionComponent@@UServerPlayerInteractComponent@@@@@Z MCAPI void -_tickPlayerMovement(class StrictEntityContext&, struct PlayerCurrentTickComponent const&, struct ServerPlayerMovementComponent&, class EntityModifier); +_tickPlayerMovement(class StrictEntityContext&, struct PlayerCurrentTickComponent const&, struct ServerPlayerMovementComponent&, class EntityModifier); // symbol: ?create@ServerPlayerInputSystem@@YA?AUTickingSystemWithInfo@@XZ MCAPI struct TickingSystemWithInfo create(); +// symbol: ?onInteractPacket@ServerPlayerInputSystem@@YA_NAEAUServerPlayerMovementComponent@@AEBVInteractPacket@@@Z +MCAPI bool onInteractPacket(struct ServerPlayerMovementComponent&, class InteractPacket const&); + // symbol: // ?onInventoryTransactionPacket@ServerPlayerInputSystem@@YA_NAEAUServerPlayerMovementComponent@@V?$shared_ptr@VInventoryTransactionPacket@@@std@@@Z MCAPI bool diff --git a/src/mc/entity/systems/ServerPlayerMovementComponent.h b/src/mc/entity/systems/ServerPlayerMovementComponent.h index 8d761bfeb7..69ef1da376 100644 --- a/src/mc/entity/systems/ServerPlayerMovementComponent.h +++ b/src/mc/entity/systems/ServerPlayerMovementComponent.h @@ -20,6 +20,9 @@ struct ServerPlayerMovementComponent { // symbol: ??0ServerPlayerMovementComponent@@QEAA@$$QEAU0@@Z MCAPI ServerPlayerMovementComponent(struct ServerPlayerMovementComponent&&); + // symbol: ?addInteractPacket@ServerPlayerMovementComponent@@QEAA_NAEBVInteractPacket@@@Z + MCAPI bool addInteractPacket(class InteractPacket const&); + // symbol: // ?addInventoryTransactionPacket@ServerPlayerMovementComponent@@QEAA_NV?$shared_ptr@VInventoryTransactionPacket@@@std@@@Z MCAPI bool addInventoryTransactionPacket(std::shared_ptr); diff --git a/src/mc/entity/systems/ServerPlayerMovementSystem.h b/src/mc/entity/systems/ServerPlayerMovementSystem.h index 33ece1eb3c..706fb35f9f 100644 --- a/src/mc/entity/systems/ServerPlayerMovementSystem.h +++ b/src/mc/entity/systems/ServerPlayerMovementSystem.h @@ -11,16 +11,11 @@ class ServerPlayerMovementSystem { public: // NOLINTBEGIN - // symbol: - // ?_updateFallDistance@ServerPlayerMovementSystem@@SAXAEBUServerPlayerCurrentMovementComponent@@AEBUStateVectorComponent@@AEAUFallDistanceComponent@@@Z - MCAPI static void - _updateFallDistance(struct ServerPlayerCurrentMovementComponent const&, struct StateVectorComponent const&, struct FallDistanceComponent&); - // symbol: ?createClearPlayerActionComponentSystem@ServerPlayerMovementSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createClearPlayerActionComponentSystem(); - // symbol: ?createPostTravelSystems@ServerPlayerMovementSystem@@SA?AV?$array@UTickingSystemWithInfo@@$03@std@@XZ - MCAPI static std::array createPostTravelSystems(); + // symbol: ?createPostTravelSystems@ServerPlayerMovementSystem@@SA?AV?$array@UTickingSystemWithInfo@@$02@std@@XZ + MCAPI static std::array createPostTravelSystems(); // symbol: ?createServerPlayerMovementFinalSystem@ServerPlayerMovementSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createServerPlayerMovementFinalSystem(); diff --git a/src/mc/entity/systems/ServerPlayerSendPlayerOnGroundSystem.h b/src/mc/entity/systems/ServerPlayerSendPlayerOnGroundSystem.h deleted file mode 100644 index c15e2a2870..0000000000 --- a/src/mc/entity/systems/ServerPlayerSendPlayerOnGroundSystem.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -class ServerPlayerSendPlayerOnGroundSystem { -public: - // prevent constructor by default - ServerPlayerSendPlayerOnGroundSystem& operator=(ServerPlayerSendPlayerOnGroundSystem const&); - ServerPlayerSendPlayerOnGroundSystem(ServerPlayerSendPlayerOnGroundSystem const&); - ServerPlayerSendPlayerOnGroundSystem(); - -public: - // NOLINTBEGIN - // symbol: - // ?_sendPlayerOnGround@ServerPlayerSendPlayerOnGroundSystem@@SAXAEAVStrictEntityContext@@AEAVActorOwnerComponent@@@Z - MCAPI static void _sendPlayerOnGround(class StrictEntityContext&, class ActorOwnerComponent& actorComponent); - - // symbol: ?createSystem@ServerPlayerSendPlayerOnGroundSystem@@SA?AUTickingSystemWithInfo@@XZ - MCAPI static struct TickingSystemWithInfo createSystem(); - - // NOLINTEND -}; diff --git a/src/mc/entity/systems/SetPreviousPosRotSystem.h b/src/mc/entity/systems/SetPreviousPosRotSystem.h index 5b661b2971..0324cad83b 100644 --- a/src/mc/entity/systems/SetPreviousPosRotSystem.h +++ b/src/mc/entity/systems/SetPreviousPosRotSystem.h @@ -24,5 +24,8 @@ class SetPreviousPosRotSystem { class EntityModifier> modifier ); + // symbol: ?_setPreviousPosRotSystem@SetPreviousPosRotSystem@@SAXAEBVEntityContext@@@Z + MCAPI static void _setPreviousPosRotSystem(class EntityContext const&); + // NOLINTEND }; diff --git a/src/mc/entity/systems/SetPreviousPositionSystem.h b/src/mc/entity/systems/SetPreviousPositionSystem.h index b683d8de80..c822d5c592 100644 --- a/src/mc/entity/systems/SetPreviousPositionSystem.h +++ b/src/mc/entity/systems/SetPreviousPositionSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class SetPreviousPositionSystem { public: // prevent constructor by default @@ -22,5 +27,14 @@ class SetPreviousPositionSystem { // ?_doSetPreviousPositionSystem@SetPreviousPositionSystem@@CAXAEBVStrictEntityContext@@AEAUStateVectorComponent@@@Z MCAPI static void _doSetPreviousPositionSystem(class StrictEntityContext const&, struct StateVectorComponent&); + // symbol: + // ?_tickSetPreviousPositionSystem@SetPreviousPositionSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UNeedSetPreviousPosition@@@@@@UStateVectorComponent@@@@@Z + MCAPI static void _tickSetPreviousPositionSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct StateVectorComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/SimulatedPlayerPostAIStepSystem.h b/src/mc/entity/systems/SimulatedPlayerPostAIStepSystem.h index 107807d8df..ed6c80c79a 100644 --- a/src/mc/entity/systems/SimulatedPlayerPostAIStepSystem.h +++ b/src/mc/entity/systems/SimulatedPlayerPostAIStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class SimulatedPlayerPostAIStepSystem { public: // prevent constructor by default @@ -22,5 +27,14 @@ class SimulatedPlayerPostAIStepSystem { // ?_doSimulatedPlayerPostAIStepSystem@SimulatedPlayerPostAIStepSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doSimulatedPlayerPostAIStepSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickSimulatedPlayerPostAIStepSystem@SimulatedPlayerPostAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@USimulatedPlayerFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickSimulatedPlayerPostAIStepSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/SlimePreNormalTickSystem.h b/src/mc/entity/systems/SlimePreNormalTickSystem.h index 849f8e9c16..a96cb214e0 100644 --- a/src/mc/entity/systems/SlimePreNormalTickSystem.h +++ b/src/mc/entity/systems/SlimePreNormalTickSystem.h @@ -3,7 +3,9 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -32,5 +34,18 @@ class SlimePreNormalTickSystem { class EntityModifier> mod ); + // symbol: + // ?_tickSlimePreNormalTickSystem@SlimePreNormalTickSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@USlimeFlag@@@@@@VActorOwnerComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@@@V?$EntityModifier@V?$FlagComponent@USlimeWasOnGroundPreNormalTick@@@@@@@Z + MCAPI static void _tickSlimePreNormalTickSystem( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent, + class Optional const>> view, + class EntityModifier> mod + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/StandingVehiclePostPositionPassengerSystem.h b/src/mc/entity/systems/StandingVehiclePostPositionPassengerSystem.h index 465d60b5a6..7652dc65c4 100644 --- a/src/mc/entity/systems/StandingVehiclePostPositionPassengerSystem.h +++ b/src/mc/entity/systems/StandingVehiclePostPositionPassengerSystem.h @@ -24,11 +24,6 @@ class StandingVehiclePostPositionPassengerSystem { // ?_tick@StandingVehiclePostPositionPassengerSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@UPositionPassengerRequestComponent@@@@$$CBUPassengerComponent@@UActorSetPositionRequestComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UHorseFlag@@@@@@$$CBUStandAnimationComponent@@$$CBURenderRotationComponent@@U?$Include@UVehicleComponent@@@@$$CBURenderPositionComponent@@@@@Z MCAPI static void _tick(class ViewT, struct PassengerComponent const, struct ActorSetPositionRequestComponent> view, class ViewT>, struct StandAnimationComponent const, struct RenderRotationComponent const, struct Include, struct RenderPositionComponent const>); - // symbol: - // ?_tickSingleEntity@StandingVehiclePostPositionPassengerSystem@@SAXAEBVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@U?$Include@UPositionPassengerRequestComponent@@@@$$CBUPassengerComponent@@UActorSetPositionRequestComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UHorseFlag@@@@@@$$CBUStandAnimationComponent@@$$CBURenderRotationComponent@@U?$Include@UVehicleComponent@@@@$$CBURenderPositionComponent@@@@@Z - MCAPI static void - _tickSingleEntity(class StrictEntityContext const&, class ViewT, struct PassengerComponent const, struct ActorSetPositionRequestComponent>, class ViewT>, struct StandAnimationComponent const, struct RenderRotationComponent const, struct Include, struct RenderPositionComponent const>); - // symbol: ?createSystem@StandingVehiclePostPositionPassengerSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); diff --git a/src/mc/entity/systems/TeleportPositionModeEventSystem.h b/src/mc/entity/systems/TeleportPositionModeEventSystem.h index c9c3fcc31e..93396c4016 100644 --- a/src/mc/entity/systems/TeleportPositionModeEventSystem.h +++ b/src/mc/entity/systems/TeleportPositionModeEventSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class TeleportPositionModeEventSystem { public: // prevent constructor by default @@ -14,5 +19,15 @@ class TeleportPositionModeEventSystem { // symbol: ?createTeleportPositionModeEventSystem@TeleportPositionModeEventSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createTeleportPositionModeEventSystem(); + // symbol: + // ?tickTeleportPositionModeEventSystem@TeleportPositionModeEventSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@VActorOwnerComponent@@$$CBUPlayerPositionModeComponent@@@@@Z + MCAPI static void tickTeleportPositionModeEventSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent, + struct PlayerPositionModeComponent const> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/TryExitVehicleSystem.h b/src/mc/entity/systems/TryExitVehicleSystem.h index 2ac0738e0c..7ed6cce7b9 100644 --- a/src/mc/entity/systems/TryExitVehicleSystem.h +++ b/src/mc/entity/systems/TryExitVehicleSystem.h @@ -26,6 +26,30 @@ class TryExitVehicleSystem { // private: // NOLINTBEGIN + // symbol: + // ?_tick@TryExitVehicleSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@V?$FlagComponent@UMobIsJumpingFlag@@@@@@$$CBUPassengerComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Exclude@V?$FlagComponent@UBoatFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UMobFlag@@@@@@$$CBUMovementAttributesComponent@@$$CBUVehicleComponent@@$$CBUActorDataFlagComponent@@$$CBUActorDataControllingSeatIndexComponent@@@@V?$EntityModifier@V?$FlagComponent@UStopRidingRequestFlag@@@@V?$FlagComponent@UExitFromPassengerFlag@@@@@@@Z + MCAPI static void _tick( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent, + class FlagComponent>, + struct PassengerComponent const> view, + class ViewT< + class StrictEntityContext, + struct Include>, + struct Exclude>, + class Optional const>, + struct MovementAttributesComponent const, + struct VehicleComponent const, + struct ActorDataFlagComponent const, + struct ActorDataControllingSeatIndexComponent const>, + class EntityModifier< + class FlagComponent, + class FlagComponent> modifier + ); + // symbol: // ?_tickTryExitVehicle@TryExitVehicleSystem@@CAXAEBVStrictEntityContext@@AEBUPassengerComponent@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Exclude@V?$FlagComponent@UBoatFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UMobFlag@@@@@@$$CBUMovementAttributesComponent@@$$CBUVehicleComponent@@$$CBUActorDataFlagComponent@@$$CBUActorDataControllingSeatIndexComponent@@@@AEAV?$EntityModifier@V?$FlagComponent@UStopRidingRequestFlag@@@@V?$FlagComponent@UExitFromPassengerFlag@@@@@@@Z MCAPI static void _tickTryExitVehicle( diff --git a/src/mc/entity/systems/UnderWaterSensingSystem.h b/src/mc/entity/systems/UnderWaterSensingSystem.h index 04f2fc4854..c9cfbd9ffe 100644 --- a/src/mc/entity/systems/UnderWaterSensingSystem.h +++ b/src/mc/entity/systems/UnderWaterSensingSystem.h @@ -40,7 +40,7 @@ struct UnderWaterSensingSystem { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@UnderWaterSensingSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UDimensionTypeComponent@@UStateVectorComponent@@UUpdateWaterStateRequestComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UActorHeadInWaterFlag@@@@V?$FlagComponent@UActorHeadWasInWaterFlag@@@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@UnderWaterSensingSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UDimensionTypeComponent@@UStateVectorComponent@@UUpdateWaterStateRequestComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UActorHeadInWaterFlag@@@@V?$FlagComponent@UActorHeadWasInWaterFlag@@@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -53,13 +53,13 @@ struct UnderWaterSensingSystem { struct DimensionTypeComponent, struct StateVectorComponent, struct UpdateWaterStateRequestComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, struct ActorDataFlagComponent, struct AABBShapeComponent, - struct ActorRotationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent>, @@ -72,8 +72,8 @@ struct UnderWaterSensingSystem { struct EntityFactoryT<>>& context); // vIndex: 6, symbol: - // ?singleTick@UnderWaterSensingSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UDimensionTypeComponent@@UStateVectorComponent@@UUpdateWaterStateRequestComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UActorHeadInWaterFlag@@@@V?$FlagComponent@UActorHeadWasInWaterFlag@@@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z - virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove, class FlagComponent>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + // ?singleTick@UnderWaterSensingSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UDimensionTypeComponent@@UStateVectorComponent@@UUpdateWaterStateRequestComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UActorHeadInWaterFlag@@@@V?$FlagComponent@UActorHeadWasInWaterFlag@@@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove, class FlagComponent>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // symbol: ?createSystem@UnderWaterSensingSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); diff --git a/src/mc/entity/systems/UpdateRenderPosSystem.h b/src/mc/entity/systems/UpdateRenderPosSystem.h index 8cd5c374bb..63745767d9 100644 --- a/src/mc/entity/systems/UpdateRenderPosSystem.h +++ b/src/mc/entity/systems/UpdateRenderPosSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class UpdateRenderPosSystem { public: // prevent constructor by default @@ -23,5 +28,14 @@ class UpdateRenderPosSystem { MCAPI static void _doUpdateRenderPosSystem(class StrictEntityContext const&, struct StateVectorComponent const&, struct RenderPositionComponent&); + // symbol: + // ?_tickUpdateRenderPosSystem@UpdateRenderPosSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUStateVectorComponent@@URenderPositionComponent@@@@@Z + MCAPI static void + _tickUpdateRenderPosSystem(class ViewT< + class StrictEntityContext, + struct Include>, + struct StateVectorComponent const, + struct RenderPositionComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/VehicleServerMolangSeatPositionSystem.h b/src/mc/entity/systems/VehicleServerMolangSeatPositionSystem.h index 26eb639b33..7f93fcf098 100644 --- a/src/mc/entity/systems/VehicleServerMolangSeatPositionSystem.h +++ b/src/mc/entity/systems/VehicleServerMolangSeatPositionSystem.h @@ -24,11 +24,6 @@ class VehicleServerMolangSeatPositionSystem { MCAPI static void _tickVehicleServerMolangSeatPositionSystem(class ViewT, class ViewT); - // symbol: - // ?_tickVehicleServerMolangSeatPositionSystemSingleEntity@VehicleServerMolangSeatPositionSystem@@SAXAEBVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@$$CBUPassengerComponent@@VActorOwnerComponent@@UPositionPassengerRequestComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBVRideableComponent@@$$CBUVehicleComponent@@@@@Z - MCAPI static void - _tickVehicleServerMolangSeatPositionSystemSingleEntity(class StrictEntityContext const&, class ViewT, class ViewT); - // symbol: ?createSystem@VehicleServerMolangSeatPositionSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); diff --git a/src/mc/entity/systems/VehicleServerSeatPositionSystem.h b/src/mc/entity/systems/VehicleServerSeatPositionSystem.h index 08890ddc3b..60d0201223 100644 --- a/src/mc/entity/systems/VehicleServerSeatPositionSystem.h +++ b/src/mc/entity/systems/VehicleServerSeatPositionSystem.h @@ -22,13 +22,13 @@ class VehicleServerSeatPositionSystem { // private: // NOLINTBEGIN // symbol: - // ?_setSeatDescriptionToActorDataSystem@VehicleServerSeatPositionSystem@@CAXV?$ViewT@VStrictEntityContext@@$$CBUPassengerComponent@@$$CBUPositionPassengerRequestComponent@@$$CBUOffsetsComponent@@UActorDataFlagComponent@@UActorDataSeatOffsetComponent@@UActorDataDirtyFlagsComponent@@USynchedActorDataComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUVehicleComponent@@$$CBUSynchedActorDataComponent@@$$CBVRideableComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBURidingHeightComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUAdultRidingHeightOffsetComponent@@@@@Z - MCAPI static void - _setSeatDescriptionToActorDataSystem(class ViewT, class ViewT, class ViewT, class ViewT); + // ?_getRidingHeight@VehicleServerSeatPositionSystem@@CAMAEBVStrictEntityContext@@AEBUOffsetsComponent@@AEBUActorDataFlagComponent@@V?$ViewT@VStrictEntityContext@@$$CBURidingHeightComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUAdultRidingHeightOffsetComponent@@@@@Z + MCAPI static float + _getRidingHeight(class StrictEntityContext const& context, struct OffsetsComponent const&, struct ActorDataFlagComponent const&, class ViewT, class ViewT); // symbol: - // ?_setSeatDescriptionToActorDataSystemSingleEntity@VehicleServerSeatPositionSystem@@CAXAEBVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@$$CBUPassengerComponent@@$$CBUPositionPassengerRequestComponent@@$$CBUOffsetsComponent@@UActorDataFlagComponent@@UActorDataSeatOffsetComponent@@UActorDataDirtyFlagsComponent@@USynchedActorDataComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUVehicleComponent@@$$CBUSynchedActorDataComponent@@$$CBVRideableComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBURidingHeightComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUAdultRidingHeightOffsetComponent@@@@@Z - MCAPI static void _setSeatDescriptionToActorDataSystemSingleEntity(class StrictEntityContext const&, class ViewT, class ViewT, class ViewT, class ViewT); + // ?_setSeatDescriptionToActorDataSystem@VehicleServerSeatPositionSystem@@CAXV?$ViewT@VStrictEntityContext@@$$CBUPassengerComponent@@$$CBUPositionPassengerRequestComponent@@$$CBUOffsetsComponent@@UActorDataFlagComponent@@UActorDataSeatOffsetComponent@@UActorDataDirtyFlagsComponent@@USynchedActorDataComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUVehicleComponent@@$$CBUActorDataBoundingBoxComponent@@$$CBVRideableComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBURidingHeightComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUAdultRidingHeightOffsetComponent@@@@@Z + MCAPI static void _setSeatDescriptionToActorDataSystem(class ViewT, class ViewT, class ViewT, class ViewT); // NOLINTEND }; diff --git a/src/mc/entity/systems/VerticalCollisionSystem.h b/src/mc/entity/systems/VerticalCollisionSystem.h index 3bb667ab1e..563de59a7e 100644 --- a/src/mc/entity/systems/VerticalCollisionSystem.h +++ b/src/mc/entity/systems/VerticalCollisionSystem.h @@ -38,34 +38,39 @@ class VerticalCollisionSystem { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@VerticalCollisionSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@@@U?$Read@UActorDataFlagComponent@@UMoveRequestComponent@@UAABBShapeComponent@@UDimensionTypeComponent@@UStateVectorComponent@@@@U?$Write@UStateVectorComponent@@UWalkDistComponent@@@@U?$AddRemove@UBounceComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@VerticalCollisionSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@@@U?$Read@UDimensionTypeComponent@@UStateVectorComponent@@UActorDataFlagComponent@@UMoveRequestComponent@@UAABBShapeComponent@@@@U?$Write@UStateVectorComponent@@@@U?$AddRemove@UBounceComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, class FlagComponent, class FlagComponent>, struct Read< + struct DimensionTypeComponent, + struct StateVectorComponent, struct ActorDataFlagComponent, struct MoveRequestComponent, - struct AABBShapeComponent, - struct DimensionTypeComponent, - struct StateVectorComponent>, - struct Write, + struct AABBShapeComponent>, + struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&); // vIndex: 6, symbol: - // ?singleTick@VerticalCollisionSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@@@U?$Read@UActorDataFlagComponent@@UMoveRequestComponent@@UAABBShapeComponent@@UDimensionTypeComponent@@UStateVectorComponent@@@@U?$Write@UStateVectorComponent@@UWalkDistComponent@@@@U?$AddRemove@UBounceComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z - virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + // ?singleTick@VerticalCollisionSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@@@U?$Read@UDimensionTypeComponent@@UStateVectorComponent@@UActorDataFlagComponent@@UMoveRequestComponent@@UAABBShapeComponent@@@@U?$Write@UStateVectorComponent@@@@U?$AddRemove@UBounceComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void + singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // symbol: ?create@VerticalCollisionSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo create(); + // symbol: ?getMaxCollisionVolume@VerticalCollisionSystem@@SA?AVAABB@@AEBVVec3@@AEBV2@@Z + MCAPI static class AABB getMaxCollisionVolume(class Vec3 const&, class AABB const&); + // symbol: - // ?tickVerticalCollisionSystem@VerticalCollisionSystem@@SAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUStateVectorComponent@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@@@U?$Read@UActorDataFlagComponent@@UMoveRequestComponent@@UAABBShapeComponent@@UDimensionTypeComponent@@UStateVectorComponent@@@@U?$Write@UStateVectorComponent@@UWalkDistComponent@@@@U?$AddRemove@UBounceComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEBVIConstBlockSource@@@Z - MCAPI static void tickVerticalCollisionSystem(class StrictEntityContext const&, struct AABBShapeComponent const&, struct StateVectorComponent const&, class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class IConstBlockSource const&); + // ?tickVerticalCollisionSystem@VerticalCollisionSystem@@SAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUMoveRequestComponent@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@@@U?$Read@UDimensionTypeComponent@@UStateVectorComponent@@UActorDataFlagComponent@@UMoveRequestComponent@@UAABBShapeComponent@@@@U?$Write@UStateVectorComponent@@@@U?$AddRemove@UBounceComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + MCAPI static void + tickVerticalCollisionSystem(class StrictEntityContext const&, struct AABBShapeComponent const&, struct MoveRequestComponent const&, class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&); // NOLINTEND }; diff --git a/src/mc/entity/systems/WaterSinkInputSystem.h b/src/mc/entity/systems/WaterSinkInputSystem.h index 97f233f27d..b63da05b5d 100644 --- a/src/mc/entity/systems/WaterSinkInputSystem.h +++ b/src/mc/entity/systems/WaterSinkInputSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class WaterSinkInputSystem { public: // prevent constructor by default @@ -19,5 +24,17 @@ class WaterSinkInputSystem { MCAPI static void doInWaterSinkInputSystem(struct MovementAbilitiesComponent const&, struct MoveInputComponent const&, struct StateVectorComponent&); + // symbol: + // ?tickWaterSinkInputSystem@WaterSinkInputSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPlayerInputRequestComponent@@V?$FlagComponent@UInWaterFlag@@@@@@$$CBUMovementAbilitiesComponent@@$$CBUMoveInputComponent@@UStateVectorComponent@@@@@Z + MCAPI static void tickWaterSinkInputSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + struct PlayerInputRequestComponent, + class FlagComponent>, + struct MovementAbilitiesComponent const, + struct MoveInputComponent const, + struct StateVectorComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/AccumulateSystem.h b/src/mc/entity/systems/common/AccumulateSystem.h new file mode 100644 index 0000000000..118d8d935c --- /dev/null +++ b/src/mc/entity/systems/common/AccumulateSystem.h @@ -0,0 +1,84 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/GlobalRead.h" +#include "mc/common/GlobalWrite.h" +#include "mc/common/StrictExecutionContext.h" +#include "mc/common/wrapper/AddRemove.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/deps/core/data/Filter.h" +#include "mc/deps/core/data/Read.h" +#include "mc/deps/core/data/Write.h" +#include "mc/entity/EntityFactoryT.h" +#include "mc/world/components/FlagComponent.h" + +// auto generated forward declare list +// clang-format off +class StrictEntityContext; +struct ActorDataBoundingBoxComponent; +struct ActorDataFlagComponent; +struct ActorDataHorseFlagComponent; +struct ActorDataJumpDurationComponent; +struct ActorDataSeatOffsetComponent; +struct ActorMovementTickNeededFlag; +struct ReplayStateTrackerComponent; +// clang-format on + +namespace ClientRewind { + +struct AccumulateSystem { +public: + // prevent constructor by default + AccumulateSystem& operator=(AccumulateSystem const&); + AccumulateSystem(AccumulateSystem const&); + AccumulateSystem(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1AccumulateSystem@ClientRewind@@UEAA@XZ + virtual ~AccumulateSystem() = default; + + // vIndex: 1, symbol: ?registerEvents@ISystem@@UEAAXAEAV?$basic_dispatcher@V?$allocator@X@std@@@entt@@@Z + virtual void registerEvents(entt::dispatcher&); + + // vIndex: 2, symbol: __unk_vfn_2 + virtual void __unk_vfn_2(); + + // vIndex: 3, symbol: __unk_vfn_3 + virtual void __unk_vfn_3(); + + // vIndex: 4, symbol: __unk_vfn_4 + virtual void __unk_vfn_4(); + + // vIndex: 5, symbol: + // ?tick@AccumulateSystem@ClientRewind@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Read@UActorDataFlagComponent@@UActorDataHorseFlagComponent@@UActorDataJumpDurationComponent@@UActorDataBoundingBoxComponent@@UActorDataSeatOffsetComponent@@@@U?$Write@UReplayStateTrackerComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + virtual void tick(class StrictExecutionContext< + struct Filter>, + struct Read< + struct ActorDataFlagComponent, + struct ActorDataHorseFlagComponent, + struct ActorDataJumpDurationComponent, + struct ActorDataBoundingBoxComponent, + struct ActorDataSeatOffsetComponent>, + struct Write, + struct AddRemove<>, + struct GlobalRead<>, + struct GlobalWrite<>, + struct EntityFactoryT<>>&); + + // vIndex: 6, symbol: + // ?singleTick@AccumulateSystem@ClientRewind@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Read@UActorDataFlagComponent@@UActorDataHorseFlagComponent@@UActorDataJumpDurationComponent@@UActorDataBoundingBoxComponent@@UActorDataSeatOffsetComponent@@@@U?$Write@UReplayStateTrackerComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void singleTick(class StrictExecutionContext>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + + // symbol: + // ?tickEntity@AccumulateSystem@ClientRewind@@SAXAEBVStrictEntityContext@@AEAUReplayStateTrackerComponent@@AEBV?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@V?$Optional@$$CBUActorDataHorseFlagComponent@@@@V?$Optional@$$CBUActorDataJumpDurationComponent@@@@V?$Optional@$$CBUActorDataBoundingBoxComponent@@@@V?$Optional@$$CBUActorDataSeatOffsetComponent@@@@@@@Z + MCAPI static void + tickEntity(class StrictEntityContext const&, struct ReplayStateTrackerComponent&, class ViewT, class Optional, class Optional, class Optional> const&); + + // NOLINTEND +}; + +}; // namespace ClientRewind diff --git a/src/mc/entity/systems/common/ActorSetPosSystem.h b/src/mc/entity/systems/common/ActorSetPosSystem.h index b392a94fa2..58d9d8ce59 100644 --- a/src/mc/entity/systems/common/ActorSetPosSystem.h +++ b/src/mc/entity/systems/common/ActorSetPosSystem.h @@ -38,7 +38,7 @@ class ActorSetPosSystem { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@ActorSetPosSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorAddedFlag@@@@V?$FlagComponent@UActorRemovedFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@V?$FlagComponent@UPaintingFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@VActorOwnerComponent@@UChunkPositionComponent@@UOffsetsComponent@@USlideOffsetComponent@@@@U?$Write@UAABBShapeComponent@@UActorSetPositionRequestComponent@@VHitboxComponent@@UStateVectorComponent@@USynchedActorDataComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@@@U?$AddRemove@V?$FlagComponent@UActorChunkMoveFlag@@@@V?$FlagComponent@UActorLocalPlayerEntityMovedFlag@@@@UActorSetPositionRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@ActorSetPosSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorAddedFlag@@@@V?$FlagComponent@UActorRemovedFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@V?$FlagComponent@UPaintingFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@VActorOwnerComponent@@UChunkPositionComponent@@UOffsetsComponent@@@@U?$Write@UAABBShapeComponent@@UActorSetPositionRequestComponent@@VHitboxComponent@@UStateVectorComponent@@USynchedActorDataComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@@@U?$AddRemove@V?$FlagComponent@UActorChunkMoveFlag@@@@V?$FlagComponent@UActorLocalPlayerEntityMovedFlag@@@@UActorSetPositionRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -47,11 +47,7 @@ class ActorSetPosSystem { class FlagComponent, class FlagComponent, class FlagComponent>, - struct Read< - class ActorOwnerComponent, - struct ChunkPositionComponent, - struct OffsetsComponent, - struct SlideOffsetComponent>, + struct Read, struct Write< struct AABBShapeComponent, struct ActorSetPositionRequestComponent, @@ -69,7 +65,7 @@ class ActorSetPosSystem { struct EntityFactoryT<>>& executionContext); // vIndex: 6, symbol: - // ?singleTick@ActorSetPosSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorAddedFlag@@@@V?$FlagComponent@UActorRemovedFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@V?$FlagComponent@UPaintingFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@VActorOwnerComponent@@UChunkPositionComponent@@UOffsetsComponent@@USlideOffsetComponent@@@@U?$Write@UAABBShapeComponent@@UActorSetPositionRequestComponent@@VHitboxComponent@@UStateVectorComponent@@USynchedActorDataComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@@@U?$AddRemove@V?$FlagComponent@UActorChunkMoveFlag@@@@V?$FlagComponent@UActorLocalPlayerEntityMovedFlag@@@@UActorSetPositionRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + // ?singleTick@ActorSetPosSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorAddedFlag@@@@V?$FlagComponent@UActorRemovedFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@V?$FlagComponent@UPaintingFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@VActorOwnerComponent@@UChunkPositionComponent@@UOffsetsComponent@@@@U?$Write@UAABBShapeComponent@@UActorSetPositionRequestComponent@@VHitboxComponent@@UStateVectorComponent@@USynchedActorDataComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@@@U?$AddRemove@V?$FlagComponent@UActorChunkMoveFlag@@@@V?$FlagComponent@UActorLocalPlayerEntityMovedFlag@@@@UActorSetPositionRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z virtual void singleTick( class StrictExecutionContext< struct Filter< @@ -79,11 +75,7 @@ class ActorSetPosSystem { class FlagComponent, class FlagComponent, class FlagComponent>, - struct Read< - class ActorOwnerComponent, - struct ChunkPositionComponent, - struct OffsetsComponent, - struct SlideOffsetComponent>, + struct Read, struct Write< struct AABBShapeComponent, struct ActorSetPositionRequestComponent, @@ -111,9 +103,8 @@ class ActorSetPosSystem { // symbol: ?moveHitboxTo@ActorSetPosSystem@@SAXAEBVVec3@@AEAV?$vector@UHitbox@@V?$allocator@UHitbox@@@std@@@std@@@Z MCAPI static void moveHitboxTo(class Vec3 const& pos, std::vector&); - // symbol: ?refreshAABB@ActorSetPosSystem@@SA?AVAABB@@MAEBVVec3@@AEBVVec2@@1@Z - MCAPI static class AABB - refreshAABB(float heightOffset, class Vec3 const& pos, class Vec2 const& aabbDim, class Vec2 const&); + // symbol: ?refreshAABB@ActorSetPosSystem@@SA?AVAABB@@MAEBVVec3@@AEBVVec2@@@Z + MCAPI static class AABB refreshAABB(float, class Vec3 const&, class Vec2 const&); // NOLINTEND }; diff --git a/src/mc/entity/systems/common/ActorSetPosSystemImpl.h b/src/mc/entity/systems/common/ActorSetPosSystemImpl.h index 4bf38f7cec..8013ce10be 100644 --- a/src/mc/entity/systems/common/ActorSetPosSystemImpl.h +++ b/src/mc/entity/systems/common/ActorSetPosSystemImpl.h @@ -10,9 +10,9 @@ namespace ActorSetPosSystemImpl { // NOLINTBEGIN // symbol: -// ?_tickActorUpdatePositionAndAABBSystem2@ActorSetPosSystemImpl@@YAXAEBUActorSetPositionRequestComponent@@AEBUOffsetsComponent@@V?$Optional@$$CBUSlideOffsetComponent@@@@AEAUAABBShapeComponent@@AEAUStateVectorComponent@@V?$Optional@V?$FlagComponent@UPaintingFlag@@@@@@@Z +// ?_tickActorUpdatePositionAndAABBSystem2@ActorSetPosSystemImpl@@YAXAEBUActorSetPositionRequestComponent@@AEBUOffsetsComponent@@AEAUAABBShapeComponent@@AEAUStateVectorComponent@@V?$Optional@V?$FlagComponent@UPaintingFlag@@@@@@@Z MCAPI void -_tickActorUpdatePositionAndAABBSystem2(struct ActorSetPositionRequestComponent const&, struct OffsetsComponent const&, class Optional, struct AABBShapeComponent&, struct StateVectorComponent&, class Optional>); +_tickActorUpdatePositionAndAABBSystem2(struct ActorSetPositionRequestComponent const&, struct OffsetsComponent const&, struct AABBShapeComponent&, struct StateVectorComponent&, class Optional>); // symbol: // ?_tickAddLocalPlayerEntityMovedSystemAsynchronous1@ActorSetPosSystemImpl@@YAXAEAVStrictEntityContext@@V?$EntityModifier@V?$FlagComponent@UActorChunkMoveFlag@@@@V?$FlagComponent@UActorLocalPlayerEntityMovedFlag@@@@UActorSetPositionRequestComponent@@@@@Z diff --git a/src/mc/entity/systems/common/ApplyDashSystem.h b/src/mc/entity/systems/common/ApplyDashSystem.h index 050cfdcb14..739a14555b 100644 --- a/src/mc/entity/systems/common/ApplyDashSystem.h +++ b/src/mc/entity/systems/common/ApplyDashSystem.h @@ -3,10 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/common/wrapper/Include.h" -#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" -#include "mc/world/components/FlagComponent.h" class ApplyDashSystem { public: @@ -17,24 +14,6 @@ class ApplyDashSystem { public: // NOLINTBEGIN - // symbol: - // ?_tickApplyDashModifierSystem@ApplyDashSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UDashJump@@@@@@$$CBUTriggerJumpRequestComponent@@$$CBVDashComponent@@$$CBUMovementAttributesComponent@@$$CBUActorRotationComponent@@$$CBUMobEffectsComponent@@UStateVectorComponent@@UJumpPendingScaleComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@@@V?$EntityModifier@UDashCooldownTimerComponent@@@@@Z - MCAPI static void _tickApplyDashModifierSystem( - class ViewT< - class StrictEntityContext, - struct Include>, - struct TriggerJumpRequestComponent const, - class DashComponent const, - struct MovementAttributesComponent const, - struct ActorRotationComponent const, - struct MobEffectsComponent const, - struct StateVectorComponent, - struct JumpPendingScaleComponent, - struct ActorDataFlagComponent, - struct ActorDataDirtyFlagsComponent> view, - class EntityModifier mod - ); - // symbol: ?create@ApplyDashSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo create(); diff --git a/src/mc/entity/systems/common/ApplyJumpModifierSystem.h b/src/mc/entity/systems/common/ApplyJumpModifierSystem.h index 20b9ff0b7c..83c06db2ec 100644 --- a/src/mc/entity/systems/common/ApplyJumpModifierSystem.h +++ b/src/mc/entity/systems/common/ApplyJumpModifierSystem.h @@ -2,12 +2,6 @@ #include "mc/_HeaderOutputPredefine.h" -// auto generated inclusion list -#include "mc/common/wrapper/Exclude.h" -#include "mc/common/wrapper/Include.h" -#include "mc/common/wrapper/ViewT.h" -#include "mc/world/components/FlagComponent.h" - class ApplyJumpModifierSystem { public: // prevent constructor by default @@ -17,22 +11,6 @@ class ApplyJumpModifierSystem { public: // NOLINTBEGIN - // symbol: - // ?_tickApplyJumpModifierSystem@ApplyJumpModifierSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UPowerJump@@@@@@U?$Exclude@V?$FlagComponent@UMobIsJumpingFlag@@@@@@$$CBUTriggerJumpRequestComponent@@$$CBUActorRotationComponent@@$$CBUMovementAttributesComponent@@$$CBUMobEffectsComponent@@$$CBUMobTravelComponent@@UJumpPendingScaleComponent@@UStateVectorComponent@@@@@Z - MCAPI static void _tickApplyJumpModifierSystem( - class ViewT< - class StrictEntityContext, - struct Include, class FlagComponent>, - struct Exclude>, - struct TriggerJumpRequestComponent const, - struct ActorRotationComponent const, - struct MovementAttributesComponent const, - struct MobEffectsComponent const, - struct MobTravelComponent const, - struct JumpPendingScaleComponent, - struct StateVectorComponent> view - ); - // symbol: ?createApplyJumpModifierSystem@ApplyJumpModifierSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createApplyJumpModifierSystem(); diff --git a/src/mc/entity/systems/common/ApplySystem.h b/src/mc/entity/systems/common/ApplySystem.h new file mode 100644 index 0000000000..c04b547846 --- /dev/null +++ b/src/mc/entity/systems/common/ApplySystem.h @@ -0,0 +1,86 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/GlobalRead.h" +#include "mc/common/GlobalWrite.h" +#include "mc/common/StrictExecutionContext.h" +#include "mc/common/wrapper/AddRemove.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/deps/core/data/Filter.h" +#include "mc/deps/core/data/Read.h" +#include "mc/deps/core/data/Write.h" +#include "mc/entity/EntityFactoryT.h" +#include "mc/world/components/FlagComponent.h" + +// auto generated forward declare list +// clang-format off +class StrictEntityContext; +namespace ClientRewind { struct ApplyReplayStateTrackerRequestComponent; } +struct ActorDataBoundingBoxComponent; +struct ActorDataDirtyFlagsComponent; +struct ActorDataFlagComponent; +struct ActorDataHorseFlagComponent; +struct ActorDataJumpDurationComponent; +struct ActorDataSeatOffsetComponent; +struct ActorMovementTickNeededFlag; +// clang-format on + +namespace ClientRewind { + +class ApplySystem { +public: + // prevent constructor by default + ApplySystem& operator=(ApplySystem const&); + ApplySystem(ApplySystem const&); + ApplySystem(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ApplySystem@ClientRewind@@UEAA@XZ + virtual ~ApplySystem() = default; + + // vIndex: 1, symbol: __unk_vfn_1 + virtual void __unk_vfn_1(); + + // vIndex: 2, symbol: __unk_vfn_2 + virtual void __unk_vfn_2(); + + // vIndex: 3, symbol: __unk_vfn_3 + virtual void __unk_vfn_3(); + + // vIndex: 4, symbol: __unk_vfn_4 + virtual void __unk_vfn_4(); + + // vIndex: 5, symbol: + // ?tick@ApplySystem@ClientRewind@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Read@UApplyReplayStateTrackerRequestComponent@ClientRewind@@@@U?$Write@UActorDataFlagComponent@@UActorDataHorseFlagComponent@@UActorDataJumpDurationComponent@@UActorDataBoundingBoxComponent@@UActorDataSeatOffsetComponent@@UActorDataDirtyFlagsComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + virtual void tick(class StrictExecutionContext< + struct Filter>, + struct Read, + struct Write< + struct ActorDataFlagComponent, + struct ActorDataHorseFlagComponent, + struct ActorDataJumpDurationComponent, + struct ActorDataBoundingBoxComponent, + struct ActorDataSeatOffsetComponent, + struct ActorDataDirtyFlagsComponent>, + struct AddRemove<>, + struct GlobalRead<>, + struct GlobalWrite<>, + struct EntityFactoryT<>>&); + + // vIndex: 6, symbol: + // ?singleTick@ApplySystem@ClientRewind@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Read@UApplyReplayStateTrackerRequestComponent@ClientRewind@@@@U?$Write@UActorDataFlagComponent@@UActorDataHorseFlagComponent@@UActorDataJumpDurationComponent@@UActorDataBoundingBoxComponent@@UActorDataSeatOffsetComponent@@UActorDataDirtyFlagsComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void + singleTick(class StrictExecutionContext>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + + // symbol: + // ?tickEntity@ApplySystem@ClientRewind@@SAXAEBVStrictEntityContext@@AEAUApplyReplayStateTrackerRequestComponent@2@AEAUActorDataDirtyFlagsComponent@@AEBV?$ViewT@VStrictEntityContext@@UActorDataFlagComponent@@V?$Optional@UActorDataHorseFlagComponent@@@@V?$Optional@UActorDataJumpDurationComponent@@@@V?$Optional@UActorDataBoundingBoxComponent@@@@V?$Optional@UActorDataSeatOffsetComponent@@@@@@@Z + MCAPI static void tickEntity(class StrictEntityContext const&, struct ClientRewind::ApplyReplayStateTrackerRequestComponent&, struct ActorDataDirtyFlagsComponent&, class ViewT, class Optional, class Optional, class Optional> const&); + + // NOLINTEND +}; + +}; // namespace ClientRewind diff --git a/src/mc/entity/systems/common/AutoStepSystem.h b/src/mc/entity/systems/common/AutoStepSystem.h index 76cc9d246d..b2c6fb01bf 100644 --- a/src/mc/entity/systems/common/AutoStepSystem.h +++ b/src/mc/entity/systems/common/AutoStepSystem.h @@ -4,7 +4,6 @@ // auto generated inclusion list #include "mc/common/wrapper/Include.h" -#include "mc/common/wrapper/Optional.h" #include "mc/world/components/FlagComponent.h" namespace AutoStepSystem { @@ -13,9 +12,9 @@ namespace AutoStepSystem { MCAPI struct TickingSystemWithInfo createSystem(); // symbol: -// ?doAutoStepSystemImpl@AutoStepSystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UAutoStepRequestFlag@@@@@@@entt@@AEBUMaxAutoStepComponent@@AEAUMoveRequestComponent@@AEAUAABBShapeComponent@@AEAUSubBBsComponent@@V?$Optional@USlideOffsetComponent@@@@@Z +// ?doAutoStepSystemImpl@AutoStepSystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UAutoStepRequestFlag@@@@@@@entt@@AEBUMaxAutoStepComponent@@AEAUMoveRequestComponent@@AEAUAABBShapeComponent@@AEAUSubBBsComponent@@@Z MCAPI void -doAutoStepSystemImpl(entt::type_list>>, struct MaxAutoStepComponent const&, struct MoveRequestComponent&, struct AABBShapeComponent&, struct SubBBsComponent&, class Optional); +doAutoStepSystemImpl(entt::type_list>>, struct MaxAutoStepComponent const&, struct MoveRequestComponent&, struct AABBShapeComponent&, struct SubBBsComponent&); // symbol: ?getMaxCollisionVolume@AutoStepSystem@@YA?AVAABB@@AEBVVec3@@AEBUMaxAutoStepComponent@@AEBV2@@Z MCAPI class AABB getMaxCollisionVolume(class Vec3 const&, struct MaxAutoStepComponent const&, class AABB const&); diff --git a/src/mc/entity/systems/common/BiomeDecorationSystem.h b/src/mc/entity/systems/common/BiomeDecorationSystem.h index c70981ff75..58ec7169ba 100644 --- a/src/mc/entity/systems/common/BiomeDecorationSystem.h +++ b/src/mc/entity/systems/common/BiomeDecorationSystem.h @@ -13,19 +13,19 @@ MCAPI void decorate(class LevelChunk& lc, class BlockSource& source, class Random& random, std::vector&, std::string const& pass, class IPreliminarySurfaceProvider const&); // 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 +// ?decorateBiome@BiomeDecorationSystem@@YA_NAEAVLevelChunk@@AEAVBlockSource@@AEAVRandom@@V?$span@$$CBUBiomeDecorationFeature@@$0?0@gsl@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBVBiome@@AEBVIPreliminarySurfaceProvider@@@Z MCAPI bool -decorateBiome(class LevelChunk& lc, class BlockSource& source, class Random& random, gsl::span, std::string const& pass, class Biome const* biome, class IPreliminarySurfaceProvider const&); +decorateBiome(class LevelChunk& lc, class BlockSource& source, class Random& random, gsl::span, std::string const& pass, class Biome const* biome, class IPreliminarySurfaceProvider const&); // symbol: -// ?decorateLargeFeature@BiomeDecorationSystem@@YA_NW4GeneratorType@@AEBIAEAVBlockVolumeTarget@@AEAVRandom@@V?$span@UBiomeDecorationFeature@@$0?0@gsl@@AEBVChunkPos@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z +// ?decorateLargeFeature@BiomeDecorationSystem@@YA_NW4GeneratorType@@AEBIAEAVBlockVolumeTarget@@AEAVRandom@@V?$span@$$CBUBiomeDecorationFeature@@$0?0@gsl@@AEBVChunkPos@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI bool -decorateLargeFeature(::GeneratorType, uint const&, class BlockVolumeTarget&, class Random&, gsl::span, class ChunkPos const&, std::string const&); +decorateLargeFeature(::GeneratorType, uint const&, class BlockVolumeTarget&, class Random&, gsl::span, 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 +// ?decorateLargeFeature@BiomeDecorationSystem@@YAXAEBVBiome@@AEAVLevelChunk@@AEAVBlockVolumeTarget@@AEAVRandom@@AEBVChunkPos@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI void decorateLargeFeature( - class Biome& biome, + class Biome const& biome, class LevelChunk& lc, class BlockVolumeTarget& target, class Random& random, diff --git a/src/mc/entity/systems/common/BlazePreTravelSystem.h b/src/mc/entity/systems/common/BlazePreTravelSystem.h index 86c5aa42c0..93d801768c 100644 --- a/src/mc/entity/systems/common/BlazePreTravelSystem.h +++ b/src/mc/entity/systems/common/BlazePreTravelSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class BlazePreTravelSystem { public: // prevent constructor by default @@ -21,5 +26,14 @@ class BlazePreTravelSystem { // symbol: ?_doBlazePreTravelSystem@BlazePreTravelSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doBlazePreTravelSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickBlazePreTravelSystem@BlazePreTravelSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UBlazeFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickBlazePreTravelSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/BoatPaddleAnimationSystem.h b/src/mc/entity/systems/common/BoatPaddleAnimationSystem.h new file mode 100644 index 0000000000..77c191e3a4 --- /dev/null +++ b/src/mc/entity/systems/common/BoatPaddleAnimationSystem.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + +namespace BoatPaddleAnimationSystem { +// NOLINTBEGIN +// symbol: ?createSystem@BoatPaddleAnimationSystem@@YA?AUTickingSystemWithInfo@@XZ +MCAPI struct TickingSystemWithInfo createSystem(); + +// symbol: +// ?sendAnimationPackets@BoatPaddleAnimationSystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UBoatFlag@@@@V?$FlagComponent@UShouldBeSimulatedFlag@@@@@@U?$Exclude@V?$FlagComponent@UActorRemovedFlag@@@@@@@entt@@AEBVActorOwnerComponent@@AEBUBoatPaddleComponent@@AEBV?$Optional@$$CBUVehicleInputIntentComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBURuntimeIDComponent@@@@@Z +MCAPI void sendAnimationPackets(entt::type_list, class FlagComponent, class FlagComponent>, struct Exclude>>, class ActorOwnerComponent const&, struct BoatPaddleComponent const&, class Optional const&, class ViewT const&); +// NOLINTEND + +}; // namespace BoatPaddleAnimationSystem diff --git a/src/mc/entity/systems/common/CacheMovingStateSystem.h b/src/mc/entity/systems/common/CacheMovingStateSystem.h deleted file mode 100644 index 44e9e7a24e..0000000000 --- a/src/mc/entity/systems/common/CacheMovingStateSystem.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/Include.h" -#include "mc/common/wrapper/Optional.h" -#include "mc/common/wrapper/ViewT.h" -#include "mc/world/components/FlagComponent.h" - -namespace CacheMovingStateSystem { -// NOLINTBEGIN -// symbol: -// ?tickPassengerEntity@CacheMovingStateSystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@@entt@@AEBUPassengerComponent@@AEAUActorDataFlagComponent@@AEAUActorDataDirtyFlagsComponent@@AEAUActorRotationComponent@@V?$Optional@V?$FlagComponent@UMovingFlag@@@@@@AEBV?$ViewT@VStrictEntityContext@@V?$FlagComponent@UControlledByLocalInstanceFlag@@@@@@@Z -MCAPI void tickPassengerEntity(entt::type_list>>, struct PassengerComponent const&, struct ActorDataFlagComponent&, struct ActorDataDirtyFlagsComponent&, struct ActorRotationComponent&, class Optional>, class ViewT> const&); -// NOLINTEND - -}; // namespace CacheMovingStateSystem diff --git a/src/mc/entity/systems/common/CheckFallDamageInMoveSystemImpl.h b/src/mc/entity/systems/common/CheckFallDamageInMoveSystemImpl.h deleted file mode 100644 index ff19af4cd4..0000000000 --- a/src/mc/entity/systems/common/CheckFallDamageInMoveSystemImpl.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/Optional.h" -#include "mc/entity/EntityModifier.h" -#include "mc/world/components/FlagComponent.h" - -namespace CheckFallDamageInMoveSystemImpl { -// NOLINTBEGIN -// symbol: -// ?checkFallDamageInMove@CheckFallDamageInMoveSystemImpl@@YAXAEAVStrictEntityContext@@AEBUMoveRequestComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@AEAV?$EntityModifier@UCheckFallDamageRequestComponent@@@@@Z -MCAPI void -checkFallDamageInMove(class StrictEntityContext&, struct MoveRequestComponent const&, class Optional const>, class EntityModifier&); -// NOLINTEND - -}; // namespace CheckFallDamageInMoveSystemImpl diff --git a/src/mc/entity/systems/common/CheckFallDamageSystemImpl.h b/src/mc/entity/systems/common/CheckFallDamageSystemImpl.h index 4e3fb4b05a..365b860d97 100644 --- a/src/mc/entity/systems/common/CheckFallDamageSystemImpl.h +++ b/src/mc/entity/systems/common/CheckFallDamageSystemImpl.h @@ -9,12 +9,12 @@ namespace CheckFallDamageSystemImpl { // NOLINTBEGIN // symbol: -// ?checkFallDamage@CheckFallDamageSystemImpl@@YAXAEAVStrictEntityContext@@AEAVActorOwnerComponent@@AEAUCheckFallDamageRequestComponent@@V?$Optional@V?$FlagComponent@UActorTickedFlag@@@@@@_N@Z +// ?checkFallDamage@CheckFallDamageSystemImpl@@YAXAEAVActorOwnerComponent@@AEBUMoveRequestComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UActorTickedFlag@@@@@@_N@Z MCAPI void checkFallDamage( - class StrictEntityContext&, class ActorOwnerComponent&, - struct CheckFallDamageRequestComponent&, - class Optional>, + struct MoveRequestComponent const&, + class Optional const>, + class Optional const>, bool ); // NOLINTEND diff --git a/src/mc/entity/systems/common/CleanUpSingleTickRemovePassengersSystemImpl.h b/src/mc/entity/systems/common/CleanUpSingleTickRemovePassengersSystemImpl.h new file mode 100644 index 0000000000..c4ab27e796 --- /dev/null +++ b/src/mc/entity/systems/common/CleanUpSingleTickRemovePassengersSystemImpl.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + +namespace CleanUpSingleTickRemovePassengersSystemImpl { +// NOLINTBEGIN +// symbol: +// ?_cleanup@CleanUpSingleTickRemovePassengersSystemImpl@@YAXU?$type_list@U?$Include@V?$FlagComponent@UStopRidingRequestFlag@@@@@@@entt@@AEBVStrictEntityContext@@AEBUPassengerComponent@@V?$ViewT@VStrictEntityContext@@URemovePassengersComponent@@@@@Z +MCAPI void +_cleanup(entt::type_list>>, class StrictEntityContext const&, struct PassengerComponent const&, class ViewT); +// NOLINTEND + +}; // namespace CleanUpSingleTickRemovePassengersSystemImpl diff --git a/src/mc/entity/systems/common/ClientInputUpdateSystemInternal.h b/src/mc/entity/systems/common/ClientInputUpdateSystemInternal.h index 0371c14437..59086fbadb 100644 --- a/src/mc/entity/systems/common/ClientInputUpdateSystemInternal.h +++ b/src/mc/entity/systems/common/ClientInputUpdateSystemInternal.h @@ -41,7 +41,7 @@ struct ClientInputUpdateSystemInternal { virtual void singleTick(class EntityRegistry& registry, class EntityContext& entity); // vIndex: 6, symbol: - // ?tick@ClientInputUpdateSystemInternal@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UPlayerInputRequestComponent@@@@U?$Read@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorRotationComponent@@UMovementAttributesComponent@@V?$FlagComponent@UCanStandOnSnowFlag@@@@UDimensionTypeComponent@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UImmuneToLavaDragFlag@@@@UMobEffectsComponent@@UPassengerComponent@@USneakingComponent@@UStateVectorComponent@@USubBBsComponent@@V?$FlagComponent@UInWaterFlag@@@@@@U?$Write@VActorOwnerComponent@@UClientInputLockComponent@@UMoveInputComponent@@URawMoveInputComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@UVanillaClientGameplayComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@ClientInputUpdateSystemInternal@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UPlayerInputRequestComponent@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMovementAttributesComponent@@V?$FlagComponent@UCanStandOnSnowFlag@@@@UDimensionTypeComponent@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UImmuneToLavaDragFlag@@@@UMobEffectsComponent@@USneakingComponent@@UStateVectorComponent@@USubBBsComponent@@V?$FlagComponent@UInWaterFlag@@@@@@U?$Write@VActorOwnerComponent@@UClientInputLockComponent@@UMoveInputComponent@@URawMoveInputComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@UVanillaClientGameplayComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -55,27 +55,27 @@ struct ClientInputUpdateSystemInternal { class FlagComponent, struct PlayerInputRequestComponent>, struct Read< + struct AABBShapeComponent, + struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorDataFlagComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, - struct AABBShapeComponent, - struct MovementAbilitiesComponent, - struct ActorRotationComponent, struct MovementAttributesComponent, class FlagComponent, struct DimensionTypeComponent, class FlagComponent, class FlagComponent, struct MobEffectsComponent, - struct PassengerComponent, struct SneakingComponent, struct StateVectorComponent, struct SubBBsComponent, diff --git a/src/mc/entity/systems/common/ClientOrServerNetworkSystemRef.h b/src/mc/entity/systems/common/ClientOrServerNetworkSystemRef.h index 60fef5d72e..608e840324 100644 --- a/src/mc/entity/systems/common/ClientOrServerNetworkSystemRef.h +++ b/src/mc/entity/systems/common/ClientOrServerNetworkSystemRef.h @@ -8,4 +8,11 @@ class ClientOrServerNetworkSystemRef { ClientOrServerNetworkSystemRef& operator=(ClientOrServerNetworkSystemRef const&); ClientOrServerNetworkSystemRef(ClientOrServerNetworkSystemRef const&); ClientOrServerNetworkSystemRef(); + +public: + // NOLINTBEGIN + // symbol: ?toServerNetworkSystem@ClientOrServerNetworkSystemRef@@QEAAAEAVServerNetworkSystem@@XZ + MCAPI class ServerNetworkSystem& toServerNetworkSystem(); + + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/ClientPlayerRewindSystem.h b/src/mc/entity/systems/common/ClientPlayerRewindSystem.h index f0632cb1ed..16b39fc0e0 100644 --- a/src/mc/entity/systems/common/ClientPlayerRewindSystem.h +++ b/src/mc/entity/systems/common/ClientPlayerRewindSystem.h @@ -15,9 +15,8 @@ class ClientPlayerRewindSystem { MCAPI static struct TickingSystemWithInfo accumulateHistoryChangesSystem(); // symbol: - // ?applyHistoryChangesToLiveEntity@ClientPlayerRewindSystem@@SAXAEBUReplayStateTrackerComponent@@AEAUActorDataFlagComponent@@AEAUActorDataDirtyFlagsComponent@@PEAUActorDataHorseFlagComponent@@PEAUActorDataJumpDurationComponent@@@Z - MCAPI static void - applyHistoryChangesToLiveEntity(struct ReplayStateTrackerComponent const&, struct ActorDataFlagComponent&, struct ActorDataDirtyFlagsComponent&, struct ActorDataHorseFlagComponent*, struct ActorDataJumpDurationComponent*); + // ?applyHistoryChangesToLiveEntity@ClientPlayerRewindSystem@@SAXAEBUReplayStateTrackerComponent@@AEAVEntityContext@@@Z + MCAPI static void applyHistoryChangesToLiveEntity(struct ReplayStateTrackerComponent const&, class EntityContext&); // symbol: ?discardHistoryChangesSystem@ClientPlayerRewindSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo discardHistoryChangesSystem(); diff --git a/src/mc/entity/systems/common/CompareVehiclePositionSystemImpl.h b/src/mc/entity/systems/common/CompareVehiclePositionSystemImpl.h index b046e13e91..6be224fce6 100644 --- a/src/mc/entity/systems/common/CompareVehiclePositionSystemImpl.h +++ b/src/mc/entity/systems/common/CompareVehiclePositionSystemImpl.h @@ -11,6 +11,10 @@ namespace CompareVehiclePositionSystemImpl { // symbol: // ?doCompareVehiclePosition@CompareVehiclePositionSystemImpl@@YAXAEBUPassengerComponent@@AEBUEventingDispatcherComponent@@AEBUServerPlayerCurrentMovementComponent@@V?$ViewT@VStrictEntityContext@@UVehicleInputIntentComponent@@UStateVectorComponent@@@@V?$ViewT@VStrictEntityContext@@UEventingRequestQueueComponent@@@@V?$OptionalGlobal@UComparisonEventingCapComponent@@@@@Z MCAPI void doCompareVehiclePosition(struct PassengerComponent const&, struct EventingDispatcherComponent const&, struct ServerPlayerCurrentMovementComponent const&, class ViewT, class ViewT, class OptionalGlobal); + +// symbol: +// ?tick@CompareVehiclePositionSystemImpl@@YAXV?$ViewT@VStrictEntityContext@@$$CBUPassengerComponent@@$$CBUEventingDispatcherComponent@@$$CBUServerPlayerCurrentMovementComponent@@@@V?$ViewT@VStrictEntityContext@@UVehicleInputIntentComponent@@UStateVectorComponent@@@@V?$ViewT@VStrictEntityContext@@UEventingRequestQueueComponent@@@@V?$OptionalGlobal@UComparisonEventingCapComponent@@@@@Z +MCAPI void tick(class ViewT, class ViewT, class ViewT, class OptionalGlobal); // NOLINTEND }; // namespace CompareVehiclePositionSystemImpl diff --git a/src/mc/entity/systems/common/DashSystem.h b/src/mc/entity/systems/common/DashSystem.h index cd48293162..29ba92919e 100644 --- a/src/mc/entity/systems/common/DashSystem.h +++ b/src/mc/entity/systems/common/DashSystem.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + class DashSystem { public: // prevent constructor by default @@ -15,4 +21,19 @@ class DashSystem { MCAPI static struct TickingSystemWithInfo createSystem(); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: + // ?_tickDashSystem@DashSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorTickedFlag@@@@@@VActorOwnerComponent@@UDashCooldownTimerComponent@@@@V?$EntityModifier@UDashCooldownTimerComponent@@@@@Z + MCAPI static void _tickDashSystem( + class ViewT< + class StrictEntityContext, + struct Include>, + class ActorOwnerComponent, + struct DashCooldownTimerComponent> view, + class EntityModifier modifier + ); + + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/DefaultSystemTraits.h b/src/mc/entity/systems/common/DefaultSystemTraits.h new file mode 100644 index 0000000000..714b2646da --- /dev/null +++ b/src/mc/entity/systems/common/DefaultSystemTraits.h @@ -0,0 +1,23 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class DefaultSystemTraits { +public: + // prevent constructor by default + DefaultSystemTraits& operator=(DefaultSystemTraits const&); + DefaultSystemTraits(DefaultSystemTraits const&); + DefaultSystemTraits(); + +public: + // NOLINTBEGIN + // symbol: + // ?generateDetailedComponentInfo@DefaultSystemTraits@@SA?AV?$vector@UComponentInfo@@V?$allocator@UComponentInfo@@@std@@@std@@XZ + MCAPI static std::vector generateDetailedComponentInfo(); + + // symbol: + // ?generateName@DefaultSystemTraits@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V23@@Z + MCAPI static std::string generateName(std::string); + + // NOLINTEND +}; diff --git a/src/mc/entity/systems/common/DiscardSystem.h b/src/mc/entity/systems/common/DiscardSystem.h new file mode 100644 index 0000000000..6a7c2481b3 --- /dev/null +++ b/src/mc/entity/systems/common/DiscardSystem.h @@ -0,0 +1,84 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/GlobalRead.h" +#include "mc/common/GlobalWrite.h" +#include "mc/common/StrictExecutionContext.h" +#include "mc/common/wrapper/AddRemove.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/deps/core/data/Filter.h" +#include "mc/deps/core/data/Read.h" +#include "mc/deps/core/data/Write.h" +#include "mc/entity/EntityFactoryT.h" +#include "mc/world/components/FlagComponent.h" + +// auto generated forward declare list +// clang-format off +class StrictEntityContext; +struct ActorDataBoundingBoxComponent; +struct ActorDataFlagComponent; +struct ActorDataHorseFlagComponent; +struct ActorDataJumpDurationComponent; +struct ActorDataSeatOffsetComponent; +struct ActorMovementTickNeededFlag; +struct ReplayStateTrackerComponent; +// clang-format on + +namespace ClientRewind { + +struct DiscardSystem { +public: + // prevent constructor by default + DiscardSystem& operator=(DiscardSystem const&); + DiscardSystem(DiscardSystem const&); + DiscardSystem(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1DiscardSystem@ClientRewind@@UEAA@XZ + virtual ~DiscardSystem() = default; + + // vIndex: 1, symbol: ?registerEvents@ISystem@@UEAAXAEAV?$basic_dispatcher@V?$allocator@X@std@@@entt@@@Z + virtual void registerEvents(entt::dispatcher&); + + // vIndex: 2, symbol: __unk_vfn_2 + virtual void __unk_vfn_2(); + + // vIndex: 3, symbol: __unk_vfn_3 + virtual void __unk_vfn_3(); + + // vIndex: 4, symbol: __unk_vfn_4 + virtual void __unk_vfn_4(); + + // vIndex: 5, symbol: + // ?tick@DiscardSystem@ClientRewind@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Read@UActorDataFlagComponent@@UActorDataHorseFlagComponent@@UActorDataJumpDurationComponent@@UActorDataBoundingBoxComponent@@UActorDataSeatOffsetComponent@@@@U?$Write@UReplayStateTrackerComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + virtual void tick(class StrictExecutionContext< + struct Filter>, + struct Read< + struct ActorDataFlagComponent, + struct ActorDataHorseFlagComponent, + struct ActorDataJumpDurationComponent, + struct ActorDataBoundingBoxComponent, + struct ActorDataSeatOffsetComponent>, + struct Write, + struct AddRemove<>, + struct GlobalRead<>, + struct GlobalWrite<>, + struct EntityFactoryT<>>&); + + // vIndex: 6, symbol: + // ?singleTick@DiscardSystem@ClientRewind@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@U?$Read@UActorDataFlagComponent@@UActorDataHorseFlagComponent@@UActorDataJumpDurationComponent@@UActorDataBoundingBoxComponent@@UActorDataSeatOffsetComponent@@@@U?$Write@UReplayStateTrackerComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void singleTick(class StrictExecutionContext>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + + // symbol: + // ?tickEntity@DiscardSystem@ClientRewind@@SAXAEBVStrictEntityContext@@AEAUReplayStateTrackerComponent@@AEBV?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@V?$Optional@$$CBUActorDataHorseFlagComponent@@@@V?$Optional@$$CBUActorDataJumpDurationComponent@@@@V?$Optional@$$CBUActorDataBoundingBoxComponent@@@@V?$Optional@$$CBUActorDataSeatOffsetComponent@@@@@@@Z + MCAPI static void + tickEntity(class StrictEntityContext const&, struct ReplayStateTrackerComponent&, class ViewT, class Optional, class Optional, class Optional> const&); + + // NOLINTEND +}; + +}; // namespace ClientRewind diff --git a/src/mc/entity/systems/common/EnderManPreAIStepSystem.h b/src/mc/entity/systems/common/EnderManPreAIStepSystem.h index bdb13a8cce..15abc47964 100644 --- a/src/mc/entity/systems/common/EnderManPreAIStepSystem.h +++ b/src/mc/entity/systems/common/EnderManPreAIStepSystem.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + class EnderManPreAIStepSystem { public: // prevent constructor by default @@ -14,5 +20,17 @@ class EnderManPreAIStepSystem { // symbol: ?createSystem@EnderManPreAIStepSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); + // symbol: + // ?tick@EnderManPreAIStepSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UEnderManFlag@@@@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@@V?$EntityModifier@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@Z + MCAPI static void tick( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent, + class FlagComponent>> view, + class EntityModifier> mod + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/EntityInside.h b/src/mc/entity/systems/common/EntityInside.h index a3a92ad573..519bda1510 100644 --- a/src/mc/entity/systems/common/EntityInside.h +++ b/src/mc/entity/systems/common/EntityInside.h @@ -153,6 +153,46 @@ struct EntityInside { struct GlobalWrite<>, struct EntityFactoryT<>>&); + // symbol: + // ?createServerSideContextObjects@EntityInside@EntityInsideSystemImpl@@SA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UBoatFlag@@@@V?$FlagComponent@UFreezeImmuneFlag@@@@V?$FlagComponent@UIsDeadFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UInWaterFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorGameTypeComponent@@UDimensionTypeComponent@@@@U?$Write@UBlockMovementSlowdownMultiplierComponent@@UFallDistanceComponent@@UInsideBlockComponent@@UStateVectorComponent@@@@U?$AddRemove@UBlockMovementSlowdownAppliedComponent@@VFreezingComponent@@UIgnoresEntityInsideFlagComponent@@UInsideBubbleColumnBlockComponent@@U?$InsideBlockWithPosAndBlockComponent@UCactusBlockFlag@@@@U?$InsideBlockWithPosAndBlockComponent@UEndPortalBlockFlag@@@@UInsideGenericBlockComponent@@U?$InsideBlockWithPosAndBlockComponent@UHoneyBlockFlag@@@@U?$InsideBlockWithPosAndBlockComponent@UPowderSnowBlockFlag@@@@U?$InsideBlockWithPosAndBlockComponent@USweetBerryBushBlockFlag@@@@U?$InsideBlockWithPosComponent@UWaterlilyBlockFlag@@@@V?$FlagComponent@UWebBlockTag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + MCAPI static auto + createServerSideContextObjects(class StrictExecutionContext< + struct Filter< + class FlagComponent, + class FlagComponent, + class FlagComponent, + class FlagComponent, + class FlagComponent, + class FlagComponent>, + struct Read< + struct AABBShapeComponent, + struct MovementAbilitiesComponent, + struct ActorGameTypeComponent, + struct DimensionTypeComponent>, + struct Write< + struct BlockMovementSlowdownMultiplierComponent, + struct FallDistanceComponent, + struct InsideBlockComponent, + struct StateVectorComponent>, + struct AddRemove< + struct BlockMovementSlowdownAppliedComponent, + class FreezingComponent, + struct IgnoresEntityInsideFlagComponent, + struct InsideBubbleColumnBlockComponent, + struct InsideBlockWithPosAndBlockComponent, + struct InsideBlockWithPosAndBlockComponent, + struct InsideGenericBlockComponent, + struct InsideBlockWithPosAndBlockComponent, + struct InsideBlockWithPosAndBlockComponent, + struct InsideBlockWithPosAndBlockComponent, + struct InsideBlockWithPosComponent, + class FlagComponent>, + struct GlobalRead< + struct ExternalDataComponent, + struct LocalConstBlockSourceFactoryComponent>, + struct GlobalWrite<>, + struct EntityFactoryT<>>&); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/EntitySystemsManager.h b/src/mc/entity/systems/common/EntitySystemsManager.h new file mode 100644 index 0000000000..ab9a179f47 --- /dev/null +++ b/src/mc/entity/systems/common/EntitySystemsManager.h @@ -0,0 +1,30 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/StackRefResult.h" +#include "mc/enums/SubClientId.h" + +class EntitySystemsManager { +public: + // prevent constructor by default + EntitySystemsManager& operator=(EntitySystemsManager const&); + EntitySystemsManager(EntitySystemsManager const&); + EntitySystemsManager(); + +public: + // NOLINTBEGIN + // symbol: + // ??0EntitySystemsManager@@QEAA@_NW4SubClientId@@AEBV?$not_null@V?$StackRefResult@VEntityRegistry@@@@@gsl@@AEBV?$not_null@V?$StackRefResult@VPauseManager@@@@@3@@Z + MCAPI + EntitySystemsManager(bool, ::SubClientId, gsl::not_null> const&, gsl::not_null> const&); + + // symbol: ?getEntitySystems@EntitySystemsManager@@QEAAAEAVEntitySystems@@XZ + MCAPI class EntitySystems& getEntitySystems(); + + // symbol: ?tickEntitySystems@EntitySystemsManager@@QEAAXXZ + MCAPI void tickEntitySystems(); + + // NOLINTEND +}; diff --git a/src/mc/entity/systems/common/FinalizeMoveSystemImpl.h b/src/mc/entity/systems/common/FinalizeMoveSystemImpl.h index 26a3e98c57..a058014df2 100644 --- a/src/mc/entity/systems/common/FinalizeMoveSystemImpl.h +++ b/src/mc/entity/systems/common/FinalizeMoveSystemImpl.h @@ -10,9 +10,9 @@ namespace FinalizeMoveSystemImpl { // NOLINTBEGIN // symbol: -// ?tickFinalizeMoveSystem@FinalizeMoveSystemImpl@@YAXAEAVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUMoveRequestComponent@@AEBUOffsetsComponent@@AEAUStateVectorComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBUMovementAbilitiesComponent@@@@V?$Optional@USlideOffsetComponent@@@@AEAV?$EntityModifier@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UCollisionFlag@@@@V?$FlagComponent@UHorizontalCollisionFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@@Z +// ?tickFinalizeMoveSystem@FinalizeMoveSystemImpl@@YAXAEAVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUMoveRequestComponent@@AEBUOffsetsComponent@@AEAUStateVectorComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBUMovementAbilitiesComponent@@@@AEAV?$EntityModifier@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UCollisionFlag@@@@V?$FlagComponent@UHorizontalCollisionFlag@@@@V?$FlagComponent@UVerticalCollisionFlag@@@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@@Z MCAPI void -tickFinalizeMoveSystem(class StrictEntityContext&, struct AABBShapeComponent const&, struct MoveRequestComponent const&, struct OffsetsComponent const&, struct StateVectorComponent&, class Optional const>, class Optional, class Optional, class EntityModifier, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>&); +tickFinalizeMoveSystem(class StrictEntityContext&, struct AABBShapeComponent const&, struct MoveRequestComponent const&, struct OffsetsComponent const&, struct StateVectorComponent&, class Optional const>, class Optional, class EntityModifier, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>&); // NOLINTEND }; // namespace FinalizeMoveSystemImpl diff --git a/src/mc/entity/systems/common/FireworksMovementSystems.h b/src/mc/entity/systems/common/FireworksMovementSystems.h index 8dc0ad325b..1f7c4334ec 100644 --- a/src/mc/entity/systems/common/FireworksMovementSystems.h +++ b/src/mc/entity/systems/common/FireworksMovementSystems.h @@ -14,10 +14,6 @@ namespace FireworksMovementSystems { // symbol: ?applyBoost@FireworksMovementSystems@@YAXAEAVVec3@@AEBV2@_K@Z MCAPI void applyBoost(class Vec3&, class Vec3 const&, uint64); -// symbol: -// ?attachedRocketBoostRequestSystem@FireworksMovementSystems@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@@entt@@AEBVStrictEntityContext@@AEBUActorUniqueIDComponent@@AEAUAttachedRocketsComponent@@AEBV?$ViewT@VStrictEntityContext@@$$CBUSynchedActorDataComponent@@@@V?$EntityModifier@UAttachedRocketsComponent@@UAttachedRocketsBoostRequestComponent@@@@@Z -MCAPI void attachedRocketBoostRequestSystem(entt::type_list>>, class StrictEntityContext const&, struct ActorUniqueIDComponent const&, struct AttachedRocketsComponent&, class ViewT const&, class EntityModifier); - // symbol: // ?fireworksRocketMoveClientEntity@FireworksMovementSystems@@YA?AW4RocketAttached@1@AEBVStrictEntityContext@@AEBUSynchedActorDataComponent@@AEAUStateVectorComponent@@AEAUActorRotationComponent@@AEAVLocalSpatialEntityFetcher@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@@@$$CBUStateVectorComponent@@@@V?$EntityModifier@UActorSetPositionRequestComponent@@UAttachedRocketsComponent@@@@@Z MCAPI :: @@ -31,6 +27,11 @@ MCAPI void registerAttachedRocketSystems(class EntitySystems&, bool); // symbol: ?registerRocketMovementSystems@FireworksMovementSystems@@YAXAEAVEntitySystems@@_N@Z MCAPI void registerRocketMovementSystems(class EntitySystems&, bool); +// symbol: +// ?removeRocketsNotAttachedToThis@FireworksMovementSystems@@YAXAEBUActorUniqueID@@AEBV?$ViewT@VStrictEntityContext@@$$CBUSynchedActorDataComponent@@@@AEAV?$vector@VStrictEntityContext@@V?$allocator@VStrictEntityContext@@@std@@@std@@@Z +MCAPI void +removeRocketsNotAttachedToThis(struct ActorUniqueID const&, class ViewT const&, std::vector&); + // symbol: // ?simulateAttachedRocket@FireworksMovementSystems@@YAXAEBVStrictEntityContext@@AEBUActorUniqueID@@AEAUStateVectorComponent@@AEAVLocalSpatialEntityFetcher@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@@@$$CBUStateVectorComponent@@@@V?$EntityModifier@UActorSetPositionRequestComponent@@UAttachedRocketsComponent@@@@@Z MCAPI void simulateAttachedRocket(class StrictEntityContext const&, struct ActorUniqueID const&, struct StateVectorComponent&, class LocalSpatialEntityFetcher&, class ViewT>, struct StateVectorComponent const> const&, class EntityModifier); diff --git a/src/mc/entity/systems/common/GlidingMoveFinalizeSystem.h b/src/mc/entity/systems/common/GlidingMoveFinalizeSystem.h index ec930df5f2..4f6bccfa0e 100644 --- a/src/mc/entity/systems/common/GlidingMoveFinalizeSystem.h +++ b/src/mc/entity/systems/common/GlidingMoveFinalizeSystem.h @@ -3,7 +3,10 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" class GlidingMoveFinalizeSystem { public: @@ -35,5 +38,16 @@ class GlidingMoveFinalizeSystem { // symbol: ?createCollisionDamageHurtSystem@GlidingMoveFinalizeSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createCollisionDamageHurtSystem(); + // symbol: + // ?tickCollisionDamageHurt@GlidingMoveFinalizeSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@@@VActorOwnerComponent@@$$CBUGlidingCollisionDamageComponent@@@@V?$EntityModifier@UGlidingCollisionDamageComponent@@@@@Z + MCAPI static void tickCollisionDamageHurt( + class ViewT< + class StrictEntityContext, + struct Include>, + class ActorOwnerComponent, + struct GlidingCollisionDamageComponent const> view, + class EntityModifier modifier + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/GuardianPreAIStepSystem.h b/src/mc/entity/systems/common/GuardianPreAIStepSystem.h index f433ee923c..0afe8ba6f9 100644 --- a/src/mc/entity/systems/common/GuardianPreAIStepSystem.h +++ b/src/mc/entity/systems/common/GuardianPreAIStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class GuardianPreAIStepSystem { public: // prevent constructor by default @@ -22,5 +27,14 @@ class GuardianPreAIStepSystem { // ?_doGuardianPreAIStepSystem@GuardianPreAIStepSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doGuardianPreAIStepSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickGuardianPreAIStepSystem@GuardianPreAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UGuardianFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickGuardianPreAIStepSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/HorsePreTravelSystem.h b/src/mc/entity/systems/common/HorsePreTravelSystem.h index 3182138fb7..aa653a91b3 100644 --- a/src/mc/entity/systems/common/HorsePreTravelSystem.h +++ b/src/mc/entity/systems/common/HorsePreTravelSystem.h @@ -2,6 +2,13 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + class HorsePreTravelSystem { public: // prevent constructor by default @@ -14,5 +21,10 @@ class HorsePreTravelSystem { // symbol: ?createHorsePreTravelSystem@HorsePreTravelSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createHorsePreTravelSystem(); + // symbol: + // ?tickHorsePreTravelSystem@HorsePreTravelSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UHorseFlag@@@@@@V?$Optional@UVehicleComponent@@@@$$CBUActorDataFlagComponent@@UAirSpeedComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBV?$FlagComponent@UMobFlag@@@@@@V?$ViewT@VStrictEntityContext@@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$EntityModifier@V?$FlagComponent@UWasOnGroundPreTravelFlag@@@@@@@Z + MCAPI static void + tickHorsePreTravelSystem(class ViewT, class FlagComponent>, class Optional, struct ActorDataFlagComponent const, struct AirSpeedComponent>, class ViewT const>, class ViewT const>, class EntityModifier>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/Impl.h b/src/mc/entity/systems/common/Impl.h index 9d9abf8339..bba6548b42 100644 --- a/src/mc/entity/systems/common/Impl.h +++ b/src/mc/entity/systems/common/Impl.h @@ -11,7 +11,6 @@ class BaseGameVersion; class Experiments; class ItemRegistryRef; class Level; -class ResourcePackManager; // clang-format on namespace VanillaWorldSystems { @@ -26,12 +25,11 @@ class Impl { public: // NOLINTBEGIN // symbol: - // ??0Impl@VanillaWorldSystems@@QEAA@AEBV?$NonOwnerPointer@VLevel@@@Bedrock@@AEBVExperiments@@AEBVBaseGameVersion@@PEAVResourcePackManager@@VItemRegistryRef@@@Z + // ??0Impl@VanillaWorldSystems@@QEAA@AEBV?$NonOwnerPointer@VLevel@@@Bedrock@@AEBVExperiments@@AEBVBaseGameVersion@@VItemRegistryRef@@@Z MCAPI Impl( - class Bedrock::NonOwnerPointer const& level, + class Bedrock::NonOwnerPointer const&, class Experiments const&, - class BaseGameVersion const& baseGameVersion, - class ResourcePackManager* rpm, + class BaseGameVersion const&, class ItemRegistryRef ); diff --git a/src/mc/entity/systems/common/IsRocketNotAttachedToThis.h b/src/mc/entity/systems/common/IsRocketNotAttachedToThis.h new file mode 100644 index 0000000000..d7bec4fe9a --- /dev/null +++ b/src/mc/entity/systems/common/IsRocketNotAttachedToThis.h @@ -0,0 +1,27 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class StrictEntityContext; +// clang-format on + +namespace FireworksMovementSystems { + +class IsRocketNotAttachedToThis { +public: + // prevent constructor by default + IsRocketNotAttachedToThis& operator=(IsRocketNotAttachedToThis const&); + IsRocketNotAttachedToThis(IsRocketNotAttachedToThis const&); + IsRocketNotAttachedToThis(); + +public: + // NOLINTBEGIN + // symbol: ??RIsRocketNotAttachedToThis@FireworksMovementSystems@@QEBA_NAEBVStrictEntityContext@@@Z + MCAPI bool operator()(class StrictEntityContext const&) const; + + // NOLINTEND +}; + +}; // namespace FireworksMovementSystems diff --git a/src/mc/entity/systems/common/JumpEndSystem.h b/src/mc/entity/systems/common/JumpEndSystem.h index 86fd6c7797..82b914b213 100644 --- a/src/mc/entity/systems/common/JumpEndSystem.h +++ b/src/mc/entity/systems/common/JumpEndSystem.h @@ -2,6 +2,13 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + class JumpEndSystem { public: // prevent constructor by default @@ -14,5 +21,9 @@ class JumpEndSystem { // symbol: ?create@JumpEndSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo create(); + // symbol: + // ?tick@JumpEndSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@V?$Optional@$$CBUVehicleComponent@@@@$$CBUStateVectorComponent@@UActorDataDirtyFlagsComponent@@UActorDataJumpDurationComponent@@UJumpTicksComponent@@UMobJumpComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UParrotFlag@@@@@@$$CBUPassengerComponent@@@@V?$EntityModifier@V?$FlagComponent@UExitFromPassengerFlag@@@@V?$FlagComponent@UStopRidingRequestFlag@@@@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@Z + MCAPI static void tick(class ViewT>, class Optional, struct StateVectorComponent const, struct ActorDataDirtyFlagsComponent, struct ActorDataJumpDurationComponent, struct JumpTicksComponent, struct MobJumpComponent>, class ViewT>, struct PassengerComponent const>, class EntityModifier, class FlagComponent, class FlagComponent>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/JumpFromGroundSystem.h b/src/mc/entity/systems/common/JumpFromGroundSystem.h index 76c6be5375..56fc668dcd 100644 --- a/src/mc/entity/systems/common/JumpFromGroundSystem.h +++ b/src/mc/entity/systems/common/JumpFromGroundSystem.h @@ -81,7 +81,7 @@ struct JumpFromGroundSystem { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@JumpFromGroundSystem@MobJumpFromGroundSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UAABBShapeComponent@@UActorRotationComponent@@UMobEffectsComponent@@UActorDataFlagComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@JumpFromGroundSystem@MobJumpFromGroundSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMobEffectsComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -97,22 +97,22 @@ struct JumpFromGroundSystem { class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, - struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, struct MobEffectsComponent, - struct ActorDataFlagComponent, struct SynchedActorDataComponent, class JumpControlComponent, struct DimensionTypeComponent>, @@ -123,11 +123,11 @@ struct JumpFromGroundSystem { struct EntityFactoryT<>>& context); // vIndex: 6, symbol: - // ?singleTick@JumpFromGroundSystem@MobJumpFromGroundSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UAABBShapeComponent@@UActorRotationComponent@@UMobEffectsComponent@@UActorDataFlagComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z - virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + // ?singleTick@JumpFromGroundSystem@MobJumpFromGroundSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMobEffectsComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // symbol: - // ?createViews@JumpFromGroundSystem@MobJumpFromGroundSystemImpl@@SA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UAABBShapeComponent@@UActorRotationComponent@@UMobEffectsComponent@@UActorDataFlagComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?createViews@JumpFromGroundSystem@MobJumpFromGroundSystemImpl@@SA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMobEffectsComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z MCAPI static auto createViews(class StrictExecutionContext< struct Filter< @@ -144,22 +144,22 @@ struct JumpFromGroundSystem { class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, - struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, struct MobEffectsComponent, - struct ActorDataFlagComponent, struct SynchedActorDataComponent, class JumpControlComponent, struct DimensionTypeComponent>, diff --git a/src/mc/entity/systems/common/LavaTravelSystem.h b/src/mc/entity/systems/common/LavaTravelSystem.h index a13a45d027..25b743e1f1 100644 --- a/src/mc/entity/systems/common/LavaTravelSystem.h +++ b/src/mc/entity/systems/common/LavaTravelSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class LavaTravelSystem { public: // prevent constructor by default @@ -14,5 +19,15 @@ class LavaTravelSystem { // symbol: ?createLavaTravelSystem@LavaTravelSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createLavaTravelSystem(); + // symbol: + // ?tickLavaTravelSystem@LavaTravelSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@ULavaTravelFlag@@@@@@$$CBUMovementAttributesComponent@@UMobTravelComponent@@@@@Z + MCAPI static void tickLavaTravelSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct MovementAttributesComponent const, + struct MobTravelComponent>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/LocalPlayerFilterAutoJumpInternal.h b/src/mc/entity/systems/common/LocalPlayerFilterAutoJumpInternal.h index de4528ec5c..334c69cc1a 100644 --- a/src/mc/entity/systems/common/LocalPlayerFilterAutoJumpInternal.h +++ b/src/mc/entity/systems/common/LocalPlayerFilterAutoJumpInternal.h @@ -80,7 +80,7 @@ struct LocalPlayerFilterAutoJumpInternal { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UAABBShapeComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UActorRotationComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@UActorDataFlagComponent@@UPassengerComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -95,26 +95,26 @@ struct LocalPlayerFilterAutoJumpInternal { class FlagComponent, struct MoveRequestComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct AABBShapeComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, - struct ActorRotationComponent, struct MovementAttributesComponent, struct DimensionTypeComponent, struct MoveInputComponent, class FlagComponent, - struct StateVectorComponent, - struct ActorDataFlagComponent, - struct PassengerComponent>, + struct StateVectorComponent>, struct Write<>, struct AddRemove>, struct GlobalRead, @@ -122,16 +122,18 @@ struct LocalPlayerFilterAutoJumpInternal { struct EntityFactoryT<>>&); // vIndex: 6, symbol: - // ?singleTick@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UAABBShapeComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UActorRotationComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@UActorDataFlagComponent@@UPassengerComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z - virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct MoveRequestComponent>, struct Read, struct StateVectorComponent, struct ActorDataFlagComponent, struct PassengerComponent>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + // ?singleTick@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void + singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct MoveRequestComponent>, struct Read, struct StateVectorComponent>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // symbol: - // ?commonTick@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@QEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UAABBShapeComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UActorRotationComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@UActorDataFlagComponent@@UPassengerComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@PEAVStrictEntityContext@@@Z - MCAPI void commonTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct MoveRequestComponent>, struct Read, struct StateVectorComponent, struct ActorDataFlagComponent, struct PassengerComponent>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext*); + // ?commonTick@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@QEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@PEAVStrictEntityContext@@@Z + MCAPI void commonTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct MoveRequestComponent>, struct Read, struct StateVectorComponent>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext*); // symbol: - // ?_determineIfPlayerCanAutoJump@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@SAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUActorRotationComponent@@AEBUMovementAttributesComponent@@AEBUMoveInputComponent@@AEBUStateVectorComponent@@AEBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBUPassengerComponent@@@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UAABBShapeComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UActorRotationComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@UActorDataFlagComponent@@UPassengerComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAV?$EntityModifier@V?$FlagComponent@UAutoJumpingFlag@@@@@@AEBVIConstBlockSource@@@Z - MCAPI static void _determineIfPlayerCanAutoJump(class StrictEntityContext const&, struct AABBShapeComponent const&, struct ActorRotationComponent const&, struct MovementAttributesComponent const&, struct MoveInputComponent const&, struct StateVectorComponent const&, struct ActorDataFlagComponent const&, class Optional const>, class Optional, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct MoveRequestComponent>, struct Read, struct StateVectorComponent, struct ActorDataFlagComponent, struct PassengerComponent>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class EntityModifier>&, class IConstBlockSource const&); + // ?_determineIfPlayerCanAutoJump@LocalPlayerFilterAutoJumpInternal@PlayerMoveSystemsImpl@@SAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEBUActorRotationComponent@@AEBUMovementAttributesComponent@@AEBUMoveInputComponent@@AEBUStateVectorComponent@@AEBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBUPassengerComponent@@@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UAutoJumpingFlag@@@@V?$FlagComponent@ULocalPlayerComponentFlag@@@@UMoveRequestComponent@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMovementAttributesComponent@@UDimensionTypeComponent@@UMoveInputComponent@@V?$FlagComponent@UOnGroundFlag@@@@UStateVectorComponent@@@@U?$Write@$$V@@U?$AddRemove@V?$FlagComponent@UAutoJumpingFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAV?$EntityModifier@V?$FlagComponent@UAutoJumpingFlag@@@@@@AEBVIConstBlockSource@@@Z + MCAPI static void + _determineIfPlayerCanAutoJump(class StrictEntityContext const&, struct AABBShapeComponent const&, struct ActorRotationComponent const&, struct MovementAttributesComponent const&, struct MoveInputComponent const&, struct StateVectorComponent const&, struct ActorDataFlagComponent const&, class Optional const>, class Optional, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct MoveRequestComponent>, struct Read, struct StateVectorComponent>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class EntityModifier>&, class IConstBlockSource const&); // NOLINTEND }; diff --git a/src/mc/entity/systems/common/MobIsImmobileFilterSystem.h b/src/mc/entity/systems/common/MobIsImmobileFilterSystem.h index 1e5200c95f..b94e1983b6 100644 --- a/src/mc/entity/systems/common/MobIsImmobileFilterSystem.h +++ b/src/mc/entity/systems/common/MobIsImmobileFilterSystem.h @@ -2,14 +2,6 @@ #include "mc/_HeaderOutputPredefine.h" -// auto generated inclusion list -#include "mc/common/wrapper/Exclude.h" -#include "mc/common/wrapper/Include.h" -#include "mc/common/wrapper/Optional.h" -#include "mc/common/wrapper/ViewT.h" -#include "mc/entity/EntityModifier.h" -#include "mc/world/components/FlagComponent.h" - class MobIsImmobileFilterSystem { public: // prevent constructor by default @@ -23,12 +15,4 @@ class MobIsImmobileFilterSystem { MCAPI static struct TickingSystemWithInfo createSystem(); // NOLINTEND - - // private: - // NOLINTBEGIN - // symbol: - // ?tickImmobileFilter@MobIsImmobileFilterSystem@@CAXU?$type_list@U?$Include@$$CBV?$FlagComponent@UActorMovementTickNeededFlag@@@@$$CBV?$FlagComponent@UMobFlag@@@@@@@entt@@AEBVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsImmobileFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@@@$$CBUMovementAttributesComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsKnockedBackOnDeathFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@U?$Include@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UHorseFlag@@@@@@U?$Exclude@V?$FlagComponent@UMobAllowStandSlidingFlag@@@@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@V?$FlagComponent@UHorseFlag@@@@@@V?$ViewT@VStrictEntityContext@@$$CBV?$FlagComponent@UPlayerIsSleepingFlag@@@@$$CBV?$FlagComponent@UPlayerComponentFlag@@@@@@V?$EntityModifier@V?$FlagComponent@UMobIsImmobileFlag@@@@@@@Z - MCAPI static void tickImmobileFilter(entt::type_list const, class FlagComponent const>>, class StrictEntityContext const&, class ViewT const>>, class ViewT>, struct MovementAttributesComponent const, class Optional const>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>, class EntityModifier>); - - // NOLINTEND }; diff --git a/src/mc/entity/systems/common/MobJumpFromGroundSystemImpl.h b/src/mc/entity/systems/common/MobJumpFromGroundSystemImpl.h index e6ec241fa4..0eb9965776 100644 --- a/src/mc/entity/systems/common/MobJumpFromGroundSystemImpl.h +++ b/src/mc/entity/systems/common/MobJumpFromGroundSystemImpl.h @@ -37,7 +37,7 @@ MCAPI void doLavaSlimeJumpFromGround(class StrictEntityContext const&, struct AABBShapeComponent const&, struct SynchedActorDataComponent const&, struct StateVectorComponent&, struct MobEffectsComponent const&, class EntityModifier&, class IConstBlockSource const&); // symbol: -// ?doLocalPlayerJumpFromGround@MobJumpFromGroundSystemImpl@@YAXAEBVStrictEntityContext@@AEBV?$Optional@$$CBVJumpControlComponent@@@@AEBUAABBShapeComponent@@AEBUActorDataFlagComponent@@AEBUActorRotationComponent@@AEBUMobEffectsComponent@@AEAUMobJumpComponent@@AEAUStateVectorComponent@@AEAUPlayerActionComponent@@AEAV?$EntityModifier@UTriggerJumpRequestComponent@@@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UAABBShapeComponent@@UActorRotationComponent@@UMobEffectsComponent@@UActorDataFlagComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEBVIConstBlockSource@@@Z +// ?doLocalPlayerJumpFromGround@MobJumpFromGroundSystemImpl@@YAXAEBVStrictEntityContext@@AEBV?$Optional@$$CBVJumpControlComponent@@@@AEBUAABBShapeComponent@@AEBUActorDataFlagComponent@@AEBUActorRotationComponent@@AEBUMobEffectsComponent@@AEAUMobJumpComponent@@AEAUStateVectorComponent@@AEAUPlayerActionComponent@@AEAV?$EntityModifier@UTriggerJumpRequestComponent@@@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@ULocalPlayerJumpRequestFlag@@@@V?$FlagComponent@ULavaSlimeJumpRequestFlag@@@@V?$FlagComponent@USquidJumpRequestFlag@@@@V?$FlagComponent@UOtherJumpRequestFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UMobEffectsComponent@@USynchedActorDataComponent@@VJumpControlComponent@@UDimensionTypeComponent@@@@U?$Write@UMobJumpComponent@@UStateVectorComponent@@UPlayerActionComponent@@@@U?$AddRemove@UTriggerJumpRequestComponent@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEBVIConstBlockSource@@@Z MCAPI void doLocalPlayerJumpFromGround( class StrictEntityContext const& entity, class Optional const&, @@ -64,22 +64,22 @@ MCAPI void doLocalPlayerJumpFromGround( class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, - struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, struct MobEffectsComponent, - struct ActorDataFlagComponent, struct SynchedActorDataComponent, class JumpControlComponent, struct DimensionTypeComponent>, diff --git a/src/mc/entity/systems/common/MobTravelPlayerOrLocalFilterSystem.h b/src/mc/entity/systems/common/MobTravelPlayerOrLocalFilterSystem.h index 49bf31be73..9236bfa41a 100644 --- a/src/mc/entity/systems/common/MobTravelPlayerOrLocalFilterSystem.h +++ b/src/mc/entity/systems/common/MobTravelPlayerOrLocalFilterSystem.h @@ -2,6 +2,13 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + class MobTravelPlayerOrLocalFilterSystem { public: // prevent constructor by default @@ -14,5 +21,17 @@ class MobTravelPlayerOrLocalFilterSystem { // symbol: ?create@MobTravelPlayerOrLocalFilterSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo create(); + // symbol: + // ?tick@MobTravelPlayerOrLocalFilterSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@UMobTravelComponent@@@@U?$Exclude@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UControlledByLocalInstanceFlag@@@@@@@@V?$EntityModifier@UMobTravelComponent@@@@@Z + MCAPI static void tick( + class ViewT< + class StrictEntityContext, + struct Include, + struct Exclude< + class FlagComponent, + class FlagComponent>> view, + class EntityModifier mod + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/MobTravelUpdateSpeedsSystem.h b/src/mc/entity/systems/common/MobTravelUpdateSpeedsSystem.h index 14b3d795f9..5495f0b246 100644 --- a/src/mc/entity/systems/common/MobTravelUpdateSpeedsSystem.h +++ b/src/mc/entity/systems/common/MobTravelUpdateSpeedsSystem.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class MobTravelUpdateSpeedsSystem { public: // prevent constructor by default @@ -14,5 +20,9 @@ class MobTravelUpdateSpeedsSystem { // symbol: ?createMobTravelUpdateSpeedsSystem@MobTravelUpdateSpeedsSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createMobTravelUpdateSpeedsSystem(); + // symbol: + // ?tickMobTravelUpdateSpeedsSystem@MobTravelUpdateSpeedsSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@UMobTravelComponent@@@@$$CBUActorDataFlagComponent@@$$CBUActorDataControllingSeatIndexComponent@@$$CBUVehicleComponent@@UAirSpeedComponent@@$$CBUMovementAttributesComponent@@V?$Optional@$$CBV?$FlagComponent@UCanVehicleSprintFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUMovementAttributesComponent@@$$CBUMovementSpeedComponent@@@@V?$ViewT@VStrictEntityContext@@UMovementSpeedComponent@@ULocalMoveVelocityComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@@@@Z + MCAPI static void tickMobTravelUpdateSpeedsSystem(class ViewT, struct ActorDataFlagComponent const, struct ActorDataControllingSeatIndexComponent const, struct VehicleComponent const, struct AirSpeedComponent, struct MovementAttributesComponent const, class Optional const>>, class ViewT, class ViewT, class ViewT>>, class ViewT); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/MoveSpeedCapSystemImpl.h b/src/mc/entity/systems/common/MoveSpeedCapSystemImpl.h index bab859ae8b..635a687630 100644 --- a/src/mc/entity/systems/common/MoveSpeedCapSystemImpl.h +++ b/src/mc/entity/systems/common/MoveSpeedCapSystemImpl.h @@ -11,6 +11,11 @@ namespace MoveSpeedCapSystemImpl { // NOLINTBEGIN +// symbol: +// ?singleTick@MoveSpeedCapSystemImpl@@YAXAEAVStrictEntityContext@@V?$ViewT@VStrictEntityContext@@UMoveRequestComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsImmobileFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@@@$$CBUMovementAttributesComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsKnockedBackOnDeathFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@U?$Include@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UHorseFlag@@@@@@U?$Exclude@V?$FlagComponent@UMobAllowStandSlidingFlag@@@@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@V?$FlagComponent@UHorseFlag@@@@@@V?$ViewT@VStrictEntityContext@@$$CBV?$FlagComponent@UPlayerIsSleepingFlag@@@@$$CBV?$FlagComponent@UPlayerComponentFlag@@@@@@@Z +MCAPI void +singleTick(class StrictEntityContext&, class ViewT, class ViewT const>>, class ViewT>, struct MovementAttributesComponent const, class Optional const>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>); + // symbol: // ?tickMoveSpeedCap@MoveSpeedCapSystemImpl@@YAXAEAVStrictEntityContext@@AEAUMoveRequestComponent@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsImmobileFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMobFlag@@@@@@$$CBUMovementAttributesComponent@@V?$Optional@$$CBV?$FlagComponent@UActorIsKnockedBackOnDeathFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUActorDataFlagComponent@@U?$Include@V?$FlagComponent@UOnGroundFlag@@@@V?$FlagComponent@UHorseFlag@@@@@@U?$Exclude@V?$FlagComponent@UMobAllowStandSlidingFlag@@@@V?$FlagComponent@UMobIsJumpingFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@V?$FlagComponent@UHorseFlag@@@@@@V?$ViewT@VStrictEntityContext@@$$CBV?$FlagComponent@UPlayerIsSleepingFlag@@@@$$CBV?$FlagComponent@UPlayerComponentFlag@@@@@@@Z MCAPI void diff --git a/src/mc/entity/systems/common/MoveTowardsClosestSpaceSystemImpl.h b/src/mc/entity/systems/common/MoveTowardsClosestSpaceSystemImpl.h index ba04f36e8f..8a70435a4f 100644 --- a/src/mc/entity/systems/common/MoveTowardsClosestSpaceSystemImpl.h +++ b/src/mc/entity/systems/common/MoveTowardsClosestSpaceSystemImpl.h @@ -38,7 +38,7 @@ struct MoveTowardsClosestSpaceSystemImpl { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@MoveTowardsClosestSpaceSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UDepenetrationComponent@@UDimensionTypeComponent@@@@U?$Write@UStateVectorComponent@@@@U?$AddRemove@V?$FlagComponent@UMoveTowardsClosestSpaceFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@MoveTowardsClosestSpaceSystemImpl@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDepenetrationComponent@@UDimensionTypeComponent@@@@U?$Write@UStateVectorComponent@@@@U?$AddRemove@V?$FlagComponent@UMoveTowardsClosestSpaceFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -52,21 +52,21 @@ struct MoveTowardsClosestSpaceSystemImpl { class FlagComponent, struct PassengerComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, - struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorRotationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, - struct ActorDataFlagComponent, - struct AABBShapeComponent, struct DepenetrationComponent, struct DimensionTypeComponent>, struct Write, @@ -76,9 +76,9 @@ struct MoveTowardsClosestSpaceSystemImpl { struct EntityFactoryT<>>&); // symbol: - // ?doTick@MoveTowardsClosestSpaceSystemImpl@@SAXAEBVStrictEntityContext@@AEBUActorDataFlagComponent@@AEBUAABBShapeComponent@@AEBUDepenetrationComponent@@AEAUStateVectorComponent@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UDepenetrationComponent@@UDimensionTypeComponent@@@@U?$Write@UStateVectorComponent@@@@U?$AddRemove@V?$FlagComponent@UMoveTowardsClosestSpaceFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEBVIConstBlockSource@@@Z + // ?doTick@MoveTowardsClosestSpaceSystemImpl@@SAXAEBVStrictEntityContext@@AEBUActorDataFlagComponent@@AEBUAABBShapeComponent@@AEBUDepenetrationComponent@@AEAUStateVectorComponent@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDepenetrationComponent@@UDimensionTypeComponent@@@@U?$Write@UStateVectorComponent@@@@U?$AddRemove@V?$FlagComponent@UMoveTowardsClosestSpaceFlag@@@@@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEBVIConstBlockSource@@@Z MCAPI static void - doTick(class StrictEntityContext const&, struct ActorDataFlagComponent const&, struct AABBShapeComponent const&, struct DepenetrationComponent const&, struct StateVectorComponent&, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct PassengerComponent>, struct Read, struct Write, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class IConstBlockSource const&); + doTick(class StrictEntityContext const&, struct ActorDataFlagComponent const&, struct AABBShapeComponent const&, struct DepenetrationComponent const&, struct StateVectorComponent&, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct PassengerComponent>, struct Read, struct Write, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class IConstBlockSource const&); // NOLINTEND }; diff --git a/src/mc/entity/systems/common/NavigationTravelSystem.h b/src/mc/entity/systems/common/NavigationTravelSystem.h index 51770ab6af..37ecac0dd1 100644 --- a/src/mc/entity/systems/common/NavigationTravelSystem.h +++ b/src/mc/entity/systems/common/NavigationTravelSystem.h @@ -2,6 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" + class NavigationTravelSystem { public: // prevent constructor by default @@ -14,5 +18,10 @@ class NavigationTravelSystem { // symbol: ?createNavigationTravelSystem@NavigationTravelSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createNavigationTravelSystem(); + // symbol: + // ?tickNavigationTravelSystem@NavigationTravelSystem@@SAXV?$ViewT@VStrictEntityContext@@VActorOwnerComponent@@UMobTravelComponent@@VNavigationComponent@@@@V?$EntityModifier@UMobTravelComponent@@@@@Z + MCAPI static void + tickNavigationTravelSystem(class ViewT, class EntityModifier); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/PlayJumpSoundSystemImpl.h b/src/mc/entity/systems/common/PlayJumpSoundSystemImpl.h index cdd0e6e108..8f670ced83 100644 --- a/src/mc/entity/systems/common/PlayJumpSoundSystemImpl.h +++ b/src/mc/entity/systems/common/PlayJumpSoundSystemImpl.h @@ -41,7 +41,7 @@ struct PlayJumpSoundSystemImpl { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@PlayJumpSoundSystemImpl@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@UTriggerJumpRequestComponent@@V?$FlagComponent@ULavaSlimeFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UActorDefinitionIdentifierComponent@@UDimensionTypeComponent@@USoundEventPlayerComponent@@UStateVectorComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@PlayJumpSoundSystemImpl@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@UTriggerJumpRequestComponent@@V?$FlagComponent@ULavaSlimeFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UActorDefinitionIdentifierComponent@@UDimensionTypeComponent@@USoundEventPlayerComponent@@UActorDataFlagComponent@@UStateVectorComponent@@UAABBShapeComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< struct TriggerJumpRequestComponent, @@ -56,14 +56,14 @@ struct PlayJumpSoundSystemImpl { struct ActorDefinitionIdentifierComponent, struct DimensionTypeComponent, struct SoundEventPlayerComponent, + struct ActorDataFlagComponent, struct StateVectorComponent, + struct AABBShapeComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorDataFlagComponent, - struct AABBShapeComponent, - struct ActorRotationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent>, @@ -74,8 +74,9 @@ struct PlayJumpSoundSystemImpl { struct EntityFactoryT<>>&); // vIndex: 6, symbol: - // ?singleTick@PlayJumpSoundSystemImpl@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@UTriggerJumpRequestComponent@@V?$FlagComponent@ULavaSlimeFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UActorDefinitionIdentifierComponent@@UDimensionTypeComponent@@USoundEventPlayerComponent@@UStateVectorComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z - virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + // ?singleTick@PlayJumpSoundSystemImpl@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@UTriggerJumpRequestComponent@@V?$FlagComponent@ULavaSlimeFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UActorDefinitionIdentifierComponent@@UDimensionTypeComponent@@USoundEventPlayerComponent@@UActorDataFlagComponent@@UStateVectorComponent@@UAABBShapeComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void + singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // symbol: // ?doPlayJumpSoundSystem@PlayJumpSoundSystemImpl@@SAXAEBVStrictEntityContext@@AEBUActorDefinitionIdentifierComponent@@AEBUSoundEventPlayerComponent@@AEBUActorDataFlagComponent@@AEBUStateVectorComponent@@AEBUAABBShapeComponent@@AEBV?$ViewT@VStrictEntityContext@@USoundEventRequestQueueComponent@@@@AEBUGetAttachPositionViews@@W4SoundType@PlayJumpSoundSystem@@AEBVIConstBlockSource@@@Z diff --git a/src/mc/entity/systems/common/PlayerBoundingBoxStateUpdateSystem.h b/src/mc/entity/systems/common/PlayerBoundingBoxStateUpdateSystem.h index 1aefe43a25..a3df815ccb 100644 --- a/src/mc/entity/systems/common/PlayerBoundingBoxStateUpdateSystem.h +++ b/src/mc/entity/systems/common/PlayerBoundingBoxStateUpdateSystem.h @@ -38,7 +38,7 @@ class PlayerBoundingBoxStateUpdateSystem { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@PlayerBoundingBoxStateUpdateSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UAABBShapeComponent@@UDimensionTypeComponent@@@@U?$Write@UPlayerInputRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@PlayerBoundingBoxStateUpdateSystem@@EEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@@@U?$Write@UPlayerInputRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -50,21 +50,21 @@ class PlayerBoundingBoxStateUpdateSystem { class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, - struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorDataFlagComponent, - struct ActorRotationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, - struct AABBShapeComponent, struct DimensionTypeComponent>, struct Write, struct AddRemove<>, @@ -76,9 +76,8 @@ class PlayerBoundingBoxStateUpdateSystem { MCAPI static struct TickingSystemWithInfo createSystem(); // symbol: - // ?tickPlayerBoundingBoxStateUpdateSystem@PlayerBoundingBoxStateUpdateSystem@@SAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEAUPlayerInputRequestComponent@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UAABBShapeComponent@@UDimensionTypeComponent@@@@U?$Write@UPlayerInputRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@MAEBUGetAttachPositionViews@@AEBVIConstBlockSource@@@Z - MCAPI static void - tickPlayerBoundingBoxStateUpdateSystem(class StrictEntityContext const&, struct AABBShapeComponent const&, struct PlayerInputRequestComponent&, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, float, struct GetAttachPositionViews const&, class IConstBlockSource const&); + // ?tickPlayerBoundingBoxStateUpdateSystem@PlayerBoundingBoxStateUpdateSystem@@SAXAEBVStrictEntityContext@@AEBUAABBShapeComponent@@AEAUPlayerInputRequestComponent@@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@@@U?$Write@UPlayerInputRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@MAEBUGetAttachPositionViews@@AEBVIConstBlockSource@@@Z + MCAPI static void tickPlayerBoundingBoxStateUpdateSystem(class StrictEntityContext const&, struct AABBShapeComponent const&, struct PlayerInputRequestComponent&, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, float, struct GetAttachPositionViews const&, class IConstBlockSource const&); // NOLINTEND }; diff --git a/src/mc/entity/systems/common/PlayerMovementStatsEventSystem.h b/src/mc/entity/systems/common/PlayerMovementStatsEventSystem.h index d954428a80..2882e37936 100644 --- a/src/mc/entity/systems/common/PlayerMovementStatsEventSystem.h +++ b/src/mc/entity/systems/common/PlayerMovementStatsEventSystem.h @@ -2,6 +2,9 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/ViewT.h" + class PlayerMovementStatsEventSystem { public: // prevent constructor by default @@ -14,5 +17,13 @@ class PlayerMovementStatsEventSystem { // symbol: ?createSystem@PlayerMovementStatsEventSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); + // symbol: + // ?tickPlayerMovementStatsEventSystem@PlayerMovementStatsEventSystem@@SAXV?$ViewT@VStrictEntityContext@@VActorOwnerComponent@@$$CBUPlayerPreMobTravelComponent@@$$CBUStateVectorComponent@@@@@Z + MCAPI static void tickPlayerMovementStatsEventSystem(class ViewT< + class StrictEntityContext, + class ActorOwnerComponent, + struct PlayerPreMobTravelComponent const, + struct StateVectorComponent const> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/PostAIUpdateSystem.h b/src/mc/entity/systems/common/PostAIUpdateSystem.h index 3dbbbe8d31..c5ebfb2b8a 100644 --- a/src/mc/entity/systems/common/PostAIUpdateSystem.h +++ b/src/mc/entity/systems/common/PostAIUpdateSystem.h @@ -3,7 +3,10 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -19,6 +22,20 @@ class PostAIUpdateSystem { // symbol: ?createSystem@PostAIUpdateSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); + // symbol: + // ?tick@PostAIUpdateSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UMobFlag@@@@@@U?$Exclude@V?$FlagComponent@UMobIsImmobileFlag@@@@V?$FlagComponent@UIsDeadFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@UNoActionTimeComponent@@@@V?$EntityModifier@V?$FlagComponent@UWasOnGroundFlag@@@@@@@Z + MCAPI static void tick( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct Exclude, class FlagComponent>, + class Optional const>, + struct NoActionTimeComponent> view, + class EntityModifier> mod + ); + // NOLINTEND // private: diff --git a/src/mc/entity/systems/common/PostGameEventSystem.h b/src/mc/entity/systems/common/PostGameEventSystem.h index 1d2ae626b3..75fd631fed 100644 --- a/src/mc/entity/systems/common/PostGameEventSystem.h +++ b/src/mc/entity/systems/common/PostGameEventSystem.h @@ -2,6 +2,9 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/ViewT.h" + class PostGameEventSystem { public: // prevent constructor by default @@ -23,5 +26,13 @@ class PostGameEventSystem { MCAPI static void _handlePostGameEventRequest(class StrictEntityContext&, class ActorOwnerComponent&, struct StateVectorComponent const&, struct PostGameEventRequestComponent const&); + // symbol: + // ?_tick@PostGameEventSystem@@CAXV?$ViewT@VStrictEntityContext@@VActorOwnerComponent@@$$CBUStateVectorComponent@@$$CBUPostGameEventRequestComponent@@@@@Z + MCAPI static void _tick(class ViewT< + class StrictEntityContext, + class ActorOwnerComponent, + struct StateVectorComponent const, + struct PostGameEventRequestComponent const>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/PreventMobEjectionFromLegacyVehicleSystem.h b/src/mc/entity/systems/common/PreventMobEjectionFromLegacyVehicleSystem.h index b852aa1818..5ca3d0bf8e 100644 --- a/src/mc/entity/systems/common/PreventMobEjectionFromLegacyVehicleSystem.h +++ b/src/mc/entity/systems/common/PreventMobEjectionFromLegacyVehicleSystem.h @@ -3,6 +3,8 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -28,5 +30,9 @@ class PreventMobEjectionFromLegacyVehicleSystem { MCAPI static void _preventEjectionIfNeeded(class StrictEntityContext&, struct PassengerComponent const&, struct AABBShapeComponent const&, class ViewT const&, class EntityModifier>&); + // symbol: + // ?_tick@PreventMobEjectionFromLegacyVehicleSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorFirstTick@@@@@@U?$Exclude@V?$FlagComponent@UKeepPassengersTooLargeForVehicleFlag@@@@@@$$CBUPassengerComponent@@$$CBUAABBShapeComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBVRideableComponent@@@@V?$EntityModifier@V?$FlagComponent@UKeepPassengersTooLargeForVehicleFlag@@@@@@@Z + MCAPI static void _tick(class ViewT>, struct Exclude>, struct PassengerComponent const, struct AABBShapeComponent const>, class ViewT, class EntityModifier>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/RecipeUnlockingSystem.h b/src/mc/entity/systems/common/RecipeUnlockingSystem.h index e238c751e2..f67c4acbf9 100644 --- a/src/mc/entity/systems/common/RecipeUnlockingSystem.h +++ b/src/mc/entity/systems/common/RecipeUnlockingSystem.h @@ -3,6 +3,9 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" #include "mc/world/item/crafting/RecipeUnlockingRequirement.h" class RecipeUnlockingSystem { @@ -65,5 +68,13 @@ class RecipeUnlockingSystem { MCAPI static void _handleInstructionUnlocks(class ServerPlayer* serverPlayer, class UnlockedRecipesServerComponent&); + // symbol: + // ?_tick@RecipeUnlockingSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UServerPlayerComponentFlag@@@@@@VUnlockedRecipesServerComponent@@VActorOwnerComponent@@@@@Z + MCAPI static void _tick(class ViewT< + class StrictEntityContext, + struct Include>, + class UnlockedRecipesServerComponent, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/RemovePassengersTooLargeForVehicleSystem.h b/src/mc/entity/systems/common/RemovePassengersTooLargeForVehicleSystem.h index 203dadfea1..bad0f77f57 100644 --- a/src/mc/entity/systems/common/RemovePassengersTooLargeForVehicleSystem.h +++ b/src/mc/entity/systems/common/RemovePassengersTooLargeForVehicleSystem.h @@ -3,6 +3,8 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" #include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -28,5 +30,9 @@ class RemovePassengersTooLargeForVehicleSystem { MCAPI static void _removePassengersTooLargeForVehicle(class StrictEntityContext&, struct PassengerComponent const&, struct AABBShapeComponent const&, class ViewT const&, class EntityModifier>&); + // symbol: + // ?_tickRemovePassengersTooLargeForVehicle@RemovePassengersTooLargeForVehicleSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUPassengerComponent@@U?$Exclude@V?$FlagComponent@UKeepPassengersTooLargeForVehicleFlag@@@@@@$$CBUAABBShapeComponent@@@@V?$ViewT@VStrictEntityContext@@$$CBVRideableComponent@@@@V?$EntityModifier@V?$FlagComponent@UStopRidingRequestFlag@@@@@@@Z + MCAPI static void _tickRemovePassengersTooLargeForVehicle(class ViewT>, struct PassengerComponent const, struct Exclude>, struct AABBShapeComponent const>, class ViewT, class EntityModifier>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/ResetMoveDirectionJumpPendingSystem.h b/src/mc/entity/systems/common/ResetMoveDirectionJumpPendingSystem.h index f51d8f7a44..47b3982c38 100644 --- a/src/mc/entity/systems/common/ResetMoveDirectionJumpPendingSystem.h +++ b/src/mc/entity/systems/common/ResetMoveDirectionJumpPendingSystem.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Exclude.h" +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class ResetMoveDirectionJumpPendingSystem { public: // prevent constructor by default @@ -15,5 +21,18 @@ class ResetMoveDirectionJumpPendingSystem { // ?createResetMoveDirectionJumpPendingSystem@ResetMoveDirectionJumpPendingSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createResetMoveDirectionJumpPendingSystem(); + // symbol: + // ?tickResetMoveDirectionJumpPendingSystem@ResetMoveDirectionJumpPendingSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UOnGroundFlag@@@@@@U?$Exclude@V?$FlagComponent@UMobAllowStandSlidingFlag@@@@@@$$CBUJumpPendingScaleComponent@@$$CBUActorDataFlagComponent@@$$CBUActorDataControllingSeatIndexComponent@@$$CBUVehicleComponent@@UMobTravelComponent@@@@@Z + MCAPI static void + tickResetMoveDirectionJumpPendingSystem(class ViewT< + class StrictEntityContext, + struct Include>, + struct Exclude>, + struct JumpPendingScaleComponent const, + struct ActorDataFlagComponent const, + struct ActorDataControllingSeatIndexComponent const, + struct VehicleComponent const, + struct MobTravelComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/ResetSlideOffSetSystemImpl.h b/src/mc/entity/systems/common/ResetSlideOffSetSystemImpl.h deleted file mode 100644 index af3f338a23..0000000000 --- a/src/mc/entity/systems/common/ResetSlideOffSetSystemImpl.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -namespace ResetSlideOffSetSystemImpl { -// NOLINTBEGIN -// symbol: -// ?doResetSlideOffSetSystem@ResetSlideOffSetSystemImpl@@YAXAEAVStrictEntityContext@@AEBUMoveRequestComponent@@AEAUSlideOffsetComponent@@@Z -MCAPI void -doResetSlideOffSetSystem(class StrictEntityContext&, struct MoveRequestComponent const&, struct SlideOffsetComponent&); -// NOLINTEND - -}; // namespace ResetSlideOffSetSystemImpl diff --git a/src/mc/entity/systems/common/SendPlayerAuthInputReceivedEventSystem.h b/src/mc/entity/systems/common/SendPlayerAuthInputReceivedEventSystem.h index 4e590f4f5c..5f48d337a6 100644 --- a/src/mc/entity/systems/common/SendPlayerAuthInputReceivedEventSystem.h +++ b/src/mc/entity/systems/common/SendPlayerAuthInputReceivedEventSystem.h @@ -3,6 +3,8 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/world/components/FlagComponent.h" class SendPlayerAuthInputReceivedEventSystem { @@ -22,5 +24,15 @@ class SendPlayerAuthInputReceivedEventSystem { // symbol: ?create@SendPlayerAuthInputReceivedEventSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo create(); + // symbol: + // ?tickSystem@SendPlayerAuthInputReceivedEventSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UServerPlayerCurrentMovementComponent@@@@$$CBV?$FlagComponent@UPlayerComponentFlag@@@@VActorOwnerComponent@@@@@Z + MCAPI static void tickSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + struct ServerPlayerCurrentMovementComponent>, + class FlagComponent const, + class ActorOwnerComponent>); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/ServerCameraStateSystem.h b/src/mc/entity/systems/common/ServerCameraStateSystem.h new file mode 100644 index 0000000000..762018b665 --- /dev/null +++ b/src/mc/entity/systems/common/ServerCameraStateSystem.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace ServerCameraStateSystem { +// NOLINTBEGIN +// symbol: ?create@ServerCameraStateSystem@@YA?AUTickingSystemWithInfo@@XZ +MCAPI struct TickingSystemWithInfo create(); +// NOLINTEND + +}; // namespace ServerCameraStateSystem diff --git a/src/mc/entity/systems/common/ServerPlayerStopRidingInteractSystem.h b/src/mc/entity/systems/common/ServerPlayerStopRidingInteractSystem.h new file mode 100644 index 0000000000..a2f1d17969 --- /dev/null +++ b/src/mc/entity/systems/common/ServerPlayerStopRidingInteractSystem.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace ServerPlayerStopRidingInteractSystem { +// NOLINTBEGIN +// symbol: ?createSystem@ServerPlayerStopRidingInteractSystem@@YA?AUTickingSystemWithInfo@@XZ +MCAPI struct TickingSystemWithInfo createSystem(); +// NOLINTEND + +}; // namespace ServerPlayerStopRidingInteractSystem diff --git a/src/mc/entity/systems/common/SetVehicleInputIntentSystem.h b/src/mc/entity/systems/common/SetVehicleInputIntentSystem.h index bc6fc9bf4d..e5b0934069 100644 --- a/src/mc/entity/systems/common/SetVehicleInputIntentSystem.h +++ b/src/mc/entity/systems/common/SetVehicleInputIntentSystem.h @@ -2,10 +2,20 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + namespace SetVehicleInputIntentSystem { // NOLINTBEGIN // symbol: ?createSystem@SetVehicleInputIntentSystem@@YA?AUTickingSystemWithInfo@@XZ MCAPI struct TickingSystemWithInfo createSystem(); + +// symbol: +// ?doSetVehicleInputIntent@SetVehicleInputIntentSystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@@entt@@AEBVStrictEntityContext@@AEBUVehicleComponent@@AEBUActorDataFlagComponent@@AEBUActorDataControllingSeatIndexComponent@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@UPassengerComponent@@V?$FlagComponent@UMobFlag@@@@@@@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@@@V?$FlagComponent@UShouldBeSimulatedFlag@@@@@@V?$EntityModifier@UVehicleInputIntentComponent@@@@@Z +MCAPI void doSetVehicleInputIntent(entt::type_list>>, class StrictEntityContext const&, struct VehicleComponent const&, struct ActorDataFlagComponent const&, struct ActorDataControllingSeatIndexComponent const&, class ViewT>> const&, class ViewT>, class FlagComponent> const&, class EntityModifier); // NOLINTEND }; // namespace SetVehicleInputIntentSystem diff --git a/src/mc/entity/systems/common/SheepPreAIStepSystem.h b/src/mc/entity/systems/common/SheepPreAIStepSystem.h index d234b5ca91..05248ff748 100644 --- a/src/mc/entity/systems/common/SheepPreAIStepSystem.h +++ b/src/mc/entity/systems/common/SheepPreAIStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class SheepPreAIStepSystem { public: // prevent constructor by default @@ -21,5 +26,14 @@ class SheepPreAIStepSystem { // symbol: ?_doSheepPreAIStepSystem@SheepPreAIStepSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doSheepPreAIStepSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickSheepPreAIStepSystem@SheepPreAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@USheepFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickSheepPreAIStepSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/SimulatedPlayerPreAIStepSystem.h b/src/mc/entity/systems/common/SimulatedPlayerPreAIStepSystem.h index 352413aef5..a9a06b72cd 100644 --- a/src/mc/entity/systems/common/SimulatedPlayerPreAIStepSystem.h +++ b/src/mc/entity/systems/common/SimulatedPlayerPreAIStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class SimulatedPlayerPreAIStepSystem { public: // prevent constructor by default @@ -22,5 +27,14 @@ class SimulatedPlayerPreAIStepSystem { // ?_doSimulatedPlayerPreAIStepSystem@SimulatedPlayerPreAIStepSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doSimulatedPlayerPreAIStepSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickSimulatedPlayerPreAIStepSystem@SimulatedPlayerPreAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@USimulatedPlayerFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickSimulatedPlayerPreAIStepSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/SolidMobSystem.h b/src/mc/entity/systems/common/SolidMobSystem.h index 4786a74e87..db46b57844 100644 --- a/src/mc/entity/systems/common/SolidMobSystem.h +++ b/src/mc/entity/systems/common/SolidMobSystem.h @@ -19,11 +19,6 @@ MCAPI struct TickingSystemWithInfo createStoreNearbyMobsOnMoveRequestSystem(); // ?flagNearbyMobsForServerMovementCatchup@SolidMobSystem@@YAXAEBVStrictEntityContext@@AEBUStateVectorComponent@@AEBUServerCatchupMovementTrackerComponent@@AEBV?$ViewT@VStrictEntityContext@@$$CBUDimensionTypeComponent@@$$CBUAABBShapeComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBUIsSolidMobComponent@@$$CBUAABBShapeComponent@@@@V?$EntityModifier@UIsSolidMobNearbyComponent@@@@AEBULocalSpatialEntityFetcherFactoryComponent@@AEAVLocalSpatialEntityFetcher@@AEAV?$vector@VStrictEntityContext@@V?$allocator@VStrictEntityContext@@@std@@@std@@@Z MCAPI void flagNearbyMobsForServerMovementCatchup(class StrictEntityContext const&, struct StateVectorComponent const&, struct ServerCatchupMovementTrackerComponent const&, class ViewT const&, class ViewT const&, class EntityModifier, struct LocalSpatialEntityFetcherFactoryComponent const&, class LocalSpatialEntityFetcher&, std::vector&); -// symbol: -// ?flagNearbyMobsForServerMovementCatchupSystem@SolidMobSystem@@YAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUStateVectorComponent@@$$CBUServerCatchupMovementTrackerComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBUDimensionTypeComponent@@$$CBUAABBShapeComponent@@@@AEBV?$ViewT@VStrictEntityContext@@$$CBUIsSolidMobComponent@@$$CBUAABBShapeComponent@@@@V?$OptionalGlobal@$$CBULocalSpatialEntityFetcherFactoryComponent@@@@V?$EntityModifier@UIsSolidMobNearbyComponent@@@@@Z -MCAPI void -flagNearbyMobsForServerMovementCatchupSystem(class ViewT>, struct StateVectorComponent const, struct ServerCatchupMovementTrackerComponent const>, class ViewT const&, class ViewT const&, class OptionalGlobal, class EntityModifier); - // symbol: // ?flagNearbyMobsFromSolidSystem@SolidMobSystem@@YAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@@@$$CBUDimensionTypeComponent@@$$CBUIsSolidMobComponent@@$$CBUAABBShapeComponent@@@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@VActorOwnerComponent@@@@U?$Exclude@V?$FlagComponent@UActorFirstTick@@@@@@$$CBUAABBShapeComponent@@@@V?$OptionalGlobal@$$CBULocalSpatialEntityFetcherFactoryComponent@@@@V?$EntityModifier@UIsSolidMobNearbyComponent@@@@@Z MCAPI void flagNearbyMobsFromSolidSystem(class ViewT>, struct DimensionTypeComponent const, struct IsSolidMobComponent const, struct AABBShapeComponent const>, class ViewT, struct Exclude>, struct AABBShapeComponent const> const&, class OptionalGlobal, class EntityModifier); @@ -34,11 +29,6 @@ MCAPI void flagSolidMobsFromNearbyEntity(class StrictEntityContext const&, struc // symbol: ?registerSystems@SolidMobSystem@@YAXAEAVEntitySystems@@_N1@Z MCAPI void registerSystems(class EntitySystems&, bool, bool); - -// symbol: -// ?storeNearbyMobsOnMoveRequest@SolidMobSystem@@YAXAEBUIsSolidMobNearbyComponent@@AEAUDepenetrationComponent@@AEAUMoveRequestComponent@@@Z -MCAPI void -storeNearbyMobsOnMoveRequest(struct IsSolidMobNearbyComponent const&, struct DepenetrationComponent&, struct MoveRequestComponent&); // NOLINTEND }; // namespace SolidMobSystem diff --git a/src/mc/entity/systems/common/SquidPreAiStepSystem.h b/src/mc/entity/systems/common/SquidPreAiStepSystem.h index cdb9143978..723e3c86c5 100644 --- a/src/mc/entity/systems/common/SquidPreAiStepSystem.h +++ b/src/mc/entity/systems/common/SquidPreAiStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class SquidPreAiStepSystem { public: // prevent constructor by default @@ -14,6 +19,14 @@ class SquidPreAiStepSystem { // symbol: ?createSystem@SquidPreAiStepSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createSystem(); + // symbol: + // ?tick@SquidPreAiStepSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@USquidFlag@@@@@@ULocalMoveVelocityComponent@@@@@Z + MCAPI static void + tick(class ViewT< + class StrictEntityContext, + struct Include, class FlagComponent>, + struct LocalMoveVelocityComponent> view); + // NOLINTEND // private: diff --git a/src/mc/entity/systems/common/StartGlidingActionSystemImpl.h b/src/mc/entity/systems/common/StartGlidingActionSystemImpl.h new file mode 100644 index 0000000000..5c9d7c0257 --- /dev/null +++ b/src/mc/entity/systems/common/StartGlidingActionSystemImpl.h @@ -0,0 +1,25 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/OptionalGlobal.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + +namespace StartGlidingActionSystemImpl { +// NOLINTBEGIN +// symbol: +// ?doStartGlidingClientAction@StartGlidingActionSystemImpl@@YAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPlayerInputRequestComponent@@@@$$CBUPlayerActionComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@@@V?$EntityModifier@UShouldUpdateBoundingBoxRequestComponent@@@@@Z +MCAPI void + doStartGlidingClientAction(class ViewT, struct PlayerInputRequestComponent>, struct PlayerActionComponent const, struct ActorDataFlagComponent, struct ActorDataDirtyFlagsComponent>, class EntityModifier); + +// symbol: +// ?doStartGlidingServerAction@StartGlidingActionSystemImpl@@YAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPlayerInputRequestComponent@@@@$$CBUPlayerActionComponent@@UActorDataFlagComponent@@UActorDataDirtyFlagsComponent@@UElytraFlightTimeTicksComponent@@@@V?$OptionalGlobal@$$CBUCurrentTickComponent@@@@V?$EntityModifier@UShouldUpdateBoundingBoxRequestComponent@@@@@Z +MCAPI void + doStartGlidingServerAction(class ViewT, struct PlayerInputRequestComponent>, struct PlayerActionComponent const, struct ActorDataFlagComponent, struct ActorDataDirtyFlagsComponent, struct ElytraFlightTimeTicksComponent>, class OptionalGlobal, class EntityModifier); +// NOLINTEND + +}; // namespace StartGlidingActionSystemImpl diff --git a/src/mc/entity/systems/common/System.h b/src/mc/entity/systems/common/System.h index 5fa8508c3b..dfa9ce585d 100644 --- a/src/mc/entity/systems/common/System.h +++ b/src/mc/entity/systems/common/System.h @@ -98,7 +98,7 @@ struct System { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@System@MoveCollisionSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UCollidableMobFlag@@@@V?$FlagComponent@UFallingBlockFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UAABBShapeComponent@@UMaxAutoStepComponent@@UActorDataFlagComponent@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@U?$Write@UMoveRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@ULocalSpatialEntityFetcherFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@System@MoveCollisionSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UCollidableMobFlag@@@@V?$FlagComponent@UFallingBlockFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UMaxAutoStepComponent@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@U?$Write@UMoveRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@ULocalSpatialEntityFetcherFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -112,23 +112,23 @@ struct System { class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, - struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorRotationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, struct DimensionTypeComponent, - struct AABBShapeComponent, struct MaxAutoStepComponent, - struct ActorDataFlagComponent, class FlagComponent>, struct Write, struct AddRemove<>, @@ -140,11 +140,11 @@ struct System { struct EntityFactoryT<>>&); // vIndex: 6, symbol: - // ?singleTick@System@MoveCollisionSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UCollidableMobFlag@@@@V?$FlagComponent@UFallingBlockFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UAABBShapeComponent@@UMaxAutoStepComponent@@UActorDataFlagComponent@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@U?$Write@UMoveRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@ULocalSpatialEntityFetcherFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z - virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + // ?singleTick@System@MoveCollisionSystem@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UCollidableMobFlag@@@@V?$FlagComponent@UFallingBlockFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UMaxAutoStepComponent@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@U?$Write@UMoveRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@ULocalSpatialEntityFetcherFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // symbol: - // ?createViews@System@MoveCollisionSystem@@SA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UCollidableMobFlag@@@@V?$FlagComponent@UFallingBlockFlag@@@@@@U?$Read@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UActorGameTypeComponent@@UVehicleComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UAABBShapeComponent@@UMaxAutoStepComponent@@UActorDataFlagComponent@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@U?$Write@UMoveRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@ULocalSpatialEntityFetcherFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?createViews@System@MoveCollisionSystem@@SA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UCollidableMobFlag@@@@V?$FlagComponent@UFallingBlockFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@UActorRotationComponent@@UMobBodyRotationComponent@@URenderRotationComponent@@UStandAnimationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@UDimensionTypeComponent@@UMaxAutoStepComponent@@V?$FlagComponent@UCollidableMobNearFlag@@@@@@U?$Write@UMoveRequestComponent@@@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@ULocalConstBlockSourceFactoryComponent@@ULocalSpatialEntityFetcherFactoryComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z MCAPI static auto createViews(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -158,23 +158,23 @@ struct System { class FlagComponent, class FlagComponent>, struct Read< + struct AABBShapeComponent, struct MovementAbilitiesComponent, struct ActorTypeComponent, struct FallDistanceComponent, + struct PassengerComponent, struct ActorGameTypeComponent, + struct ActorDataFlagComponent, struct VehicleComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, - struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorRotationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent, struct DimensionTypeComponent, - struct AABBShapeComponent, struct MaxAutoStepComponent, - struct ActorDataFlagComponent, class FlagComponent>, struct Write, struct AddRemove<>, diff --git a/src/mc/entity/systems/common/VillagerV2PreTravelSystem.h b/src/mc/entity/systems/common/VillagerV2PreTravelSystem.h index 8b46ce4441..545f9fc663 100644 --- a/src/mc/entity/systems/common/VillagerV2PreTravelSystem.h +++ b/src/mc/entity/systems/common/VillagerV2PreTravelSystem.h @@ -3,6 +3,8 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" #include "mc/world/components/FlagComponent.h" @@ -27,5 +29,17 @@ class VillagerV2PreTravelSystem { MCAPI static void _doVillagerV2PreTravel(class StrictEntityContext const&, struct ActorDataFlagComponent const&, class EntityModifier>); + // symbol: + // ?_tick@VillagerV2PreTravelSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UVillagerV2Flag@@@@@@$$CBUActorDataFlagComponent@@@@V?$EntityModifier@V?$FlagComponent@USkipMobTravelFlag@@@@@@@Z + MCAPI static void _tick( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + struct ActorDataFlagComponent const> view, + class EntityModifier> modifier + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/WaterAnimalPreAIStepSystem.h b/src/mc/entity/systems/common/WaterAnimalPreAIStepSystem.h index 54177d9558..3cff85c58c 100644 --- a/src/mc/entity/systems/common/WaterAnimalPreAIStepSystem.h +++ b/src/mc/entity/systems/common/WaterAnimalPreAIStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class WaterAnimalPreAIStepSystem { public: // prevent constructor by default @@ -22,5 +27,14 @@ class WaterAnimalPreAIStepSystem { // ?_doWaterAnimalPreAIStepSystem@WaterAnimalPreAIStepSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doWaterAnimalPreAIStepSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickWaterAnimalPreAIStepSystem@WaterAnimalPreAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UWaterAnimalFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickWaterAnimalPreAIStepSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/WaterTravelSystem.h b/src/mc/entity/systems/common/WaterTravelSystem.h index 23f7ad5500..90497e4600 100644 --- a/src/mc/entity/systems/common/WaterTravelSystem.h +++ b/src/mc/entity/systems/common/WaterTravelSystem.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class WaterTravelSystem { public: // prevent constructor by default @@ -14,5 +20,26 @@ class WaterTravelSystem { // symbol: ?createWaterTravelSystem@WaterTravelSystem@@SA?AUTickingSystemWithInfo@@XZ MCAPI static struct TickingSystemWithInfo createWaterTravelSystem(); + // symbol: + // ?tickWaterTravelSystem@WaterTravelSystem@@SAXV?$ViewT@VStrictEntityContext@@U?$Include@$$CBV?$FlagComponent@UActorMovementTickNeededFlag@@@@$$CBV?$FlagComponent@UWaterTravelFlag@@@@@@$$CBUMovementAttributesComponent@@$$CBUSwimSpeedMultiplierComponent@@$$CBUWaterWalkSpeedEnchantComponent@@UMobTravelComponent@@V?$Optional@$$CBV?$FlagComponent@UDolphinFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@@@V?$ViewT@VStrictEntityContext@@$$CBUMovementAttributesComponent@@$$CBUMovementSpeedComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@@@@@@Z + MCAPI static void tickWaterTravelSystem( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent const, + class FlagComponent const>, + struct MovementAttributesComponent const, + struct SwimSpeedMultiplierComponent const, + struct WaterWalkSpeedEnchantComponent const, + struct MobTravelComponent, + class Optional const>, + class Optional const>> view, + class ViewT< + class StrictEntityContext, + struct MovementAttributesComponent const, + struct MovementSpeedComponent const>, + class ViewT>> players + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/WindChargeFallDamageSystem.h b/src/mc/entity/systems/common/WindChargeFallDamageSystem.h new file mode 100644 index 0000000000..0ad975f6d5 --- /dev/null +++ b/src/mc/entity/systems/common/WindChargeFallDamageSystem.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/Optional.h" +#include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" + +namespace WindChargeFallDamageSystem { +// NOLINTBEGIN +// symbol: +// ?_tickWindChargeFallDamageSystem@WindChargeFallDamageSystem@@YAXU?$type_list@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UWindChargeKnockbackComponent@@UFallDistanceComponent@@@@@entt@@AEBVStrictEntityContext@@AEBUStateVectorComponent@@V?$Optional@$$CBV?$FlagComponent@UInWaterFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UOnGroundFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@ULevitateTravelFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UAutoClimbTravelFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@UGlidingTravelFlag@@@@@@V?$Optional@$$CBV?$FlagComponent@ULavaTravelFlag@@@@@@V?$Optional@$$CBUPassengerComponent@@@@V?$EntityModifier@UWindChargeKnockbackComponent@@@@@Z +MCAPI void +_tickWindChargeFallDamageSystem(entt::type_list, struct WindChargeKnockbackComponent, struct FallDistanceComponent>>, class StrictEntityContext const&, struct StateVectorComponent const&, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class Optional, class EntityModifier); + +// symbol: ?createSystem@WindChargeFallDamageSystem@@YA?AUTickingSystemWithInfo@@XZ +MCAPI struct TickingSystemWithInfo createSystem(); +// NOLINTEND + +}; // namespace WindChargeFallDamageSystem diff --git a/src/mc/entity/systems/common/WitchPreAIStepSystem.h b/src/mc/entity/systems/common/WitchPreAIStepSystem.h index c346adff4b..fefe946716 100644 --- a/src/mc/entity/systems/common/WitchPreAIStepSystem.h +++ b/src/mc/entity/systems/common/WitchPreAIStepSystem.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + class WitchPreAIStepSystem { public: // prevent constructor by default @@ -21,5 +26,14 @@ class WitchPreAIStepSystem { // symbol: ?_doWitchPreAIStepSystem@WitchPreAIStepSystem@@CAXAEBVStrictEntityContext@@AEAVActorOwnerComponent@@@Z MCAPI static void _doWitchPreAIStepSystem(class StrictEntityContext const&, class ActorOwnerComponent&); + // symbol: + // ?_tickWitchPreAIStepSystem@WitchPreAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UWitchFlag@@@@@@VActorOwnerComponent@@@@@Z + MCAPI static void _tickWitchPreAIStepSystem(class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/WitherBossPreAIStepSystem.h b/src/mc/entity/systems/common/WitherBossPreAIStepSystem.h index 8f3fa1d9b4..6b8743540f 100644 --- a/src/mc/entity/systems/common/WitherBossPreAIStepSystem.h +++ b/src/mc/entity/systems/common/WitherBossPreAIStepSystem.h @@ -3,7 +3,10 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" #include "mc/entity/EntityModifier.h" +#include "mc/world/components/FlagComponent.h" class WitherBossPreAIStepSystem { public: @@ -26,5 +29,17 @@ class WitherBossPreAIStepSystem { MCAPI static void _doWitherBossPreAIStepSystem(class StrictEntityContext&, class ActorOwnerComponent&, class EntityModifier); + // symbol: + // ?_tickWitherBossPreAIStepSystem@WitherBossPreAIStepSystem@@CAXV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UActorMovementTickNeededFlag@@@@V?$FlagComponent@UWitherBossFlag@@@@@@VActorOwnerComponent@@@@V?$EntityModifier@UWitherBossPreAIStepResultComponent@@@@@Z + MCAPI static void _tickWitherBossPreAIStepSystem( + class ViewT< + class StrictEntityContext, + struct Include< + class FlagComponent, + class FlagComponent>, + class ActorOwnerComponent> view, + class EntityModifier mod + ); + // NOLINTEND }; diff --git a/src/mc/entity/systems/common/boundingbox/SystemImpl.h b/src/mc/entity/systems/common/boundingbox/SystemImpl.h index 17be37cbcd..d65900ce80 100644 --- a/src/mc/entity/systems/common/boundingbox/SystemImpl.h +++ b/src/mc/entity/systems/common/boundingbox/SystemImpl.h @@ -17,13 +17,14 @@ // clang-format off class StrictEntityContext; struct AABBShapeComponent; +struct ActorDataBoundingBoxComponent; +struct ActorDataDirtyFlagsComponent; struct DepenetrationComponent; struct MinecartFlag; struct OffsetsComponent; struct PlayerComponentFlag; struct ShouldUpdateBoundingBoxRequestComponent; struct ShulkerFlag; -struct SynchedActorDataComponent; // clang-format on namespace UpdateBoundingBox { @@ -53,7 +54,7 @@ struct SystemImpl { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@SystemImpl@UpdateBoundingBox@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@$$V@@U?$Write@UAABBShapeComponent@@UDepenetrationComponent@@UOffsetsComponent@@USynchedActorDataComponent@@@@U?$AddRemove@UShouldUpdateBoundingBoxRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@SystemImpl@UpdateBoundingBox@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@$$V@@U?$Write@UAABBShapeComponent@@UActorDataBoundingBoxComponent@@UActorDataDirtyFlagsComponent@@UDepenetrationComponent@@UOffsetsComponent@@@@U?$AddRemove@UShouldUpdateBoundingBoxRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, @@ -62,18 +63,19 @@ struct SystemImpl { struct Read<>, struct Write< struct AABBShapeComponent, + struct ActorDataBoundingBoxComponent, + struct ActorDataDirtyFlagsComponent, struct DepenetrationComponent, - struct OffsetsComponent, - struct SynchedActorDataComponent>, + struct OffsetsComponent>, struct AddRemove, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>>&); // vIndex: 6, symbol: - // ?singleTick@SystemImpl@UpdateBoundingBox@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@$$V@@U?$Write@UAABBShapeComponent@@UDepenetrationComponent@@UOffsetsComponent@@USynchedActorDataComponent@@@@U?$AddRemove@UShouldUpdateBoundingBoxRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z + // ?singleTick@SystemImpl@UpdateBoundingBox@@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@$$V@@U?$Write@UAABBShapeComponent@@UActorDataBoundingBoxComponent@@UActorDataDirtyFlagsComponent@@UDepenetrationComponent@@UOffsetsComponent@@@@U?$AddRemove@UShouldUpdateBoundingBoxRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@AEAVStrictEntityContext@@@Z virtual void - singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read<>, struct Write, struct AddRemove, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); + singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read<>, struct Write, struct AddRemove, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>>&, class StrictEntityContext&); // NOLINTEND }; diff --git a/src/mc/entity/systems/common/boundingbox/SystemParams.h b/src/mc/entity/systems/common/boundingbox/SystemParams.h index 2d83cef085..ec3e044aa6 100644 --- a/src/mc/entity/systems/common/boundingbox/SystemParams.h +++ b/src/mc/entity/systems/common/boundingbox/SystemParams.h @@ -16,13 +16,14 @@ // auto generated forward declare list // clang-format off struct AABBShapeComponent; +struct ActorDataBoundingBoxComponent; +struct ActorDataDirtyFlagsComponent; struct DepenetrationComponent; struct MinecartFlag; struct OffsetsComponent; struct PlayerComponentFlag; struct ShouldUpdateBoundingBoxRequestComponent; struct ShulkerFlag; -struct SynchedActorDataComponent; // clang-format on namespace UpdateBoundingBox { @@ -37,7 +38,7 @@ struct SystemParams { public: // NOLINTBEGIN // symbol: - // ??0SystemParams@UpdateBoundingBox@@QEAA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@$$V@@U?$Write@UAABBShapeComponent@@UDepenetrationComponent@@UOffsetsComponent@@USynchedActorDataComponent@@@@U?$AddRemove@UShouldUpdateBoundingBoxRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@M_N@Z + // ??0SystemParams@UpdateBoundingBox@@QEAA@AEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UMinecartFlag@@@@V?$FlagComponent@UShulkerFlag@@@@@@U?$Read@$$V@@U?$Write@UAABBShapeComponent@@UActorDataBoundingBoxComponent@@UActorDataDirtyFlagsComponent@@UDepenetrationComponent@@UOffsetsComponent@@@@U?$AddRemove@UShouldUpdateBoundingBoxRequestComponent@@@@U?$GlobalRead@$$V@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@M_N@Z MCAPI SystemParams( class StrictExecutionContext< struct Filter< @@ -47,9 +48,10 @@ struct SystemParams { struct Read<>, struct Write< struct AABBShapeComponent, + struct ActorDataBoundingBoxComponent, + struct ActorDataDirtyFlagsComponent, struct DepenetrationComponent, - struct OffsetsComponent, - struct SynchedActorDataComponent>, + struct OffsetsComponent>, struct AddRemove, struct GlobalRead<>, struct GlobalWrite<>, diff --git a/src/mc/entity/systems/common/boundingbox/UpdateBoundingBox.h b/src/mc/entity/systems/common/boundingbox/UpdateBoundingBox.h index 3e3434124b..5846a751a4 100644 --- a/src/mc/entity/systems/common/boundingbox/UpdateBoundingBox.h +++ b/src/mc/entity/systems/common/boundingbox/UpdateBoundingBox.h @@ -67,9 +67,8 @@ MCAPI void transformPlayerSizeRequest( ); // symbol: -// ?visitCommonSetSize@UpdateBoundingBox@@YAXAEBVStrictEntityContext@@AEBUShouldUpdateBoundingBoxRequestComponent@@AEBUStateVectorComponent@@AEAUSynchedActorDataComponent@@AEAUAABBShapeComponent@@AEAUDepenetrationComponent@@V?$optional_ref@$$CBVCollisionBoxComponent@@@@V?$EntityModifier@UShouldUpdateBoundingBoxRequestComponent@@@@@Z -MCAPI void -visitCommonSetSize(class StrictEntityContext const&, struct ShouldUpdateBoundingBoxRequestComponent const&, struct StateVectorComponent const&, struct SynchedActorDataComponent&, struct AABBShapeComponent&, struct DepenetrationComponent&, class optional_ref, class EntityModifier); +// ?visitCommonSetSize@UpdateBoundingBox@@YAXAEBVStrictEntityContext@@AEBUShouldUpdateBoundingBoxRequestComponent@@AEBUStateVectorComponent@@AEAUActorDataDirtyFlagsComponent@@AEAUActorDataBoundingBoxComponent@@AEAUAABBShapeComponent@@AEAUDepenetrationComponent@@V?$optional_ref@$$CBVCollisionBoxComponent@@@@V?$EntityModifier@UShouldUpdateBoundingBoxRequestComponent@@@@@Z +MCAPI void visitCommonSetSize(class StrictEntityContext const&, struct ShouldUpdateBoundingBoxRequestComponent const&, struct StateVectorComponent const&, struct ActorDataDirtyFlagsComponent&, struct ActorDataBoundingBoxComponent&, struct AABBShapeComponent&, struct DepenetrationComponent&, class optional_ref, class EntityModifier); // NOLINTEND }; // namespace UpdateBoundingBox diff --git a/src/mc/entity/systems/common/food_exhaustion/impl/FoodExhaustionSystemImpl.h b/src/mc/entity/systems/common/food_exhaustion/impl/FoodExhaustionSystemImpl.h index 9bcf5a411c..cafbdd7260 100644 --- a/src/mc/entity/systems/common/food_exhaustion/impl/FoodExhaustionSystemImpl.h +++ b/src/mc/entity/systems/common/food_exhaustion/impl/FoodExhaustionSystemImpl.h @@ -71,17 +71,17 @@ struct FoodExhaustionSystemImpl { virtual void __unk_vfn_4(); // vIndex: 5, symbol: - // ?tick@FoodExhaustionSystemImpl@1@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@V?$FlagComponent@UPlayerComponentFlag@@@@@@U?$Read@UDimensionTypeComponent@@VExhaustionComponent@@V?$FlagComponent@UOnGroundFlag@@@@UActorGameTypeComponent@@UServerPlayerCurrentMovementComponent@@UStateVectorComponent@@V?$FlagComponent@UInWaterFlag@@@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UActorDataFlagComponent@@UAABBShapeComponent@@UActorRotationComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@UAttributeRequestComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z + // ?tick@FoodExhaustionSystemImpl@1@UEAAXAEAV?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UActorMovementTickNeededFlag@@@@UPassengerComponent@@V?$FlagComponent@UPlayerComponentFlag@@@@V?$FlagComponent@UHorseFlag@@@@V?$FlagComponent@UMobFlag@@@@V?$FlagComponent@UParrotFlag@@@@UVehicleComponent@@V?$FlagComponent@UCamelFlag@@@@@@U?$Read@UDimensionTypeComponent@@VExhaustionComponent@@V?$FlagComponent@UOnGroundFlag@@@@UActorGameTypeComponent@@UServerPlayerCurrentMovementComponent@@UStateVectorComponent@@UActorDataFlagComponent@@V?$FlagComponent@UInWaterFlag@@@@UActorRotationComponent@@UMobBodyRotationComponent@@UPassengerComponent@@URenderRotationComponent@@UStandAnimationComponent@@UAABBShapeComponent@@UOffsetsComponent@@UVanillaOffsetComponent@@UPassengerRenderingRidingOffsetComponent@@@@U?$Write@$$V@@U?$AddRemove@UAttributeRequestComponent@@@@U?$GlobalRead@ULocalConstBlockSourceFactoryComponent@@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@Z virtual void tick(class StrictExecutionContext< struct Filter< class FlagComponent, struct PassengerComponent, + class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, - class FlagComponent, - class FlagComponent>, + class FlagComponent>, struct Read< struct DimensionTypeComponent, class ExhaustionComponent, @@ -89,14 +89,14 @@ struct FoodExhaustionSystemImpl { struct ActorGameTypeComponent, struct ServerPlayerCurrentMovementComponent, struct StateVectorComponent, + struct ActorDataFlagComponent, class FlagComponent, + struct ActorRotationComponent, struct MobBodyRotationComponent, struct PassengerComponent, struct RenderRotationComponent, struct StandAnimationComponent, - struct ActorDataFlagComponent, struct AABBShapeComponent, - struct ActorRotationComponent, struct OffsetsComponent, struct VanillaOffsetComponent, struct PassengerRenderingRidingOffsetComponent>, @@ -104,7 +104,7 @@ struct FoodExhaustionSystemImpl { struct AddRemove, struct GlobalRead, struct GlobalWrite<>, - struct EntityFactoryT<>>& context); + struct EntityFactoryT<>>&); // NOLINTEND }; diff --git a/src/mc/entity/utilities/ActorData.h b/src/mc/entity/utilities/ActorData.h new file mode 100644 index 0000000000..ad6ead3de3 --- /dev/null +++ b/src/mc/entity/utilities/ActorData.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace ActorData { +// NOLINTBEGIN +// symbol: ?getMovementActorFlagsMask@ActorData@@YAAEBV?$bitset@$0HG@@std@@XZ +MCAPI std::bitset<118> const& getMovementActorFlagsMask(); +// NOLINTEND + +}; // namespace ActorData diff --git a/src/mc/entity/utilities/ActorDimensionTransferManager.h b/src/mc/entity/utilities/ActorDimensionTransferManager.h new file mode 100644 index 0000000000..09fdd03c8f --- /dev/null +++ b/src/mc/entity/utilities/ActorDimensionTransferManager.h @@ -0,0 +1,34 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/StackRefResult.h" +#include "mc/world/AutomaticID.h" + +class ActorDimensionTransferManager { +public: + // prevent constructor by default + ActorDimensionTransferManager& operator=(ActorDimensionTransferManager const&); + ActorDimensionTransferManager(ActorDimensionTransferManager const&); + ActorDimensionTransferManager(); + +public: + // NOLINTBEGIN + // symbol: + // ??0ActorDimensionTransferManager@@QEAA@V?$unique_ptr@VIActorDimensionTransferer@@U?$default_delete@VIActorDimensionTransferer@@@std@@@std@@AEBV?$not_null@V?$StackRefResult@VDimensionManager@@@@@gsl@@AEBV?$not_null@V?$StackRefResult@VPortalForcer@@@@@4@@Z + MCAPI + ActorDimensionTransferManager(std::unique_ptr, gsl::not_null> const&, gsl::not_null> const&); + + // symbol: + // ?actorChangeDimension@ActorDimensionTransferManager@@QEAAXAEAVActor@@V?$AutomaticID@VDimension@@H@@AEBV?$optional@VVec3@@@std@@@Z + MCAPI void actorChangeDimension(class Actor&, DimensionType, std::optional const&); + + // symbol: ?canChangeDimension@ActorDimensionTransferManager@@QEAA_NAEBVActor@@V?$AutomaticID@VDimension@@H@@@Z + MCAPI bool canChangeDimension(class Actor const&, DimensionType); + + // symbol: ??1ActorDimensionTransferManager@@QEAA@XZ + MCAPI ~ActorDimensionTransferManager(); + + // NOLINTEND +}; diff --git a/src/mc/deps/core/common/bedrock/ActorGarbageCollector.h b/src/mc/entity/utilities/ActorGarbageCollector.h similarity index 75% rename from src/mc/deps/core/common/bedrock/ActorGarbageCollector.h rename to src/mc/entity/utilities/ActorGarbageCollector.h index 2a4aff31e3..881a9403da 100644 --- a/src/mc/deps/core/common/bedrock/ActorGarbageCollector.h +++ b/src/mc/entity/utilities/ActorGarbageCollector.h @@ -4,14 +4,8 @@ // auto generated inclusion list #include "mc/common/wrapper/OwnerPtr.h" -#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" -// auto generated forward declare list -// clang-format off -namespace Bedrock { class EnableNonOwnerReferences; } -// clang-format on - -class ActorGarbageCollector : public ::Bedrock::EnableNonOwnerReferences { +class ActorGarbageCollector { public: // prevent constructor by default ActorGarbageCollector& operator=(ActorGarbageCollector const&); @@ -19,9 +13,6 @@ class ActorGarbageCollector : public ::Bedrock::EnableNonOwnerReferences { public: // NOLINTBEGIN - // vIndex: 0, symbol: ??1ActorGarbageCollector@@UEAA@XZ - virtual ~ActorGarbageCollector(); - // symbol: ??0ActorGarbageCollector@@QEAA@XZ MCAPI ActorGarbageCollector(); diff --git a/src/mc/entity/utilities/ActorHasPropertySelectorUtils.h b/src/mc/entity/utilities/ActorHasPropertySelectorUtils.h new file mode 100644 index 0000000000..0915119dfb --- /dev/null +++ b/src/mc/entity/utilities/ActorHasPropertySelectorUtils.h @@ -0,0 +1,40 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace ActorHasPropertySelectorUtils { +// NOLINTBEGIN +// symbol: +// ?checkBoolProperty@ActorHasPropertySelectorUtils@@YA_NAEBVPropertyComponent@@AEBVHashedString@@AEBV?$variant@VCommandRationalRange@@_NV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@_N@Z +MCAPI bool checkBoolProperty( + class PropertyComponent const&, + class HashedString const&, + std::variant const&, + bool +); + +// symbol: +// ?checkIntProperty@ActorHasPropertySelectorUtils@@YA_NAEBVPropertyComponent@@AEBVHashedString@@AEAVCommandRationalRange@@_N@Z +MCAPI bool +checkIntProperty(class PropertyComponent const&, class HashedString const&, class CommandRationalRange&, bool); + +// symbol: +// ?checkRationalCommandRange@ActorHasPropertySelectorUtils@@YA_NAEBVPropertyComponent@@AEBVHashedString@@AEBV?$variant@VCommandRationalRange@@_NV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@_N@Z +MCAPI bool checkRationalCommandRange( + class PropertyComponent const&, + class HashedString const&, + std::variant const&, + bool +); + +// symbol: +// ?checkStringProperty@ActorHasPropertySelectorUtils@@YA_NAEBVPropertyComponent@@AEBVHashedString@@AEBV?$variant@VCommandRationalRange@@_NV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@_N@Z +MCAPI bool checkStringProperty( + class PropertyComponent const&, + class HashedString const&, + std::variant const&, + bool +); +// NOLINTEND + +}; // namespace ActorHasPropertySelectorUtils diff --git a/src/mc/deps/core/common/bedrock/ActorManager.h b/src/mc/entity/utilities/ActorManager.h similarity index 85% rename from src/mc/deps/core/common/bedrock/ActorManager.h rename to src/mc/entity/utilities/ActorManager.h index 0a0a629a40..5aa88fabed 100644 --- a/src/mc/deps/core/common/bedrock/ActorManager.h +++ b/src/mc/entity/utilities/ActorManager.h @@ -4,17 +4,15 @@ // auto generated inclusion list #include "mc/common/wrapper/OwnerPtr.h" -#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" -#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" +#include "mc/common/wrapper/StackRefResult.h" #include "mc/entity/utilities/ActorInitializationMethod.h" // auto generated forward declare list // clang-format off -namespace Bedrock { class EnableNonOwnerReferences; } namespace Bedrock::PubSub { class Subscription; } // clang-format on -class ActorManager : public ::Bedrock::EnableNonOwnerReferences { +class ActorManager { public: // prevent constructor by default ActorManager& operator=(ActorManager const&); @@ -22,9 +20,6 @@ class ActorManager : public ::Bedrock::EnableNonOwnerReferences { public: // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1ActorManager@@UEAA@XZ - virtual ~ActorManager() = default; - // symbol: ??0ActorManager@@QEAA@XZ MCAPI ActorManager(); @@ -55,8 +50,9 @@ class ActorManager : public ::Bedrock::EnableNonOwnerReferences { MCAPI std::vector> const& getEntities() const; // symbol: - // ?initializeWithActorGarbageCollector@ActorManager@@QEAAXV?$not_null@V?$NonOwnerPointer@VActorGarbageCollector@@@Bedrock@@@gsl@@@Z - MCAPI void initializeWithActorGarbageCollector(Bedrock::NotNullNonOwnerPtr); + // ?initializeWithActorGarbageCollector@ActorManager@@QEAAXAEBV?$not_null@V?$StackRefResult@VActorGarbageCollector@@@@@gsl@@@Z + MCAPI void + initializeWithActorGarbageCollector(gsl::not_null> const&); // symbol: // ?initializeWithProxy@ActorManager@@QEAAXV?$unique_ptr@VIActorManagerProxy@@U?$default_delete@VIActorManagerProxy@@@std@@@std@@@Z @@ -70,6 +66,9 @@ class ActorManager : public ::Bedrock::EnableNonOwnerReferences { MCAPI class Bedrock::PubSub::Subscription registerActorEntityAddedCallback(std::function callback); + // symbol: ?registerForLevelChunkEvents@ActorManager@@QEAAXAEAVILevelChunkEventManagerConnector@@@Z + MCAPI void registerForLevelChunkEvents(class ILevelChunkEventManagerConnector&); + // symbol: // ?registerOnRemoveActorEntityReferences@ActorManager@@QEAA?AVSubscription@PubSub@Bedrock@@V?$function@$$A6AXAEAVActor@@@Z@std@@@Z MCAPI class Bedrock::PubSub::Subscription @@ -95,5 +94,15 @@ class ActorManager : public ::Bedrock::EnableNonOwnerReferences { // symbol: ?takeEntity@ActorManager@@QEAA?AV?$OwnerPtr@VEntityContext@@@@VWeakEntityRef@@AEAVLevelChunk@@@Z MCAPI class OwnerPtr takeEntity(class WeakEntityRef entityRef, class LevelChunk& levelChunk); + // symbol: ??1ActorManager@@QEAA@XZ + MCAPI ~ActorManager(); + + // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: ?_onChunkDiscarded@ActorManager@@AEAAXAEAVLevelChunk@@@Z + MCAPI void _onChunkDiscarded(class LevelChunk&); + // NOLINTEND }; diff --git a/src/mc/entity/utilities/ActorMobilityUtils.h b/src/mc/entity/utilities/ActorMobilityUtils.h index 209332a15b..f1690ddee6 100644 --- a/src/mc/entity/utilities/ActorMobilityUtils.h +++ b/src/mc/entity/utilities/ActorMobilityUtils.h @@ -38,8 +38,8 @@ MCAPI float getJumpEffectAmplifierValue(struct MobEffectsComponent const&); // symbol: ?getJumpPower@ActorMobilityUtils@@YAMPEBVJumpControlComponent@@_N@Z MCAPI float getJumpPower(class JumpControlComponent const* jumpControlComponent, bool); -// symbol: ?getPosFromAABB@ActorMobilityUtils@@YA?AVVec3@@AEBVAABB@@MAEBVVec2@@@Z -MCAPI class Vec3 getPosFromAABB(class AABB const& aabb, float heightOffset, class Vec2 const&); +// symbol: ?getPosFromAABB@ActorMobilityUtils@@YA?AVVec3@@AEBVAABB@@M@Z +MCAPI class Vec3 getPosFromAABB(class AABB const&, float); // symbol: // ?getSpeed@ActorMobilityUtils@@YAMAEBVStrictEntityContext@@AEBV?$ViewT@VStrictEntityContext@@$$CBUMovementAttributesComponent@@$$CBUMovementSpeedComponent@@@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@@@@@@Z diff --git a/src/mc/entity/utilities/DiffInfo.h b/src/mc/entity/utilities/DiffInfo.h new file mode 100644 index 0000000000..f021ad9e38 --- /dev/null +++ b/src/mc/entity/utilities/DiffInfo.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace ActorData { + +template +struct DiffInfo { +public: + // prevent constructor by default + DiffInfo& operator=(DiffInfo const&); + DiffInfo(DiffInfo const&); + DiffInfo(); +}; + +}; // namespace ActorData diff --git a/src/mc/entity/utilities/InterpolatedRidingPositionCalculationHelper.h b/src/mc/entity/utilities/InterpolatedRidingPositionCalculationHelper.h index 448dadd776..7985bce28d 100644 --- a/src/mc/entity/utilities/InterpolatedRidingPositionCalculationHelper.h +++ b/src/mc/entity/utilities/InterpolatedRidingPositionCalculationHelper.h @@ -14,5 +14,8 @@ struct InterpolatedRidingPositionCalculationHelper { // symbol: ?getCamelInterpolatedRidingOffset@InterpolatedRidingPositionCalculationHelper@@SA?AVVec3@@_N@Z MCAPI static class Vec3 getCamelInterpolatedRidingOffset(bool); + // symbol: ?BASE_OFFSET@InterpolatedRidingPositionCalculationHelper@@2VVec3@@B + MCAPI static class Vec3 const BASE_OFFSET; + // NOLINTEND }; diff --git a/src/mc/entity/utilities/SpatialQueryUtility.h b/src/mc/entity/utilities/SpatialQueryUtility.h index d640ae932b..1196006abe 100644 --- a/src/mc/entity/utilities/SpatialQueryUtility.h +++ b/src/mc/entity/utilities/SpatialQueryUtility.h @@ -17,19 +17,19 @@ class SpatialQueryUtility { public: // NOLINTBEGIN // symbol: - // ?forEachBlockInAABB@SpatialQueryUtility@@SAXAEBVIConstBlockSource@@AEBVAABB@@MAEBV?$function@$$A6AXAEBVBlock@@AEBVBlockPos@@@Z@std@@@Z - MCAPI static void + // ?forEachBlockInAABB@SpatialQueryUtility@@SA_NAEBVIConstBlockSource@@AEBVAABB@@MAEBV?$function@$$A6AXAEBVBlock@@AEBVBlockPos@@@Z@std@@@Z + MCAPI static bool forEachBlockInAABB(class IConstBlockSource const&, class AABB const&, float, std::function const&); // symbol: - // ?testForCollidableMobs@SpatialQueryUtility@@SAXAEBVStrictEntityContext@@AEAVLocalSpatialEntityFetcher@@AEBVAABB@@2V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UCollidableMobFlag@@@@@@$$CBUAABBShapeComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UFallingBlockFlag@@@@@@@@AEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@@Z + // ?testForCollidableMobs@SpatialQueryUtility@@SAXAEBVStrictEntityContext@@AEAVLocalSpatialEntityFetcher@@AEBVAABB@@2V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UCollidableMobFlag@@@@@@$$CBUAABBShapeComponent@@@@V?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UFallingBlockFlag@@@@@@@@AEAUCollisionShapes@@@Z MCAPI static void - testForCollidableMobs(class StrictEntityContext const& except, class LocalSpatialEntityFetcher&, class AABB const&, class AABB const& intersectTestBox, class ViewT>, struct AABBShapeComponent const> view, class ViewT>>, std::vector&); + testForCollidableMobs(class StrictEntityContext const& except, class LocalSpatialEntityFetcher&, class AABB const&, class AABB const& intersectTestBox, class ViewT>, struct AABBShapeComponent const> view, class ViewT>>, struct CollisionShapes&); // symbol: - // ?testForEntityStacking@SpatialQueryUtility@@SAXAEBVStrictEntityContext@@AEAVLocalSpatialEntityFetcher@@AEBVAABB@@V?$ViewT@VStrictEntityContext@@$$CBUAABBShapeComponent@@$$CBUActorDataFlagComponent@@@@AEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@@Z + // ?testForEntityStacking@SpatialQueryUtility@@SAXAEBVStrictEntityContext@@AEAVLocalSpatialEntityFetcher@@AEBVAABB@@V?$ViewT@VStrictEntityContext@@$$CBUAABBShapeComponent@@$$CBUActorDataFlagComponent@@@@AEAUCollisionShapes@@@Z MCAPI static void - testForEntityStacking(class StrictEntityContext const& except, class LocalSpatialEntityFetcher& component, class AABB const& intersectTestBox, class ViewT view, std::vector&); + testForEntityStacking(class StrictEntityContext const&, class LocalSpatialEntityFetcher&, class AABB const&, class ViewT, struct CollisionShapes&); // symbol: // ?tryFetchEntity@SpatialQueryUtility@@SA?AVStrictEntityContext@@AEAVLocalSpatialEntityFetcher@@AEBUActorUniqueID@@@Z diff --git a/src/mc/enums/MushroomOuterType.h b/src/mc/enums/CorrectionType.h similarity index 62% rename from src/mc/enums/MushroomOuterType.h rename to src/mc/enums/CorrectionType.h index f67a16b965..5018529d74 100644 --- a/src/mc/enums/MushroomOuterType.h +++ b/src/mc/enums/CorrectionType.h @@ -2,4 +2,4 @@ #include "mc/_HeaderOutputPredefine.h" -enum class MushroomOuterType {}; +enum class CorrectionType {}; diff --git a/src/mc/events/IMinecraftEventing.h b/src/mc/events/IMinecraftEventing.h index a00cfb14d3..31078b0587 100644 --- a/src/mc/events/IMinecraftEventing.h +++ b/src/mc/events/IMinecraftEventing.h @@ -60,8 +60,6 @@ class IMinecraftEventing { enum class SignInStage {}; - enum class SignInTrigger {}; - enum class StoreType {}; enum class StructureBlockActionType {}; diff --git a/src/mc/events/LevelGameRuleChangeEvent.h b/src/mc/events/LevelGameRuleChangeEvent.h new file mode 100644 index 0000000000..729fedc7bf --- /dev/null +++ b/src/mc/events/LevelGameRuleChangeEvent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct LevelGameRuleChangeEvent { +public: + // prevent constructor by default + LevelGameRuleChangeEvent& operator=(LevelGameRuleChangeEvent const&); + LevelGameRuleChangeEvent(LevelGameRuleChangeEvent const&); + LevelGameRuleChangeEvent(); +}; diff --git a/src/mc/events/MinecraftEventing.h b/src/mc/events/MinecraftEventing.h index 7235a35963..7615cb431b 100644 --- a/src/mc/events/MinecraftEventing.h +++ b/src/mc/events/MinecraftEventing.h @@ -5,6 +5,7 @@ // auto generated inclusion list #include "mc/client/network/realms/RealmsPurchaseFailureReason.h" #include "mc/client/network/realms/RealmsPurchaseIntent.h" +#include "mc/client/social/IdentitySignInTrigger.h" #include "mc/client/social/MultiplayerServiceIdentifier.h" #include "mc/client/social/SignInResult.h" #include "mc/deps/core/LevelStorageState.h" @@ -299,8 +300,9 @@ class MinecraftEventing { fileEventCloudWorldPullFailed(std::string const& reason, std::string const& worldID, bool localLevelDatUsed); // symbol: - // ?fireBannedSkinVerificationEvent@MinecraftEventing@@UEAAXAEBIAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@1_N2@Z - MCVAPI void fireBannedSkinVerificationEvent(uint const&, std::string const&, std::string const&, bool, bool); + // ?fireBannedSkinVerificationEvent@MinecraftEventing@@UEAAXAEBIAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@1_NH1@Z + MCVAPI void + fireBannedSkinVerificationEvent(uint const&, std::string const&, std::string const&, bool, int, std::string const&); // symbol: // ?fireCDNDownloadEvent@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@00AEBW4CDNDownloadResult@IMinecraftEventing@@AEBW4CDNDownloadEventOrigin@5@AEBM@Z @@ -682,14 +684,14 @@ class MinecraftEventing { // ?fireEventFeedbackSubmitted@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N1@Z MCVAPI void fireEventFeedbackSubmitted(std::string const& productId, bool safetyCheckSuccessful, bool isValidText); - // symbol: - // ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAX_N0AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCVAPI void fireEventGameRulesUpdated(bool oldValue, bool newValue, std::string const& gameRuleName); - // symbol: // ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAXMMAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCVAPI void fireEventGameRulesUpdated(float oldValue, float newValue, std::string const& gameRuleName); + // symbol: + // ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAX_N0AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCVAPI void fireEventGameRulesUpdated(bool oldValue, bool newValue, std::string const& gameRuleName); + // symbol: // ?fireEventGameRulesUpdated@MinecraftEventing@@UEAAXHHAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCVAPI void fireEventGameRulesUpdated(int oldValue, int newValue, std::string const& gameRuleName); @@ -799,12 +801,13 @@ class MinecraftEventing { MCVAPI void fireEventLockedItemGiven(); // symbol: - // ?fireEventMessageServiceImpression@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000@Z + // ?fireEventMessageServiceImpression@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000_N@Z MCVAPI void fireEventMessageServiceImpression( - std::string const& messageId, - std::string const& messageSessionId, - std::string const& Surface, - std::string const& Template + std::string const&, + std::string const&, + std::string const&, + std::string const&, + bool ); // symbol: @@ -844,9 +847,9 @@ class MinecraftEventing { MCVAPI void fireEventOnDeviceLost(std::vector const&); // symbol: - // ?fireEventOnServerDisconnect@MinecraftEventing@@UEAAXW4DisconnectFailReason@Connection@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4SubClientId@@11@Z + // ?fireEventOnServerDisconnect@MinecraftEventing@@UEAAXW4DisconnectFailReason@Connection@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4SubClientId@@1_K1@Z MCVAPI void - fireEventOnServerDisconnect(::Connection::DisconnectFailReason, std::string const&, ::SubClientId, std::string const&, std::string const&); + fireEventOnServerDisconnect(::Connection::DisconnectFailReason, std::string const&, ::SubClientId, std::string const&, uint64, std::string const&); // symbol: ?fireEventOnSuccessfulClientLogin@MinecraftEventing@@UEAAXPEBVMultiPlayerLevel@@@Z MCVAPI void fireEventOnSuccessfulClientLogin(class MultiPlayerLevel const*); @@ -1216,6 +1219,10 @@ class MinecraftEventing { // symbol: ?fireEventRespondedToAcceptContent@MinecraftEventing@@UEAAXAEBUPacksInfoData@@_N@Z MCVAPI void fireEventRespondedToAcceptContent(struct PacksInfoData const& data, bool accepted); + // symbol: + // ?fireEventSafetyHTTPRequest@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0H@Z + MCVAPI void fireEventSafetyHTTPRequest(std::string const&, std::string const&, int); + // symbol: // ?fireEventScreenChanged@MinecraftEventing@@UEAAXAEBIAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@@2@@3@@Z MCVAPI void fireEventScreenChanged( @@ -1347,17 +1354,9 @@ class MinecraftEventing { ); // symbol: - // ?fireEventSignInToIdentity@MinecraftEventing@@UEAAXW4SignInAccountType@IMinecraftEventing@@W4SignInTrigger@3@_NW4SignInStage@3@W4SignInResult@Social@@HUPlayerIDs@7@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCVAPI void fireEventSignInToIdentity( - ::IMinecraftEventing::SignInAccountType accountType, - ::IMinecraftEventing::SignInTrigger trigger, - bool signInUIShown, - ::IMinecraftEventing::SignInStage stage, - ::Social::SignInResult result, - int retryCount, - struct Social::PlayerIDs ids, - std::string const& errorCode - ); + // ?fireEventSignInToIdentity@MinecraftEventing@@UEAAXW4SignInAccountType@IMinecraftEventing@@W4IdentitySignInTrigger@Social@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_NW4SignInStage@3@W4SignInResult@5@HUPlayerIDs@5@2@Z + MCVAPI void + fireEventSignInToIdentity(::IMinecraftEventing::SignInAccountType, ::Social::IdentitySignInTrigger, std::string const&, bool, ::IMinecraftEventing::SignInStage, ::Social::SignInResult, int, struct Social::PlayerIDs, std::string const&); // symbol: // ?fireEventSignOutEdu@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Role@edu@@000@Z @@ -1365,10 +1364,10 @@ class MinecraftEventing { fireEventSignOutEdu(std::string const&, ::edu::Role, std::string const&, std::string const&, std::string const&); // symbol: - // ?fireEventSignOutOfIdentity@MinecraftEventing@@UEAAXW4SignInAccountType@IMinecraftEventing@@W4SignInTrigger@3@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2@Z + // ?fireEventSignOutOfIdentity@MinecraftEventing@@UEAAXW4SignInAccountType@IMinecraftEventing@@W4IdentitySignInTrigger@Social@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2@Z MCVAPI void fireEventSignOutOfIdentity( ::IMinecraftEventing::SignInAccountType accountType, - ::IMinecraftEventing::SignInTrigger trigger, + ::Social::IdentitySignInTrigger trigger, std::string const& accountId, std::string const& errorCode ); @@ -1709,6 +1708,10 @@ class MinecraftEventing { // symbol: ?firePackSettingsEvent@MinecraftEventing@@UEAAXAEBVPackSettings@@AEBVPackManifest@@@Z MCVAPI void firePackSettingsEvent(class PackSettings const& packSettings, class PackManifest const& manifest); + // symbol: + // ?firePassthroughTextProcessEvent@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4TextProcessingEventOrigin@@0@Z + MCVAPI void firePassthroughTextProcessEvent(std::string const&, ::TextProcessingEventOrigin, std::string const&); + // symbol: // ?firePerfTestEvent@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@00II0AEBV?$vector@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@M@std@@V?$allocator@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@M@std@@@2@@3@@Z MCVAPI void firePerfTestEvent( @@ -1762,9 +1765,9 @@ class MinecraftEventing { MCVAPI void fireRealmConnectionEventStart(::IMinecraftEventing::RealmConnectionFlow realmConnectionFlow); // symbol: - // ?fireSafetyServiceTextProcessEvent@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4TextProcessingEventOrigin@@G0_NNDDAEBVValue@Json@@@Z + // ?fireSafetyServiceTextProcessEvent@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4TextProcessingEventOrigin@@G0_NNDDAEBVValue@Json@@0@Z MCVAPI void - fireSafetyServiceTextProcessEvent(std::string const&, ::TextProcessingEventOrigin, ushort, std::string const&, bool, double, char, char, class Json::Value const&); + fireSafetyServiceTextProcessEvent(std::string const&, ::TextProcessingEventOrigin, ushort, std::string const&, bool, double, char, char, class Json::Value const&, std::string const&); // symbol: // ?fireScreenLoadTimeUpdateEvent@MinecraftEventing@@UEAAXAEBIAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$duration@_JU?$ratio@$00$0DLJKMKAA@@std@@@chrono@3@1@Z @@ -2039,6 +2042,9 @@ class MinecraftEventing { MCAPI static void fireEventJukeboxUsed(class Player* player, class ItemDescriptor const& disc, std::string const& biome); + // symbol: ?fireEventMobDied@MinecraftEventing@@SAXAEAVMob@@H@Z + MCAPI static void fireEventMobDied(class Mob&, int); + // symbol: ?fireEventMobEffectChanged@MinecraftEventing@@SAXAEAVMob@@AEBVMobEffectInstance@@W4ChangeType@1@@Z MCAPI static void fireEventMobEffectChanged( class Mob& mob, @@ -2046,6 +2052,9 @@ class MinecraftEventing { ::MinecraftEventing::ChangeType change ); + // symbol: ?fireEventMobTeleportedToOwner@MinecraftEventing@@SAXAEAVMob@@@Z + MCAPI static void fireEventMobTeleportedToOwner(class Mob&); + // symbol: ?fireEventPlayerTeleported@MinecraftEventing@@SAXPEAVPlayer@@MW4TeleportationCause@1@H@Z MCAPI static void fireEventPlayerTeleported( class Player* player, diff --git a/src/mc/events/MutablePlayerGameplayEvent.h b/src/mc/events/MutablePlayerGameplayEvent.h new file mode 100644 index 0000000000..9011d8d1e6 --- /dev/null +++ b/src/mc/events/MutablePlayerGameplayEvent.h @@ -0,0 +1,12 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +template +struct MutablePlayerGameplayEvent { +public: + // prevent constructor by default + MutablePlayerGameplayEvent& operator=(MutablePlayerGameplayEvent const&); + MutablePlayerGameplayEvent(MutablePlayerGameplayEvent const&); + MutablePlayerGameplayEvent(); +}; diff --git a/src/mc/events/PlayerGameModeChangeEvent.h b/src/mc/events/PlayerGameModeChangeEvent.h new file mode 100644 index 0000000000..191dc85fea --- /dev/null +++ b/src/mc/events/PlayerGameModeChangeEvent.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct PlayerGameModeChangeEvent { +public: + // prevent constructor by default + PlayerGameModeChangeEvent& operator=(PlayerGameModeChangeEvent const&); + PlayerGameModeChangeEvent(PlayerGameModeChangeEvent const&); + PlayerGameModeChangeEvent(); + +public: + // NOLINTBEGIN + // symbol: ??1PlayerGameModeChangeEvent@@QEAA@XZ + MCAPI ~PlayerGameModeChangeEvent(); + + // NOLINTEND +}; diff --git a/src/mc/events/PlayerInteractWithBlockAfterEvent.h b/src/mc/events/PlayerInteractWithBlockAfterEvent.h new file mode 100644 index 0000000000..1d1b4fb2e4 --- /dev/null +++ b/src/mc/events/PlayerInteractWithBlockAfterEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct PlayerInteractWithBlockAfterEvent { +public: + // prevent constructor by default + PlayerInteractWithBlockAfterEvent& operator=(PlayerInteractWithBlockAfterEvent const&); + PlayerInteractWithBlockAfterEvent(); + +public: + // NOLINTBEGIN + // symbol: ??0PlayerInteractWithBlockAfterEvent@@QEAA@AEBU0@@Z + MCAPI PlayerInteractWithBlockAfterEvent(struct PlayerInteractWithBlockAfterEvent const&); + + // symbol: ??1PlayerInteractWithBlockAfterEvent@@QEAA@XZ + MCAPI ~PlayerInteractWithBlockAfterEvent(); + + // NOLINTEND +}; diff --git a/src/mc/events/PlayerInteractWithBlockBeforeEvent.h b/src/mc/events/PlayerInteractWithBlockBeforeEvent.h new file mode 100644 index 0000000000..581ff70946 --- /dev/null +++ b/src/mc/events/PlayerInteractWithBlockBeforeEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct PlayerInteractWithBlockBeforeEvent { +public: + // prevent constructor by default + PlayerInteractWithBlockBeforeEvent& operator=(PlayerInteractWithBlockBeforeEvent const&); + PlayerInteractWithBlockBeforeEvent(); + +public: + // NOLINTBEGIN + // symbol: ??0PlayerInteractWithBlockBeforeEvent@@QEAA@AEBU0@@Z + MCAPI PlayerInteractWithBlockBeforeEvent(struct PlayerInteractWithBlockBeforeEvent const&); + + // symbol: ??1PlayerInteractWithBlockBeforeEvent@@QEAA@XZ + MCAPI ~PlayerInteractWithBlockBeforeEvent(); + + // NOLINTEND +}; diff --git a/src/mc/events/PlayerInteractWithBlockEvent.h b/src/mc/events/PlayerInteractWithBlockEvent.h deleted file mode 100644 index fce1d85cb4..0000000000 --- a/src/mc/events/PlayerInteractWithBlockEvent.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct PlayerInteractWithBlockEvent { -public: - // prevent constructor by default - PlayerInteractWithBlockEvent& operator=(PlayerInteractWithBlockEvent const&); - PlayerInteractWithBlockEvent(); - -public: - // NOLINTBEGIN - // symbol: ??0PlayerInteractWithBlockEvent@@QEAA@AEBU0@@Z - MCAPI PlayerInteractWithBlockEvent(struct PlayerInteractWithBlockEvent const&); - - // symbol: ??1PlayerInteractWithBlockEvent@@QEAA@XZ - MCAPI ~PlayerInteractWithBlockEvent(); - - // NOLINTEND -}; diff --git a/src/mc/events/PlayerInteractWithEntityAfterEvent.h b/src/mc/events/PlayerInteractWithEntityAfterEvent.h new file mode 100644 index 0000000000..c699f3c388 --- /dev/null +++ b/src/mc/events/PlayerInteractWithEntityAfterEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct PlayerInteractWithEntityAfterEvent { +public: + // prevent constructor by default + PlayerInteractWithEntityAfterEvent& operator=(PlayerInteractWithEntityAfterEvent const&); + PlayerInteractWithEntityAfterEvent(); + +public: + // NOLINTBEGIN + // symbol: ??0PlayerInteractWithEntityAfterEvent@@QEAA@AEBU0@@Z + MCAPI PlayerInteractWithEntityAfterEvent(struct PlayerInteractWithEntityAfterEvent const&); + + // symbol: ??1PlayerInteractWithEntityAfterEvent@@QEAA@XZ + MCAPI ~PlayerInteractWithEntityAfterEvent(); + + // NOLINTEND +}; diff --git a/src/mc/events/PlayerInteractWithEntityBeforeEvent.h b/src/mc/events/PlayerInteractWithEntityBeforeEvent.h new file mode 100644 index 0000000000..e2f5da1cb3 --- /dev/null +++ b/src/mc/events/PlayerInteractWithEntityBeforeEvent.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct PlayerInteractWithEntityBeforeEvent { +public: + // prevent constructor by default + PlayerInteractWithEntityBeforeEvent& operator=(PlayerInteractWithEntityBeforeEvent const&); + PlayerInteractWithEntityBeforeEvent(); + +public: + // NOLINTBEGIN + // symbol: ??0PlayerInteractWithEntityBeforeEvent@@QEAA@AEBU0@@Z + MCAPI PlayerInteractWithEntityBeforeEvent(struct PlayerInteractWithEntityBeforeEvent const&); + + // symbol: ??1PlayerInteractWithEntityBeforeEvent@@QEAA@XZ + MCAPI ~PlayerInteractWithEntityBeforeEvent(); + + // NOLINTEND +}; diff --git a/src/mc/events/PlayerInteractWithEntityEvent.h b/src/mc/events/PlayerInteractWithEntityEvent.h deleted file mode 100644 index 5bc628b275..0000000000 --- a/src/mc/events/PlayerInteractWithEntityEvent.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct PlayerInteractWithEntityEvent { -public: - // prevent constructor by default - PlayerInteractWithEntityEvent& operator=(PlayerInteractWithEntityEvent const&); - PlayerInteractWithEntityEvent(); - -public: - // NOLINTBEGIN - // symbol: ??0PlayerInteractWithEntityEvent@@QEAA@AEBU0@@Z - MCAPI PlayerInteractWithEntityEvent(struct PlayerInteractWithEntityEvent const&); - - // symbol: ??1PlayerInteractWithEntityEvent@@QEAA@XZ - MCAPI ~PlayerInteractWithEntityEvent(); - - // NOLINTEND -}; diff --git a/src/mc/events/PlayerSkinLoadedClientEvent.h b/src/mc/events/PlayerSkinLoadedClientEvent.h index c588868c02..1a3e49a41e 100644 --- a/src/mc/events/PlayerSkinLoadedClientEvent.h +++ b/src/mc/events/PlayerSkinLoadedClientEvent.h @@ -8,11 +8,4 @@ struct PlayerSkinLoadedClientEvent { PlayerSkinLoadedClientEvent& operator=(PlayerSkinLoadedClientEvent const&); PlayerSkinLoadedClientEvent(PlayerSkinLoadedClientEvent const&); PlayerSkinLoadedClientEvent(); - -public: - // NOLINTBEGIN - // symbol: ??1PlayerSkinLoadedClientEvent@@QEAA@XZ - MCAPI ~PlayerSkinLoadedClientEvent(); - - // NOLINTEND }; diff --git a/src/mc/events/ServerTextEvent.h b/src/mc/events/ServerTextEvent.h new file mode 100644 index 0000000000..efafba47e3 --- /dev/null +++ b/src/mc/events/ServerTextEvent.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +enum class ServerTextEvent {}; diff --git a/src/mc/external/scripting/CommonModuleFactory.h b/src/mc/external/scripting/CommonModuleFactory.h index 56210ce52b..f65615aabe 100644 --- a/src/mc/external/scripting/CommonModuleFactory.h +++ b/src/mc/external/scripting/CommonModuleFactory.h @@ -23,15 +23,13 @@ class CommonModuleFactory : public ::Scripting::GenericModuleBindingFactory { // prevent constructor by default CommonModuleFactory& operator=(CommonModuleFactory const&); CommonModuleFactory(CommonModuleFactory const&); + CommonModuleFactory(); public: // NOLINTBEGIN // vIndex: 0, symbol: __gen_??1CommonModuleFactory@Scripting@@UEAA@XZ virtual ~CommonModuleFactory() = default; - // symbol: ??0CommonModuleFactory@Scripting@@QEAA@XZ - MCAPI CommonModuleFactory(); - // symbol: ?ModuleName@CommonModuleFactory@Scripting@@2PEBDEB MCAPI static char const* ModuleName; @@ -42,6 +40,9 @@ class CommonModuleFactory : public ::Scripting::GenericModuleBindingFactory { // private: // NOLINTBEGIN + // symbol: ?_addVersions@CommonModuleFactory@Scripting@@AEAAXXZ + MCAPI void _addVersions(); + // symbol: // ?_generateBindings@CommonModuleFactory@Scripting@@AEAA?AUModuleBinding@2@AEAVModuleBindingBuilder@2@_NAEBV?$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@@@Z MCAPI struct Scripting::ModuleBinding diff --git a/src/mc/external/scripting/EnumBinding.h b/src/mc/external/scripting/EnumBinding.h index 0d939650fd..87c632b1cb 100644 --- a/src/mc/external/scripting/EnumBinding.h +++ b/src/mc/external/scripting/EnumBinding.h @@ -10,6 +10,31 @@ namespace Scripting { struct ConstantFactory; } namespace Scripting { struct EnumBinding { +public: + // EnumBinding inner types declare + // clang-format off + struct EnumValue; + // clang-format on + + // EnumBinding inner types define + struct EnumValue { + public: + // prevent constructor by default + EnumValue& operator=(EnumValue const&); + EnumValue(EnumValue const&); + EnumValue(); + + public: + // NOLINTBEGIN + // symbol: ??0EnumValue@EnumBinding@Scripting@@QEAA@$$QEAU012@@Z + MCAPI EnumValue(struct Scripting::EnumBinding::EnumValue&&); + + // symbol: ??1EnumValue@EnumBinding@Scripting@@QEAA@XZ + MCAPI ~EnumValue(); + + // NOLINTEND + }; + public: // prevent constructor by default EnumBinding& operator=(EnumBinding const&); @@ -26,9 +51,9 @@ struct EnumBinding { MCAPI EnumBinding(struct Scripting::EnumBinding const&); // symbol: - // ??0EnumBinding@Scripting@@QEAA@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Vmeta_type@entt@@_NV?$vector@UConstantFactory@Scripting@@V?$allocator@UConstantFactory@Scripting@@@std@@@3@V?$vector@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Vmeta_any@entt@@@std@@V?$allocator@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Vmeta_any@entt@@@std@@@2@@3@@Z + // ??0EnumBinding@Scripting@@QEAA@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Vmeta_type@entt@@_NV?$vector@UConstantFactory@Scripting@@V?$allocator@UConstantFactory@Scripting@@@std@@@3@V?$vector@UEnumValue@EnumBinding@Scripting@@V?$allocator@UEnumValue@EnumBinding@Scripting@@@std@@@3@@Z MCAPI - EnumBinding(std::string, entt::meta_type, bool, std::vector, std::vector>); + EnumBinding(std::string, entt::meta_type, bool, std::vector, std::vector); // symbol: ??1EnumBinding@Scripting@@QEAA@XZ MCAPI ~EnumBinding(); diff --git a/src/mc/external/scripting/GeneratorIterator.h b/src/mc/external/scripting/GeneratorIterator.h deleted file mode 100644 index 8c58469de4..0000000000 --- a/src/mc/external/scripting/GeneratorIterator.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -namespace Scripting { - -template -class GeneratorIterator { -public: - // prevent constructor by default - GeneratorIterator& operator=(GeneratorIterator const&); - GeneratorIterator(GeneratorIterator const&); - GeneratorIterator(); -}; - -}; // namespace Scripting diff --git a/src/mc/external/scripting/GeneratorIteratorAny.h b/src/mc/external/scripting/GeneratorIteratorAny.h index 75affa63de..1039fca64c 100644 --- a/src/mc/external/scripting/GeneratorIteratorAny.h +++ b/src/mc/external/scripting/GeneratorIteratorAny.h @@ -36,9 +36,6 @@ class GeneratorIteratorAny : public ::Scripting::ScriptValue { MCAPI GeneratorIteratorAny(class Scripting::IRuntime*, struct Scripting::ContextId, class Scripting::WeakLifetimeScope, class Scripting::StrongTypedObjectHandle const&, class Scripting::IObjectInspector*); - // symbol: ?isDone@GeneratorIteratorAny@Scripting@@QEBA_NXZ - MCAPI bool isDone() const; - // symbol: ??4GeneratorIteratorAny@Scripting@@QEAAAEAV01@$$QEAV01@@Z MCAPI class Scripting::GeneratorIteratorAny& operator=(class Scripting::GeneratorIteratorAny&&); diff --git a/src/mc/external/scripting/GeneratorStatus.h b/src/mc/external/scripting/GeneratorStatus.h new file mode 100644 index 0000000000..1b192beea6 --- /dev/null +++ b/src/mc/external/scripting/GeneratorStatus.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace Scripting { + +class GeneratorStatus { +public: + // prevent constructor by default + GeneratorStatus& operator=(GeneratorStatus const&); + GeneratorStatus(GeneratorStatus const&); + GeneratorStatus(); +}; + +}; // namespace Scripting diff --git a/src/mc/external/scripting/ModuleBindingBuilder.h b/src/mc/external/scripting/ModuleBindingBuilder.h index b379d2f9d5..f0732a20f3 100644 --- a/src/mc/external/scripting/ModuleBindingBuilder.h +++ b/src/mc/external/scripting/ModuleBindingBuilder.h @@ -2,6 +2,9 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/external/scripting/EnumBinding.h" + // auto generated forward declare list // clang-format off namespace Scripting { class Release; } @@ -85,9 +88,9 @@ class ModuleBindingBuilder { _filterEnumBindings(std::vector const&, bool, std::vector const&) const; // symbol: - // ?_filterEnumValueMap@ModuleBindingBuilder@Scripting@@AEBA?AV?$vector@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Vmeta_any@entt@@@std@@V?$allocator@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Vmeta_any@entt@@@std@@@2@@std@@AEBV?$vector@UConstantFactory@Scripting@@V?$allocator@UConstantFactory@Scripting@@@std@@@4@AEBV34@@Z - MCAPI std::vector> - _filterEnumValueMap(std::vector const&, std::vector> const&) + // ?_filterEnumValueMap@ModuleBindingBuilder@Scripting@@AEBA?AV?$vector@UEnumValue@EnumBinding@Scripting@@V?$allocator@UEnumValue@EnumBinding@Scripting@@@std@@@std@@AEBV?$vector@UConstantFactory@Scripting@@V?$allocator@UConstantFactory@Scripting@@@std@@@4@AEBV34@@Z + MCAPI std::vector + _filterEnumValueMap(std::vector const&, std::vector const&) const; // symbol: diff --git a/src/mc/external/scripting/Releases.h b/src/mc/external/scripting/Releases.h index 515a8361cf..bb0baaa2de 100644 --- a/src/mc/external/scripting/Releases.h +++ b/src/mc/external/scripting/Releases.h @@ -17,6 +17,9 @@ MCAPI extern struct Scripting::Version const V100; // symbol: ?V110@Releases@ScriptModuleCommon@@3UVersion@Scripting@@B MCAPI extern struct Scripting::Version const V110; + +// symbol: ?V120@Releases@ScriptModuleCommon@@3UVersion@Scripting@@B +MCAPI extern struct Scripting::Version const V120; // NOLINTEND }; // namespace ScriptModuleCommon::Releases diff --git a/src/mc/external/scripting/ScriptDebuggerDiagnosticsPayload.h b/src/mc/external/scripting/ScriptDebuggerDiagnosticsPayload.h index 74fb6a1496..18b9e2ca00 100644 --- a/src/mc/external/scripting/ScriptDebuggerDiagnosticsPayload.h +++ b/src/mc/external/scripting/ScriptDebuggerDiagnosticsPayload.h @@ -17,8 +17,8 @@ class ScriptDebuggerDiagnosticsPayload { public: // NOLINTBEGIN // symbol: - // ?serialize@ScriptDebuggerDiagnosticsPayload@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI std::string serialize(struct cereal::ReflectionCtx&) const; + // ?serialize@ScriptDebuggerDiagnosticsPayload@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI std::string serialize(struct cereal::ReflectionCtx const&) const; // symbol: ??1ScriptDebuggerDiagnosticsPayload@@QEAA@XZ MCAPI ~ScriptDebuggerDiagnosticsPayload(); diff --git a/src/mc/external/scripting/ScriptMinecraftDebugUtilitiesModuleFactory.h b/src/mc/external/scripting/ScriptMinecraftDebugUtilitiesModuleFactory.h new file mode 100644 index 0000000000..b4b9e14252 --- /dev/null +++ b/src/mc/external/scripting/ScriptMinecraftDebugUtilitiesModuleFactory.h @@ -0,0 +1,67 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/GenericModuleBindingFactory.h" + +// auto generated forward declare list +// clang-format off +namespace Scripting { class GenericModuleBindingFactory; } +namespace Scripting { class ModuleBindingBuilder; } +namespace Scripting { struct ContextConfig; } +namespace Scripting { struct ModuleBinding; } +namespace Scripting { struct ModuleDescriptor; } +namespace Scripting { struct UUID; } +namespace Scripting { struct Version; } +namespace mce { class UUID; } +// clang-format on + +class ScriptMinecraftDebugUtilitiesModuleFactory : public ::Scripting::GenericModuleBindingFactory { +public: + // prevent constructor by default + ScriptMinecraftDebugUtilitiesModuleFactory& operator=(ScriptMinecraftDebugUtilitiesModuleFactory const&); + ScriptMinecraftDebugUtilitiesModuleFactory(ScriptMinecraftDebugUtilitiesModuleFactory const&); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ScriptMinecraftDebugUtilitiesModuleFactory@@UEAA@XZ + virtual ~ScriptMinecraftDebugUtilitiesModuleFactory() = default; + + // symbol: ??0ScriptMinecraftDebugUtilitiesModuleFactory@@QEAA@XZ + MCAPI ScriptMinecraftDebugUtilitiesModuleFactory(); + + // symbol: + // ?getModuleUUIDAsString@ScriptMinecraftDebugUtilitiesModuleFactory@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI static std::string getModuleUUIDAsString(); + + // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: + // ?_generateBindings@ScriptMinecraftDebugUtilitiesModuleFactory@@AEAA?AUModuleBinding@Scripting@@AEAVModuleBindingBuilder@3@_NAEBV?$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@@@Z + MCAPI struct Scripting::ModuleBinding + _generateBindings(class Scripting::ModuleBindingBuilder&, bool, std::vector const&); + + // NOLINTEND + +private: + // NOLINTBEGIN + // symbol: ?ModuleName@ScriptMinecraftDebugUtilitiesModuleFactory@@0PEBDEB + MCAPI static char const* ModuleName; + + // symbol: ?ModuleUUID@ScriptMinecraftDebugUtilitiesModuleFactory@@0VUUID@mce@@B + MCAPI static class mce::UUID const ModuleUUID; + + // NOLINTEND + + // member accessor +public: + // NOLINTBEGIN + static auto& $ModuleName() { return ModuleName; } + + static auto& $ModuleUUID() { return ModuleUUID; } + + // NOLINTEND +}; diff --git a/src/mc/external/scripting/ScriptPlayerGameplayHandler.h b/src/mc/external/scripting/ScriptPlayerGameplayHandler.h index f18012c82f..a557bc597e 100644 --- a/src/mc/external/scripting/ScriptPlayerGameplayHandler.h +++ b/src/mc/external/scripting/ScriptPlayerGameplayHandler.h @@ -6,6 +6,7 @@ #include "mc/common/wrapper/CoordinatorResult.h" #include "mc/common/wrapper/GameplayHandlerResult.h" #include "mc/common/wrapper/HandlerResult.h" +#include "mc/events/MutablePlayerGameplayEvent.h" #include "mc/events/PlayerGameplayEvent.h" #include "mc/external/scripting/TypedObjectHandle.h" @@ -28,16 +29,18 @@ class ScriptPlayerGameplayHandler { virtual ~ScriptPlayerGameplayHandler() = default; // vIndex: 1, symbol: - // ?handleEvent@?$Impl@U?$type_list@$$CBU?$PlayerGameplayEvent@X@@$$CBU?$PlayerGameplayEvent@W4CoordinatorResult@@@@@entt@@@?$EventHandlerDispatcher@VPlayerGameplayHandler@@@Details@@MEAA?AW4HandlerResult@@AEBU?$PlayerGameplayEvent@X@@@Z - virtual ::HandlerResult handleEvent(struct PlayerGameplayEvent const& event); + // ?handleEvent@?$Impl@U?$type_list@$$CBU?$PlayerGameplayEvent@X@@$$CBU?$PlayerGameplayEvent@W4CoordinatorResult@@@@U?$MutablePlayerGameplayEvent@W4CoordinatorResult@@@@@entt@@@?$EventHandlerDispatcher@VPlayerGameplayHandler@@@Details@@MEAA?AW4HandlerResult@@AEBU?$PlayerGameplayEvent@X@@@Z + virtual ::HandlerResult handleEvent(struct PlayerGameplayEvent const&); // vIndex: 2, symbol: // ?handleEvent@ScriptPlayerGameplayHandler@@UEAA?AU?$GameplayHandlerResult@W4CoordinatorResult@@@@AEBU?$PlayerGameplayEvent@W4CoordinatorResult@@@@@Z virtual struct GameplayHandlerResult<::CoordinatorResult> handleEvent(struct PlayerGameplayEvent<::CoordinatorResult> const&); - // vIndex: 3, symbol: __unk_vfn_3 - virtual void __unk_vfn_3(); + // vIndex: 3, symbol: + // ?handleEvent@ScriptPlayerGameplayHandler@@UEAA?AU?$GameplayHandlerResult@W4CoordinatorResult@@@@AEAU?$MutablePlayerGameplayEvent@W4CoordinatorResult@@@@@Z + virtual struct GameplayHandlerResult<::CoordinatorResult> + handleEvent(struct MutablePlayerGameplayEvent<::CoordinatorResult>&); // vIndex: 4, symbol: __unk_vfn_4 virtual void __unk_vfn_4(); @@ -84,7 +87,19 @@ class ScriptPlayerGameplayHandler { // vIndex: 18, symbol: __unk_vfn_18 virtual void __unk_vfn_18(); - // vIndex: 19, symbol: + // vIndex: 19, symbol: __unk_vfn_19 + virtual void __unk_vfn_19(); + + // vIndex: 20, symbol: __unk_vfn_20 + virtual void __unk_vfn_20(); + + // vIndex: 21, symbol: __unk_vfn_21 + virtual void __unk_vfn_21(); + + // vIndex: 22, symbol: __unk_vfn_22 + virtual void __unk_vfn_22(); + + // vIndex: 23, symbol: // ?handleEvent@ScriptPlayerGameplayHandler@@UEAA?AW4HandlerResult@@AEBUPlayerDisconnectEvent@@@Z virtual ::HandlerResult handleEvent(struct PlayerDisconnectEvent const&); @@ -97,6 +112,12 @@ class ScriptPlayerGameplayHandler { MCAPI bool _handleCoordinatorPlayerGameplayEvent(struct PlayerGameplayEvent<::CoordinatorResult> const&, class Scripting::WeakLifetimeScope const&, struct Scripting::TypedObjectHandle); + // symbol: + // ?_handleMutablePlayerGameplayEvent@ScriptPlayerGameplayHandler@@AEBA_NAEAU?$MutablePlayerGameplayEvent@W4CoordinatorResult@@@@AEBVWeakLifetimeScope@Scripting@@U?$TypedObjectHandle@VIScriptWorldBeforeEvents@ScriptModuleMinecraft@@@4@@Z + MCAPI bool + _handleMutablePlayerGameplayEvent(struct MutablePlayerGameplayEvent<::CoordinatorResult>&, class Scripting::WeakLifetimeScope const&, struct Scripting::TypedObjectHandle) + const; + // symbol: // ?_handlePlayerDisconnectEvent@ScriptPlayerGameplayHandler@@AEBA_NAEBUPlayerDisconnectEvent@@AEBVWeakLifetimeScope@Scripting@@U?$TypedObjectHandle@VIScriptWorldBeforeEvents@ScriptModuleMinecraft@@@4@@Z MCAPI bool diff --git a/src/mc/external/scripting/ScriptWatchdog.h b/src/mc/external/scripting/ScriptWatchdog.h index aa765e9e3b..50860baa1f 100644 --- a/src/mc/external/scripting/ScriptWatchdog.h +++ b/src/mc/external/scripting/ScriptWatchdog.h @@ -22,6 +22,9 @@ class ScriptWatchdog { MCAPI ScriptWatchdog(class Scripting::IWatchdog&, class ServerLevel&, class ScriptPluginManager*, class Scripting::WeakLifetimeScope, class ServerInstance*); + // symbol: ?disableWatchdog@ScriptWatchdog@@QEAAX_N@Z + MCAPI void disableWatchdog(bool); + // symbol: ?sendTelemetry@ScriptWatchdog@@QEAAXXZ MCAPI void sendTelemetry(); diff --git a/src/mc/external/scripting/ScriptWatchdogTelemetry.h b/src/mc/external/scripting/ScriptWatchdogTelemetry.h index cec15ab06a..981688abce 100644 --- a/src/mc/external/scripting/ScriptWatchdogTelemetry.h +++ b/src/mc/external/scripting/ScriptWatchdogTelemetry.h @@ -8,4 +8,11 @@ struct ScriptWatchdogTelemetry { ScriptWatchdogTelemetry& operator=(ScriptWatchdogTelemetry const&); ScriptWatchdogTelemetry(ScriptWatchdogTelemetry const&); ScriptWatchdogTelemetry(); + +public: + // NOLINTBEGIN + // symbol: ??1ScriptWatchdogTelemetry@@QEAA@XZ + MCAPI ~ScriptWatchdogTelemetry(); + + // NOLINTEND }; diff --git a/src/mc/external/scripting/Scripting.h b/src/mc/external/scripting/Scripting.h index 7e4555033e..718364ff0e 100644 --- a/src/mc/external/scripting/Scripting.h +++ b/src/mc/external/scripting/Scripting.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/external/scripting/EnumBinding.h" #include "mc/external/scripting/FutureStatus.h" #include "mc/external/scripting/LogLevel.h" #include "mc/external/scripting/ObjectHandleValue.h" diff --git a/src/mc/external/scripting/VersionConflict.h b/src/mc/external/scripting/VersionConflict.h index 76252eb5d5..78b0217581 100644 --- a/src/mc/external/scripting/VersionConflict.h +++ b/src/mc/external/scripting/VersionConflict.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace Scripting { struct ModuleDescriptor; } +// clang-format on + namespace Scripting { struct VersionConflict { @@ -16,6 +21,10 @@ struct VersionConflict { // symbol: ??0VersionConflict@Scripting@@QEAA@$$QEAU01@@Z MCAPI VersionConflict(struct Scripting::VersionConflict&&); + // symbol: ??0VersionConflict@Scripting@@QEAA@AEBUModuleDescriptor@1@0000@Z + MCAPI + VersionConflict(struct Scripting::ModuleDescriptor const&, struct Scripting::ModuleDescriptor const&, struct Scripting::ModuleDescriptor const&, struct Scripting::ModuleDescriptor const&, struct Scripting::ModuleDescriptor const&); + // symbol: ??1VersionConflict@Scripting@@QEAA@XZ MCAPI ~VersionConflict(); diff --git a/src/mc/external/scripting/VersionRequestedBy.h b/src/mc/external/scripting/VersionRequestedBy.h index d337d23072..748054d391 100644 --- a/src/mc/external/scripting/VersionRequestedBy.h +++ b/src/mc/external/scripting/VersionRequestedBy.h @@ -19,8 +19,16 @@ struct VersionRequestedBy { public: // NOLINTBEGIN - // symbol: ??0VersionRequestedBy@Scripting@@QEAA@UVersion@1@UModuleDescriptor@1@_N22@Z - MCAPI VersionRequestedBy(struct Scripting::Version, struct Scripting::ModuleDescriptor, bool, bool, bool); + // symbol: ??0VersionRequestedBy@Scripting@@QEAA@UVersion@1@0UModuleDescriptor@1@_N222@Z + MCAPI VersionRequestedBy( + struct Scripting::Version, + struct Scripting::Version, + struct Scripting::ModuleDescriptor, + bool, + bool, + bool, + bool + ); // NOLINTEND }; diff --git a/src/mc/external/scripting/Watchdog.h b/src/mc/external/scripting/Watchdog.h index 51f8938376..3228b4d509 100644 --- a/src/mc/external/scripting/Watchdog.h +++ b/src/mc/external/scripting/Watchdog.h @@ -49,6 +49,9 @@ class Watchdog : public ::Scripting::IWatchdog { // vIndex: 6, symbol: ?pausePerformanceWatchdog@Watchdog@QuickJS@Scripting@@UEAAX_N@Z virtual void pausePerformanceWatchdog(bool pause); + // vIndex: 7, symbol: ?resetWatchdogTimes@Watchdog@QuickJS@Scripting@@UEAAXXZ + virtual void resetWatchdogTimes(); + // symbol: ??0Watchdog@QuickJS@Scripting@@QEAA@PEAUJSRuntime@@UWatchdogSettings@2@@Z MCAPI Watchdog(struct JSRuntime*, struct Scripting::WatchdogSettings settings); diff --git a/src/mc/external/scripting/gametest/ScriptGameTestHelper.h b/src/mc/external/scripting/gametest/ScriptGameTestHelper.h index 1feebccf2e..10be617ac4 100644 --- a/src/mc/external/scripting/gametest/ScriptGameTestHelper.h +++ b/src/mc/external/scripting/gametest/ScriptGameTestHelper.h @@ -413,8 +413,8 @@ class ScriptGameTestHelper { // ?_getBlockFromVariant@ScriptGameTestHelper@ScriptModuleGameTest@@AEAA?AV?$optional@PEBVBlockLegacy@@@std@@AEBV?$variant@V?$StrongTypedObjectHandle@VScriptBlockType@ScriptModuleMinecraft@@@Scripting@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@4@@Z MCAPI std::optional _getBlockFromVariant(std::variant< - class Scripting::StrongTypedObjectHandle, - std::string> const&); + class Scripting::StrongTypedObjectHandle, + std::string> const&); // symbol: // ?_callClosure@ScriptGameTestHelper@ScriptModuleGameTest@@CA?AV?$optional@UGameTestError@gametest@@@std@@AEBV?$Closure@$$A6AXXZ$$V@Scripting@@@Z diff --git a/src/mc/gametest/MinecraftGameTestHelper.h b/src/mc/gametest/MinecraftGameTestHelper.h index 8017ee59ec..d1962855b1 100644 --- a/src/mc/gametest/MinecraftGameTestHelper.h +++ b/src/mc/gametest/MinecraftGameTestHelper.h @@ -4,7 +4,6 @@ // auto generated inclusion list #include "mc/deps/core/common/bedrock/BaseGameTestHelper.h" -#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" #include "mc/enums/ArmorSlot.h" #include "mc/enums/GameType.h" #include "mc/scripting/modules/minecraft/ScriptFacing.h" @@ -354,10 +353,6 @@ class MinecraftGameTestHelper : public ::gametest::BaseGameTestHelper { // symbol: ?_getItemEntityCount@MinecraftGameTestHelper@@AEAAHAEBVItem@@AEBVAABB@@@Z MCAPI int _getItemEntityCount(class Item const& item, class AABB const&); - // symbol: - // ?_getServerNetworkHandler@MinecraftGameTestHelper@@AEBA?AV?$not_null@V?$NonOwnerPointer@VServerNetworkHandler@@@Bedrock@@@gsl@@XZ - MCAPI Bedrock::NotNullNonOwnerPtr _getServerNetworkHandler() const; - // symbol: // ?_getStructureBlockMissingError@MinecraftGameTestHelper@@AEBA?AV?$optional@UGameTestError@gametest@@@std@@XZ MCAPI std::optional _getStructureBlockMissingError() const; diff --git a/src/mc/input/IReplayableActorInput.h b/src/mc/input/IReplayableActorInput.h index ecea874c79..1c34228d2a 100644 --- a/src/mc/input/IReplayableActorInput.h +++ b/src/mc/input/IReplayableActorInput.h @@ -2,26 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" -// auto generated inclusion list -#include "mc/common/wrapper/AdvanceFrameResult.h" - struct IReplayableActorInput { public: // prevent constructor by default IReplayableActorInput& operator=(IReplayableActorInput const&); IReplayableActorInput(IReplayableActorInput const&); IReplayableActorInput(); - -public: - // NOLINTBEGIN - // symbol: ?advanceLiveFrame@IReplayableActorInput@@UEBAXAEAVActor@@@Z - MCVAPI void advanceLiveFrame(class Actor&) const; - - // symbol: ?getAdvanceFrameResult@IReplayableActorInput@@UEBA?AW4AdvanceFrameResult@@AEBVEntityContext@@@Z - MCVAPI ::AdvanceFrameResult getAdvanceFrameResult(class EntityContext const&) const; - - // symbol: ?isExplicitCorrection@IReplayableActorInput@@UEBA_NXZ - MCVAPI bool isExplicitCorrection() const; - - // NOLINTEND }; diff --git a/src/mc/math/Vec2.h b/src/mc/math/Vec2.h index 3540552150..2f9481948e 100644 --- a/src/mc/math/Vec2.h +++ b/src/mc/math/Vec2.h @@ -11,6 +11,12 @@ class Vec2 : public ll::math::floatN2 { // symbol: ?normalized@Vec2@@QEBA?AV1@XZ MCAPI class Vec2 normalized() const; + // symbol: ?toJsonString@Vec2@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string toJsonString() const; + + // symbol: ?toString@Vec2@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string toString() const; + // symbol: ?rotate@Vec2@@SA?AV1@AEBV1@M@Z MCAPI static class Vec2 rotate(class Vec2 const& v, float); diff --git a/src/mc/math/Vec3.h b/src/mc/math/Vec3.h index 1306ed0b9b..e69338f50e 100644 --- a/src/mc/math/Vec3.h +++ b/src/mc/math/Vec3.h @@ -24,6 +24,30 @@ class Vec3 : public ll::math::floatN3 { // symbol: ?normalized@Vec3@@QEBA?AV1@XZ MCAPI class Vec3 normalized() const; + // symbol: ??XVec3@@QEAAAEAV0@M@Z + MCAPI class Vec3& operator*=(float); + + // symbol: ??HVec3@@QEBA?AV0@AEBV0@@Z + MCAPI class Vec3 operator+(class Vec3 const&) const; + + // symbol: ??YVec3@@QEAAAEAV0@AEBV0@@Z + MCAPI class Vec3& operator+=(class Vec3 const&); + + // symbol: ??GVec3@@QEBA?AV0@XZ + MCAPI class Vec3 operator-() const; + + // symbol: ??GVec3@@QEBA?AV0@AEBV0@@Z + MCAPI class Vec3 operator-(class Vec3 const&) const; + + // symbol: ??8Vec3@@QEBA_NAEBV0@@Z + MCAPI bool operator==(class Vec3 const& rhs) const; + + // symbol: ?toJsonString@Vec3@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string toJsonString() const; + + // symbol: ?toString@Vec3@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string toString() const; + // symbol: ?xz@Vec3@@QEBA?AV1@XZ MCAPI class Vec3 xz() const; diff --git a/src/mc/nbt/ByteArrayTag.h b/src/mc/nbt/ByteArrayTag.h index 6a3c08c808..05ace717a5 100644 --- a/src/mc/nbt/ByteArrayTag.h +++ b/src/mc/nbt/ByteArrayTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class ByteArrayTag : public ::Tag { @@ -31,8 +32,8 @@ class ByteArrayTag : public ::Tag { // vIndex: 2, symbol: ?write@ByteArrayTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@ByteArrayTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@ByteArrayTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@ByteArrayTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/ByteTag.h b/src/mc/nbt/ByteTag.h index c7e4feb3a6..c376126df7 100644 --- a/src/mc/nbt/ByteTag.h +++ b/src/mc/nbt/ByteTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class ByteTag : public ::Tag { @@ -37,8 +38,8 @@ class ByteTag : public ::Tag { // vIndex: 2, symbol: ?write@ByteTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@ByteTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@ByteTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@ByteTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/CompoundTag.h b/src/mc/nbt/CompoundTag.h index cea17f9db5..dbd4385925 100644 --- a/src/mc/nbt/CompoundTag.h +++ b/src/mc/nbt/CompoundTag.h @@ -4,6 +4,9 @@ #define COMPOUND_TAG_HEADER #include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class CompoundTagVariant; @@ -48,8 +51,8 @@ class CompoundTag : public ::Tag { // vIndex: 2, symbol: ?write@CompoundTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@CompoundTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@CompoundTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@CompoundTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/DoubleTag.h b/src/mc/nbt/DoubleTag.h index a888a8c4ef..f9e494657c 100644 --- a/src/mc/nbt/DoubleTag.h +++ b/src/mc/nbt/DoubleTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class DoubleTag : public ::Tag { @@ -26,8 +27,8 @@ class DoubleTag : public ::Tag { // vIndex: 2, symbol: ?write@DoubleTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@DoubleTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@DoubleTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@DoubleTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/EndTag.h b/src/mc/nbt/EndTag.h index 84e88a5c06..00c440a31e 100644 --- a/src/mc/nbt/EndTag.h +++ b/src/mc/nbt/EndTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class EndTag : public ::Tag { @@ -16,8 +17,8 @@ class EndTag : public ::Tag { // vIndex: 2, symbol: ?write@EndTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@EndTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@EndTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@EndTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/FloatTag.h b/src/mc/nbt/FloatTag.h index 8fe58b8cbd..d7baf3560d 100644 --- a/src/mc/nbt/FloatTag.h +++ b/src/mc/nbt/FloatTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class FloatTag : public ::Tag { @@ -26,8 +27,8 @@ class FloatTag : public ::Tag { // vIndex: 2, symbol: ?write@FloatTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@FloatTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@FloatTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@FloatTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/Int64Tag.h b/src/mc/nbt/Int64Tag.h index 63bcfab751..04cdbd166a 100644 --- a/src/mc/nbt/Int64Tag.h +++ b/src/mc/nbt/Int64Tag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class Int64Tag : public ::Tag { @@ -33,8 +34,8 @@ class Int64Tag : public ::Tag { // vIndex: 2, symbol: ?write@Int64Tag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@Int64Tag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@Int64Tag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@Int64Tag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/IntArrayTag.h b/src/mc/nbt/IntArrayTag.h index 1311310563..c3abdc367d 100644 --- a/src/mc/nbt/IntArrayTag.h +++ b/src/mc/nbt/IntArrayTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class IntArrayTag : public ::Tag { @@ -31,8 +32,8 @@ class IntArrayTag : public ::Tag { // vIndex: 2, symbol: ?write@IntArrayTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@IntArrayTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@IntArrayTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@IntArrayTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/IntTag.h b/src/mc/nbt/IntTag.h index f9da50c604..cf9a635cf9 100644 --- a/src/mc/nbt/IntTag.h +++ b/src/mc/nbt/IntTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class IntTag : public ::Tag { @@ -33,8 +34,8 @@ class IntTag : public ::Tag { // vIndex: 2, symbol: ?write@IntTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@IntTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@IntTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@IntTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/ListTag.h b/src/mc/nbt/ListTag.h index 892e2a4f87..07778d4e2a 100644 --- a/src/mc/nbt/ListTag.h +++ b/src/mc/nbt/ListTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class CompoundTagVariant; @@ -61,8 +62,8 @@ class ListTag : public ::Tag { // vIndex: 2, symbol: ?write@ListTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@ListTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@ListTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@ListTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; @@ -116,6 +117,9 @@ class ListTag : public ::Tag { // symbol: ?getInt@ListTag@@QEBAHH@Z MCAPI int getInt(int index) const; + // symbol: ?getInt64@ListTag@@QEBA_JH@Z + MCAPI int64 getInt64(int index) const; + // symbol: ?getString@ListTag@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI std::string const& getString(int) const; diff --git a/src/mc/nbt/NbtIo.h b/src/mc/nbt/NbtIo.h index ff35ef46e3..388f4e6ee0 100644 --- a/src/mc/nbt/NbtIo.h +++ b/src/mc/nbt/NbtIo.h @@ -2,15 +2,33 @@ #include "mc/_HeaderOutputPredefine.h" -class NbtIo { -public: - // NOLINTBEGIN - // symbol: - // ?read@NbtIo@@SA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEAVIDataInput@@@Z - MCAPI static std::unique_ptr read(class IDataInput& dis); - - // symbol: ?write@NbtIo@@SAXPEBVCompoundTag@@AEAVIDataOutput@@@Z - MCAPI static void write(class CompoundTag const*, class IDataOutput&); - - // NOLINTEND -}; +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" + +namespace NbtIo { +// NOLINTBEGIN +// symbol: +// ?read@NbtIo@@YA?AV?$Result@V?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@Verror_code@2@@Bedrock@@AEAVIDataInput@@@Z +MCAPI class Bedrock::Result> read(class IDataInput& dis); + +// symbol: +// ?readNamedCompoundTag@NbtIo@@YA?AV?$Result@V?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@Verror_code@2@@Bedrock@@AEAVIDataInput@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z +MCAPI class Bedrock::Result> readNamedCompoundTag(class IDataInput&, std::string&); + +// symbol: +// ?readNamedTag@NbtIo@@YA?AV?$Result@V?$unique_ptr@VTag@@U?$default_delete@VTag@@@std@@@std@@Verror_code@2@@Bedrock@@AEAVIDataInput@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z +MCAPI class Bedrock::Result> readNamedTag(class IDataInput&, std::string&); + +// symbol: +// ?readOrGetEmpty@NbtIo@@YA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEAVIDataInput@@@Z +MCAPI std::unique_ptr readOrGetEmpty(class IDataInput&); + +// symbol: ?write@NbtIo@@YAXPEBVCompoundTag@@AEAVIDataOutput@@@Z +MCAPI void write(class CompoundTag const*, class IDataOutput&); + +// symbol: +// ?writeNamedTag@NbtIo@@YAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVTag@@AEAVIDataOutput@@@Z +MCAPI void writeNamedTag(std::string const&, class Tag const&, class IDataOutput&); +// NOLINTEND + +}; // namespace NbtIo diff --git a/src/mc/nbt/ShortTag.h b/src/mc/nbt/ShortTag.h index 05e45ccbac..c3a9ef2500 100644 --- a/src/mc/nbt/ShortTag.h +++ b/src/mc/nbt/ShortTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class ShortTag : public ::Tag { @@ -33,8 +34,8 @@ class ShortTag : public ::Tag { // vIndex: 2, symbol: ?write@ShortTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@ShortTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@ShortTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@ShortTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/StringTag.h b/src/mc/nbt/StringTag.h index 7efeb40a56..1ada0359c2 100644 --- a/src/mc/nbt/StringTag.h +++ b/src/mc/nbt/StringTag.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/nbt/Tag.h" class StringTag : public ::Tag { @@ -32,8 +33,8 @@ class StringTag : public ::Tag { // vIndex: 2, symbol: ?write@StringTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const; - // vIndex: 3, symbol: ?load@StringTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis); + // vIndex: 3, symbol: ?load@StringTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis); // vIndex: 4, symbol: ?toString@StringTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const; diff --git a/src/mc/nbt/Tag.h b/src/mc/nbt/Tag.h index eb8521493f..0a59c53cba 100644 --- a/src/mc/nbt/Tag.h +++ b/src/mc/nbt/Tag.h @@ -90,8 +90,8 @@ class Tag { // vIndex: 2, symbol: ?write@ByteArrayTag@@UEBAXAEAVIDataOutput@@@Z virtual void write(class IDataOutput& dos) const = 0; - // vIndex: 3, symbol: ?load@ByteArrayTag@@UEAAXAEAVIDataInput@@@Z - virtual void load(class IDataInput& dis) = 0; + // vIndex: 3, symbol: ?load@ByteArrayTag@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVIDataInput@@@Z + virtual class Bedrock::Result load(class IDataInput& dis) = 0; // vIndex: 4, symbol: ?toString@ByteArrayTag@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string toString() const = 0; @@ -118,16 +118,9 @@ class Tag { // symbol: ?getTagName@Tag@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Type@1@@Z MCAPI static std::string getTagName(::Tag::Type); - // symbol: ?newTag@Tag@@SA?AV?$unique_ptr@VTag@@U?$default_delete@VTag@@@std@@@std@@W4Type@1@@Z - MCAPI static std::unique_ptr newTag(::Tag::Type type); - - // symbol: - // ?readNamedTag@Tag@@SA?AV?$unique_ptr@VTag@@U?$default_delete@VTag@@@std@@@std@@AEAVIDataInput@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@@Z - MCAPI static std::unique_ptr readNamedTag(class IDataInput& dis, std::string& name); - // symbol: - // ?writeNamedTag@Tag@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV1@AEAVIDataOutput@@@Z - MCAPI static void writeNamedTag(std::string const& name, class Tag const& tag, class IDataOutput& dos); + // ?newTag@Tag@@SA?AV?$Result@V?$unique_ptr@VTag@@U?$default_delete@VTag@@@std@@@std@@Verror_code@2@@Bedrock@@W4Type@1@@Z + MCAPI static class Bedrock::Result> newTag(::Tag::Type type); // symbol: ?NullString@Tag@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B MCAPI static std::string const NullString; diff --git a/src/mc/nbt/cereal/NBTSchemaReader.h b/src/mc/nbt/cereal/NBTSchemaReader.h index be86e84cce..9eb1e9bd54 100644 --- a/src/mc/nbt/cereal/NBTSchemaReader.h +++ b/src/mc/nbt/cereal/NBTSchemaReader.h @@ -9,8 +9,8 @@ // auto generated forward declare list // clang-format off +namespace cereal { class PropertyReader; } namespace cereal { struct SchemaReader; } -namespace cereal { struct SerializerTraits; } // clang-format on class NBTSchemaReader : public ::cereal::SchemaReader { @@ -35,72 +35,72 @@ class NBTSchemaReader : public ::cereal::SchemaReader { virtual ::cereal::SchemaReaderState isArray() const; // vIndex: 4, symbol: - // ?asBool@NBTSchemaReader@@UEAA?AV?$Result@_NVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asBool(struct cereal::SerializerTraits const&); + // ?asBool@NBTSchemaReader@@UEAA?AV?$Result@_NVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asBool(class cereal::PropertyReader const&); // vIndex: 5, symbol: - // ?asInt8@NBTSchemaReader@@UEAA?AV?$Result@CVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asInt8(struct cereal::SerializerTraits const&); + // ?asInt8@NBTSchemaReader@@UEAA?AV?$Result@CVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asInt8(class cereal::PropertyReader const&); // vIndex: 6, symbol: - // ?asUInt8@NBTSchemaReader@@UEAA?AV?$Result@EVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asUInt8(struct cereal::SerializerTraits const&); + // ?asUInt8@NBTSchemaReader@@UEAA?AV?$Result@EVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asUInt8(class cereal::PropertyReader const&); // vIndex: 7, symbol: - // ?asInt16@NBTSchemaReader@@UEAA?AV?$Result@FVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asInt16(struct cereal::SerializerTraits const&); + // ?asInt16@NBTSchemaReader@@UEAA?AV?$Result@FVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asInt16(class cereal::PropertyReader const&); // vIndex: 8, symbol: - // ?asUInt16@NBTSchemaReader@@UEAA?AV?$Result@GVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asUInt16(struct cereal::SerializerTraits const&); + // ?asUInt16@NBTSchemaReader@@UEAA?AV?$Result@GVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asUInt16(class cereal::PropertyReader const&); // vIndex: 9, symbol: - // ?asInt32@NBTSchemaReader@@UEAA?AV?$Result@HVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asInt32(struct cereal::SerializerTraits const&); + // ?asInt32@NBTSchemaReader@@UEAA?AV?$Result@HVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asInt32(class cereal::PropertyReader const&); // vIndex: 10, symbol: - // ?asUInt32@NBTSchemaReader@@UEAA?AV?$Result@IVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asUInt32(struct cereal::SerializerTraits const&); + // ?asUInt32@NBTSchemaReader@@UEAA?AV?$Result@IVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asUInt32(class cereal::PropertyReader const&); // vIndex: 11, symbol: - // ?asInt64@NBTSchemaReader@@UEAA?AV?$Result@_JVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asInt64(struct cereal::SerializerTraits const&); + // ?asInt64@NBTSchemaReader@@UEAA?AV?$Result@_JVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asInt64(class cereal::PropertyReader const&); // vIndex: 12, symbol: - // ?asUInt64@NBTSchemaReader@@UEAA?AV?$Result@_KVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asUInt64(struct cereal::SerializerTraits const&); + // ?asUInt64@NBTSchemaReader@@UEAA?AV?$Result@_KVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asUInt64(class cereal::PropertyReader const&); // vIndex: 13, symbol: - // ?asFloat@NBTSchemaReader@@UEAA?AV?$Result@MVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asFloat(struct cereal::SerializerTraits const&); + // ?asFloat@NBTSchemaReader@@UEAA?AV?$Result@MVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asFloat(class cereal::PropertyReader const&); // vIndex: 14, symbol: - // ?asDouble@NBTSchemaReader@@UEAA?AV?$Result@NVerror_code@std@@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asDouble(struct cereal::SerializerTraits const&); + // ?asDouble@NBTSchemaReader@@UEAA?AV?$Result@NVerror_code@std@@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asDouble(class cereal::PropertyReader const&); // vIndex: 15, symbol: - // ?asString@NBTSchemaReader@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@AEBUSerializerTraits@cereal@@@Z - virtual class Bedrock::Result asString(struct cereal::SerializerTraits const&); + // ?asString@NBTSchemaReader@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@AEBVPropertyReader@cereal@@@Z + virtual class Bedrock::Result asString(class cereal::PropertyReader const&); - // vIndex: 16, symbol: ?members@NBTSchemaReader@@UEAA_KAEBUSerializerTraits@cereal@@@Z - virtual uint64 members(struct cereal::SerializerTraits const&); + // vIndex: 16, symbol: ?members@NBTSchemaReader@@UEAA_KXZ + virtual uint64 members(); - // vIndex: 17, symbol: ?length@NBTSchemaReader@@UEAA_KAEBUSerializerTraits@cereal@@@Z - virtual uint64 length(struct cereal::SerializerTraits const&); + // vIndex: 17, symbol: ?length@NBTSchemaReader@@UEAA_KXZ + virtual uint64 length(); // vIndex: 18, symbol: - // ?pushMember@NBTSchemaReader@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUSerializerTraits@cereal@@@Z - virtual bool pushMember(std::string const&, struct cereal::SerializerTraits const&); + // ?pushMember@NBTSchemaReader@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPropertyReader@cereal@@@Z + virtual bool pushMember(std::string const&, class cereal::PropertyReader const&); // vIndex: 19, symbol: - // ?pushNextMember@NBTSchemaReader@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUSerializerTraits@cereal@@@Z - virtual std::string pushNextMember(struct cereal::SerializerTraits const&); + // ?pushNextMember@NBTSchemaReader@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPropertyReader@cereal@@@Z + virtual std::string pushNextMember(class cereal::PropertyReader const&); - // vIndex: 20, symbol: ?pushElement@NBTSchemaReader@@UEAAX_KAEBUSerializerTraits@cereal@@@Z - virtual void pushElement(uint64, struct cereal::SerializerTraits const&); + // vIndex: 20, symbol: ?pushElement@NBTSchemaReader@@UEAAX_KAEBVPropertyReader@cereal@@@Z + virtual void pushElement(uint64, class cereal::PropertyReader const&); - // vIndex: 21, symbol: ?pop@NBTSchemaReader@@UEAAXAEBUSerializerTraits@cereal@@@Z - virtual void pop(struct cereal::SerializerTraits const&); + // vIndex: 21, symbol: ?pop@NBTSchemaReader@@UEAAXXZ + virtual void pop(); // vIndex: 22, symbol: ?isSequenceReader@SchemaReader@cereal@@UEBA_NXZ virtual bool isSequenceReader() const; diff --git a/src/mc/nbt/cereal/NBTSchemaWriter.h b/src/mc/nbt/cereal/NBTSchemaWriter.h index 639030ea5c..fc1d264e54 100644 --- a/src/mc/nbt/cereal/NBTSchemaWriter.h +++ b/src/mc/nbt/cereal/NBTSchemaWriter.h @@ -7,8 +7,8 @@ // auto generated forward declare list // clang-format off +namespace cereal { class PropertyReader; } namespace cereal { struct SchemaWriter; } -namespace cereal { struct SerializerTraits; } // clang-format on class NBTSchemaWriter : public ::cereal::SchemaWriter { @@ -44,58 +44,58 @@ class NBTSchemaWriter : public ::cereal::SchemaWriter { // vIndex: 0, symbol: ??1NBTSchemaWriter@@UEAA@XZ virtual ~NBTSchemaWriter(); - // vIndex: 1, symbol: ?write@NBTSchemaWriter@@UEAA_N_NAEBUSerializerTraits@cereal@@@Z - virtual bool write(bool, struct cereal::SerializerTraits const&); + // vIndex: 1, symbol: ?write@NBTSchemaWriter@@UEAA_N_NAEBVPropertyReader@cereal@@@Z + virtual bool write(bool, class cereal::PropertyReader const&); - // vIndex: 2, symbol: ?write@NBTSchemaWriter@@UEAA_NCAEBUSerializerTraits@cereal@@@Z - virtual bool write(schar, struct cereal::SerializerTraits const&); + // vIndex: 2, symbol: ?write@NBTSchemaWriter@@UEAA_NCAEBVPropertyReader@cereal@@@Z + virtual bool write(schar, class cereal::PropertyReader const&); - // vIndex: 3, symbol: ?write@NBTSchemaWriter@@UEAA_NEAEBUSerializerTraits@cereal@@@Z - virtual bool write(uchar, struct cereal::SerializerTraits const&); + // vIndex: 3, symbol: ?write@NBTSchemaWriter@@UEAA_NEAEBVPropertyReader@cereal@@@Z + virtual bool write(uchar, class cereal::PropertyReader const&); - // vIndex: 4, symbol: ?write@NBTSchemaWriter@@UEAA_NFAEBUSerializerTraits@cereal@@@Z - virtual bool write(short, struct cereal::SerializerTraits const&); + // vIndex: 4, symbol: ?write@NBTSchemaWriter@@UEAA_NFAEBVPropertyReader@cereal@@@Z + virtual bool write(short, class cereal::PropertyReader const&); - // vIndex: 5, symbol: ?write@NBTSchemaWriter@@UEAA_NGAEBUSerializerTraits@cereal@@@Z - virtual bool write(ushort, struct cereal::SerializerTraits const&); + // vIndex: 5, symbol: ?write@NBTSchemaWriter@@UEAA_NGAEBVPropertyReader@cereal@@@Z + virtual bool write(ushort, class cereal::PropertyReader const&); - // vIndex: 6, symbol: ?write@NBTSchemaWriter@@UEAA_NHAEBUSerializerTraits@cereal@@@Z - virtual bool write(int, struct cereal::SerializerTraits const&); + // vIndex: 6, symbol: ?write@NBTSchemaWriter@@UEAA_NHAEBVPropertyReader@cereal@@@Z + virtual bool write(int, class cereal::PropertyReader const&); - // vIndex: 7, symbol: ?write@NBTSchemaWriter@@UEAA_NIAEBUSerializerTraits@cereal@@@Z - virtual bool write(uint, struct cereal::SerializerTraits const&); + // vIndex: 7, symbol: ?write@NBTSchemaWriter@@UEAA_NIAEBVPropertyReader@cereal@@@Z + virtual bool write(uint, class cereal::PropertyReader const&); - // vIndex: 8, symbol: ?write@NBTSchemaWriter@@UEAA_N_JAEBUSerializerTraits@cereal@@@Z - virtual bool write(int64, struct cereal::SerializerTraits const&); + // vIndex: 8, symbol: ?write@NBTSchemaWriter@@UEAA_N_JAEBVPropertyReader@cereal@@@Z + virtual bool write(int64, class cereal::PropertyReader const&); - // vIndex: 9, symbol: ?write@NBTSchemaWriter@@UEAA_N_KAEBUSerializerTraits@cereal@@@Z - virtual bool write(uint64, struct cereal::SerializerTraits const&); + // vIndex: 9, symbol: ?write@NBTSchemaWriter@@UEAA_N_KAEBVPropertyReader@cereal@@@Z + virtual bool write(uint64, class cereal::PropertyReader const&); - // vIndex: 10, symbol: ?write@NBTSchemaWriter@@UEAA_NMAEBUSerializerTraits@cereal@@@Z - virtual bool write(float, struct cereal::SerializerTraits const&); + // vIndex: 10, symbol: ?write@NBTSchemaWriter@@UEAA_NMAEBVPropertyReader@cereal@@@Z + virtual bool write(float, class cereal::PropertyReader const&); - // vIndex: 11, symbol: ?write@NBTSchemaWriter@@UEAA_NNAEBUSerializerTraits@cereal@@@Z - virtual bool write(double, struct cereal::SerializerTraits const&); + // vIndex: 11, symbol: ?write@NBTSchemaWriter@@UEAA_NNAEBVPropertyReader@cereal@@@Z + virtual bool write(double, class cereal::PropertyReader const&); // vIndex: 12, symbol: - // ?write@NBTSchemaWriter@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUSerializerTraits@cereal@@@Z - virtual bool write(std::string const&, struct cereal::SerializerTraits const&); + // ?write@NBTSchemaWriter@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPropertyReader@cereal@@@Z + virtual bool write(std::string const&, class cereal::PropertyReader const&); // vIndex: 13, symbol: - // ?pushMember@NBTSchemaWriter@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUSerializerTraits@cereal@@@Z - virtual bool pushMember(std::string const&, struct cereal::SerializerTraits const&); + // ?pushMember@NBTSchemaWriter@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPropertyReader@cereal@@@Z + virtual bool pushMember(std::string const&, class cereal::PropertyReader const&); // vIndex: 14, symbol: ?popMember@NBTSchemaWriter@@UEAAXXZ virtual void popMember(); - // vIndex: 15, symbol: ?openObject@NBTSchemaWriter@@UEAA_NAEBUSerializerTraits@cereal@@@Z - virtual bool openObject(struct cereal::SerializerTraits const&); + // vIndex: 15, symbol: ?openObject@NBTSchemaWriter@@UEAA_NAEBVPropertyReader@cereal@@@Z + virtual bool openObject(class cereal::PropertyReader const&); - // vIndex: 16, symbol: ?openArray@NBTSchemaWriter@@UEAA_N_KAEBUSerializerTraits@cereal@@@Z - virtual bool openArray(uint64, struct cereal::SerializerTraits const&); + // vIndex: 16, symbol: ?openArray@NBTSchemaWriter@@UEAA_N_KAEBVPropertyReader@cereal@@@Z + virtual bool openArray(uint64, class cereal::PropertyReader const&); - // vIndex: 17, symbol: ?close@NBTSchemaWriter@@UEAAXAEBUSerializerTraits@cereal@@@Z - virtual void close(struct cereal::SerializerTraits const&); + // vIndex: 17, symbol: ?close@NBTSchemaWriter@@UEAAXXZ + virtual void close(); // vIndex: 18, symbol: ?isSequenceWriter@SchemaWriter@cereal@@UEBA_NXZ virtual bool isSequenceWriter() const; diff --git a/src/mc/network/AutomationClient.h b/src/mc/network/AutomationClient.h index c5ba71d9ca..4f54884e44 100644 --- a/src/mc/network/AutomationClient.h +++ b/src/mc/network/AutomationClient.h @@ -38,21 +38,21 @@ class AutomationClient { // symbol: ?playerListChanged@AutomationClient@Automation@@UEAAXXZ MCVAPI void playerListChanged(); - // symbol: ?send@AutomationClient@Automation@@UEAAXAEBUErrorMessage@CodeBuilder@@@Z - MCVAPI void send(struct CodeBuilder::ErrorMessage const& message); + // symbol: ?send@AutomationClient@Automation@@UEAAXAEBUEventMessage@CodeBuilder@@@Z + MCVAPI void send(struct CodeBuilder::EventMessage const& message); // symbol: ?send@AutomationClient@Automation@@UEAAXAEBUCommandMessage@CodeBuilder@@@Z MCVAPI void send(struct CodeBuilder::CommandMessage const& message); + // symbol: ?send@AutomationClient@Automation@@UEAAXAEBUErrorMessage@CodeBuilder@@@Z + MCVAPI void send(struct CodeBuilder::ErrorMessage const& message); + // symbol: ?send@AutomationClient@Automation@@UEAAXAEBUChatMessage@CodeBuilder@@@Z MCVAPI void send(struct CodeBuilder::ChatMessage const& message); // symbol: ?send@AutomationClient@Automation@@UEAAXAEBUAgentMessage@CodeBuilder@@@Z MCVAPI void send(struct CodeBuilder::AgentMessage const& message); - // symbol: ?send@AutomationClient@Automation@@UEAAXAEBUEventMessage@CodeBuilder@@@Z - MCVAPI void send(struct CodeBuilder::EventMessage const& message); - // symbol: ?tick@AutomationClient@Automation@@UEAAXXZ MCVAPI void tick(); diff --git a/src/mc/network/ConnectionRequest.h b/src/mc/network/ConnectionRequest.h index 88e2365466..b4a7e6021a 100644 --- a/src/mc/network/ConnectionRequest.h +++ b/src/mc/network/ConnectionRequest.h @@ -28,6 +28,9 @@ class ConnectionRequest { // symbol: ??0ConnectionRequest@@QEAA@AEBV0@@Z MCAPI ConnectionRequest(class ConnectionRequest const& other); + // symbol: ?containsValidContents@ConnectionRequest@@QEBA_NXZ + MCAPI bool containsValidContents() const; + // symbol: // ?getAnimatedImageData@ConnectionRequest@@QEBA?AV?$vector@VAnimatedImageData@@V?$allocator@VAnimatedImageData@@@std@@@std@@XZ MCAPI std::vector getAnimatedImageData() const; diff --git a/src/mc/network/NetEventCallback.h b/src/mc/network/NetEventCallback.h index 07a6967353..ea48d0939f 100644 --- a/src/mc/network/NetEventCallback.h +++ b/src/mc/network/NetEventCallback.h @@ -256,456 +256,454 @@ class NetEventCallback : public ::Bedrock::EnableNonOwnerReferences { // vIndex: 69, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerArmorDamagePacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerArmorDamagePacket const&); - // vIndex: 70, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVItemFrameDropItemPacket@@@Z - virtual void handle(class NetworkIdentifier const&, class ItemFrameDropItemPacket const&); - - // vIndex: 71, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVItemStackRequestPacket@@@Z + // vIndex: 70, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVItemStackRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ItemStackRequestPacket const&); - // vIndex: 72, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVItemStackResponsePacket@@@Z + // vIndex: 71, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVItemStackResponsePacket@@@Z virtual void handle(class NetworkIdentifier const&, class ItemStackResponsePacket const&); - // vIndex: 73, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVContainerOpenPacket@@@Z + // vIndex: 72, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVContainerOpenPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ContainerOpenPacket const&); - // vIndex: 74, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVContainerClosePacket@@@Z + // vIndex: 73, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVContainerClosePacket@@@Z virtual void handle(class NetworkIdentifier const&, class ContainerClosePacket const&); - // vIndex: 75, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVContainerSetDataPacket@@@Z + // vIndex: 74, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVContainerSetDataPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ContainerSetDataPacket const&); - // vIndex: 76, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerHotbarPacket@@@Z + // vIndex: 75, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerHotbarPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerHotbarPacket const&); - // vIndex: 77, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVInventoryContentPacket@@@Z + // vIndex: 76, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVInventoryContentPacket@@@Z virtual void handle(class NetworkIdentifier const&, class InventoryContentPacket const&); - // vIndex: 78, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVInventorySlotPacket@@@Z + // vIndex: 77, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVInventorySlotPacket@@@Z virtual void handle(class NetworkIdentifier const&, class InventorySlotPacket const&); - // vIndex: 79, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCraftingDataPacket@@@Z + // vIndex: 78, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCraftingDataPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CraftingDataPacket const&); - // vIndex: 80, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAnimatePacket@@@Z + // vIndex: 79, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAnimatePacket@@@Z virtual void handle(class NetworkIdentifier const&, class AnimatePacket const&); - // vIndex: 81, symbol: + // vIndex: 80, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VBlockActorDataPacket@@@std@@@Z virtual void handle(class NetworkIdentifier const&, std::shared_ptr); - // vIndex: 82, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerAuthInputPacket@@@Z + // vIndex: 81, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerAuthInputPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerAuthInputPacket const&); - // vIndex: 83, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerInputPacket@@@Z + // vIndex: 82, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerInputPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerInputPacket const&); - // vIndex: 84, symbol: + // vIndex: 83, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VLevelChunkPacket@@@std@@@Z virtual void handle(class NetworkIdentifier const&, std::shared_ptr); - // vIndex: 85, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSubChunkPacket@@@Z + // vIndex: 84, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSubChunkPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SubChunkPacket const&); - // vIndex: 86, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSubChunkRequestPacket@@@Z + // vIndex: 85, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSubChunkRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SubChunkRequestPacket const&); - // vIndex: 87, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheBlobStatusPacket@@@Z + // vIndex: 86, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheBlobStatusPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ClientCacheBlobStatusPacket const&); - // vIndex: 88, symbol: + // vIndex: 87, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VClientCacheMissResponsePacket@@@std@@@Z virtual void handle(class NetworkIdentifier const&, std::shared_ptr); - // vIndex: 89, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetCommandsEnabledPacket@@@Z + // vIndex: 88, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetCommandsEnabledPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetCommandsEnabledPacket const&); - // vIndex: 90, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetDifficultyPacket@@@Z + // vIndex: 89, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetDifficultyPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetDifficultyPacket const&); - // vIndex: 91, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSimpleEventPacket@@@Z + // vIndex: 90, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSimpleEventPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SimpleEventPacket const&); - // vIndex: 92, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVChangeDimensionPacket@@@Z + // vIndex: 91, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVChangeDimensionPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ChangeDimensionPacket const&); - // vIndex: 93, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateAttributesPacket@@@Z - virtual void handle(class NetworkIdentifier const&, class UpdateAttributesPacket const&); + // vIndex: 92, symbol: + // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VUpdateAttributesPacket@@@std@@@Z + virtual void handle(class NetworkIdentifier const&, std::shared_ptr); - // vIndex: 94, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerListPacket@@@Z + // vIndex: 93, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerListPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerListPacket const&); - // vIndex: 95, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLegacyTelemetryEventPacket@@@Z + // vIndex: 94, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLegacyTelemetryEventPacket@@@Z virtual void handle(class NetworkIdentifier const&, class LegacyTelemetryEventPacket const&); - // vIndex: 96, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSpawnExperienceOrbPacket@@@Z + // vIndex: 95, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSpawnExperienceOrbPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SpawnExperienceOrbPacket const&); - // vIndex: 97, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientboundDebugRendererPacket@@@Z + // vIndex: 96, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientboundDebugRendererPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ClientboundDebugRendererPacket const&); - // vIndex: 98, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientboundMapItemDataPacket@@@Z + // vIndex: 97, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientboundMapItemDataPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ClientboundMapItemDataPacket const&); - // vIndex: 99, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheStatusPacket@@@Z + // vIndex: 98, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheStatusPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ClientCacheStatusPacket const&); - // vIndex: 100, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestChunkRadiusPacket@@@Z + // vIndex: 99, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestChunkRadiusPacket@@@Z virtual void handle(class NetworkIdentifier const&, class RequestChunkRadiusPacket const&); - // vIndex: 101, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVMapCreateLockedCopyPacket@@@Z + // vIndex: 100, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVMapCreateLockedCopyPacket@@@Z virtual void handle(class NetworkIdentifier const&, class MapCreateLockedCopyPacket const&); - // vIndex: 102, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVMapInfoRequestPacket@@@Z + // vIndex: 101, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVMapInfoRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class MapInfoRequestPacket const&); - // vIndex: 103, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVChunkRadiusUpdatedPacket@@@Z + // vIndex: 102, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVChunkRadiusUpdatedPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ChunkRadiusUpdatedPacket const&); - // vIndex: 104, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBossEventPacket@@@Z + // vIndex: 103, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBossEventPacket@@@Z virtual void handle(class NetworkIdentifier const&, class BossEventPacket const&); - // vIndex: 105, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateTradePacket@@@Z + // vIndex: 104, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateTradePacket@@@Z virtual void handle(class NetworkIdentifier const&, class UpdateTradePacket const&); - // vIndex: 106, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateEquipPacket@@@Z + // vIndex: 105, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateEquipPacket@@@Z virtual void handle(class NetworkIdentifier const&, class UpdateEquipPacket const&); - // vIndex: 107, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAvailableCommandsPacket@@@Z + // vIndex: 106, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAvailableCommandsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class AvailableCommandsPacket const&); - // vIndex: 108, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCommandRequestPacket@@@Z + // vIndex: 107, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCommandRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CommandRequestPacket const&); - // vIndex: 109, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCommandOutputPacket@@@Z + // vIndex: 108, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCommandOutputPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CommandOutputPacket const&); - // vIndex: 110, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCommandBlockUpdatePacket@@@Z + // vIndex: 109, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCommandBlockUpdatePacket@@@Z virtual void handle(class NetworkIdentifier const&, class CommandBlockUpdatePacket const&); - // vIndex: 111, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCompletedUsingItemPacket@@@Z + // vIndex: 110, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCompletedUsingItemPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CompletedUsingItemPacket const&); - // vIndex: 112, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraInstructionPacket@@@Z + // vIndex: 111, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraInstructionPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CameraInstructionPacket const&); - // vIndex: 113, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraPacket@@@Z + // vIndex: 112, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CameraPacket const&); - // vIndex: 114, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraPresetsPacket@@@Z + // vIndex: 113, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraPresetsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CameraPresetsPacket const&); - // vIndex: 115, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraShakePacket@@@Z + // vIndex: 114, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCameraShakePacket@@@Z virtual void handle(class NetworkIdentifier const&, class CameraShakePacket const&); - // vIndex: 116, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVInventoryActionPacket@@@Z + // vIndex: 115, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVInventoryActionPacket@@@Z virtual void handle(class NetworkIdentifier const&, class InventoryActionPacket const&); - // vIndex: 117, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVGameRulesChangedPacket@@@Z + // vIndex: 116, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVGameRulesChangedPacket@@@Z virtual void handle(class NetworkIdentifier const&, class GameRulesChangedPacket const&); - // vIndex: 118, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVResourcePackDataInfoPacket@@@Z + // vIndex: 117, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVResourcePackDataInfoPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ResourcePackDataInfoPacket const&); - // vIndex: 119, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVResourcePackChunkDataPacket@@@Z + // vIndex: 118, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVResourcePackChunkDataPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ResourcePackChunkDataPacket const&); - // vIndex: 120, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVResourcePackChunkRequestPacket@@@Z + // vIndex: 119, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVResourcePackChunkRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ResourcePackChunkRequestPacket const&); - // vIndex: 121, symbol: + // vIndex: 120, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNetworkChunkPublisherUpdatePacket@@@Z virtual void handle(class NetworkIdentifier const&, class NetworkChunkPublisherUpdatePacket const&); - // vIndex: 122, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVStructureBlockUpdatePacket@@@Z + // vIndex: 121, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVStructureBlockUpdatePacket@@@Z virtual void handle(class NetworkIdentifier const&, class StructureBlockUpdatePacket const&); - // vIndex: 123, symbol: + // vIndex: 122, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVStructureTemplateDataRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class StructureTemplateDataRequestPacket const&); - // vIndex: 124, symbol: + // vIndex: 123, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVStructureTemplateDataResponsePacket@@@Z virtual void handle(class NetworkIdentifier const&, class StructureTemplateDataResponsePacket const&); - // vIndex: 125, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTransferPacket@@@Z + // vIndex: 124, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTransferPacket@@@Z virtual void handle(class NetworkIdentifier const&, class TransferPacket const&); - // vIndex: 126, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlaySoundPacket@@@Z + // vIndex: 125, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlaySoundPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlaySoundPacket const&); - // vIndex: 127, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVStopSoundPacket@@@Z + // vIndex: 126, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVStopSoundPacket@@@Z virtual void handle(class NetworkIdentifier const&, class StopSoundPacket const&); - // vIndex: 128, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetTitlePacket@@@Z + // vIndex: 127, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetTitlePacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetTitlePacket const&); - // vIndex: 129, symbol: + // vIndex: 128, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VInventoryTransactionPacket@@@std@@@Z virtual void handle(class NetworkIdentifier const&, std::shared_ptr); - // vIndex: 130, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAddBehaviorTreePacket@@@Z + // vIndex: 129, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAddBehaviorTreePacket@@@Z virtual void handle(class NetworkIdentifier const&, class AddBehaviorTreePacket const&); - // vIndex: 131, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVShowStoreOfferPacket@@@Z + // vIndex: 130, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVShowStoreOfferPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ShowStoreOfferPacket const&); - // vIndex: 132, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPurchaseReceiptPacket@@@Z + // vIndex: 131, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPurchaseReceiptPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PurchaseReceiptPacket const&); - // vIndex: 133, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRemoveObjectivePacket@@@Z + // vIndex: 132, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRemoveObjectivePacket@@@Z virtual void handle(class NetworkIdentifier const&, class RemoveObjectivePacket const&); - // vIndex: 134, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetDisplayObjectivePacket@@@Z + // vIndex: 133, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetDisplayObjectivePacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetDisplayObjectivePacket const&); - // vIndex: 135, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAutomationClientConnectPacket@@@Z + // vIndex: 134, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAutomationClientConnectPacket@@@Z virtual void handle(class NetworkIdentifier const&, class AutomationClientConnectPacket const&); - // vIndex: 136, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVModalFormRequestPacket@@@Z + // vIndex: 135, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVModalFormRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ModalFormRequestPacket const&); - // vIndex: 137, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVModalFormResponsePacket@@@Z + // vIndex: 136, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVModalFormResponsePacket@@@Z virtual void handle(class NetworkIdentifier const&, class ModalFormResponsePacket const&); - // vIndex: 138, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVToastRequestPacket@@@Z + // vIndex: 137, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVToastRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ToastRequestPacket const&); - // vIndex: 139, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVOnScreenTextureAnimationPacket@@@Z + // vIndex: 138, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVOnScreenTextureAnimationPacket@@@Z virtual void handle(class NetworkIdentifier const&, class OnScreenTextureAnimationPacket const&); - // vIndex: 140, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVServerSettingsRequestPacket@@@Z + // vIndex: 139, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVServerSettingsRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ServerSettingsRequestPacket const&); - // vIndex: 141, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVServerSettingsResponsePacket@@@Z + // vIndex: 140, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVServerSettingsResponsePacket@@@Z virtual void handle(class NetworkIdentifier const&, class ServerSettingsResponsePacket const&); - // vIndex: 142, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVShowProfilePacket@@@Z + // vIndex: 141, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVShowProfilePacket@@@Z virtual void handle(class NetworkIdentifier const&, class ShowProfilePacket const&); - // vIndex: 143, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetScorePacket@@@Z + // vIndex: 142, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetScorePacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetScorePacket const&); - // vIndex: 144, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetScoreboardIdentityPacket@@@Z + // vIndex: 143, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetScoreboardIdentityPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetScoreboardIdentityPacket const&); - // vIndex: 145, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTickSyncPacket@@@Z + // vIndex: 144, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTickSyncPacket@@@Z virtual void handle(class NetworkIdentifier const&, class TickSyncPacket const&); - // vIndex: 146, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTickingAreasLoadStatusPacket@@@Z + // vIndex: 145, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTickingAreasLoadStatusPacket@@@Z virtual void handle(class NetworkIdentifier const&, class TickingAreasLoadStatusPacket const&); - // vIndex: 147, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateSoftEnumPacket@@@Z + // vIndex: 146, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateSoftEnumPacket@@@Z virtual void handle(class NetworkIdentifier const&, class UpdateSoftEnumPacket const&); - // vIndex: 148, symbol: + // vIndex: 147, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAvailableActorIdentifiersPacket@@@Z virtual void handle(class NetworkIdentifier const&, class AvailableActorIdentifiersPacket const&); - // vIndex: 149, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAddVolumeEntityPacket@@@Z + // vIndex: 148, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAddVolumeEntityPacket@@@Z virtual void handle(class NetworkIdentifier const&, class AddVolumeEntityPacket const&); - // vIndex: 150, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRemoveVolumeEntityPacket@@@Z + // vIndex: 149, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRemoveVolumeEntityPacket@@@Z virtual void handle(class NetworkIdentifier const&, class RemoveVolumeEntityPacket const&); - // vIndex: 151, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVDimensionDataPacket@@@Z + // vIndex: 150, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVDimensionDataPacket@@@Z virtual void handle(class NetworkIdentifier const&, class DimensionDataPacket const&); - // vIndex: 152, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVEditorNetworkPacket@@@Z + // vIndex: 151, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVEditorNetworkPacket@@@Z virtual void handle(class NetworkIdentifier const&, class EditorNetworkPacket const&); - // vIndex: 153, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRefreshEntitlementsPacket@@@Z + // vIndex: 152, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRefreshEntitlementsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class RefreshEntitlementsPacket const&); - // vIndex: 154, symbol: + // vIndex: 153, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVServerPlayerPostMovePositionPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ServerPlayerPostMovePositionPacket const&); - // vIndex: 155, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRespawnPacket@@@Z + // vIndex: 154, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRespawnPacket@@@Z virtual void handle(class NetworkIdentifier const&, class RespawnPacket const&); - // vIndex: 156, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVShowCreditsPacket@@@Z + // vIndex: 155, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVShowCreditsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ShowCreditsPacket const&); - // vIndex: 157, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerSkinPacket@@@Z + // vIndex: 156, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerSkinPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerSkinPacket const&); - // vIndex: 158, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerStartItemCooldownPacket@@@Z + // vIndex: 157, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerStartItemCooldownPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerStartItemCooldownPacket const&); - // vIndex: 159, symbol: + // vIndex: 158, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerToggleCrafterSlotRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerToggleCrafterSlotRequestPacket const&); - // vIndex: 160, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetLastHurtByPacket@@@Z + // vIndex: 159, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetLastHurtByPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetLastHurtByPacket const&); - // vIndex: 161, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookAddPagePacket@@@Z + // vIndex: 160, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookAddPagePacket@@@Z virtual void handle(class NetworkIdentifier const&, class BookAddPagePacket const&); - // vIndex: 162, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookDeletePagePacket@@@Z + // vIndex: 161, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookDeletePagePacket@@@Z virtual void handle(class NetworkIdentifier const&, class BookDeletePagePacket const&); - // vIndex: 163, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLecternUpdatePacket@@@Z + // vIndex: 162, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLecternUpdatePacket@@@Z virtual void handle(class NetworkIdentifier const&, class LecternUpdatePacket const&); - // vIndex: 164, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookEditPacket@@@Z + // vIndex: 163, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookEditPacket@@@Z virtual void handle(class NetworkIdentifier const&, class BookEditPacket const&); - // vIndex: 165, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookSignPacket@@@Z + // vIndex: 164, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookSignPacket@@@Z virtual void handle(class NetworkIdentifier const&, class BookSignPacket const&); - // vIndex: 166, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookSwapPagesPacket@@@Z + // vIndex: 165, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBookSwapPagesPacket@@@Z virtual void handle(class NetworkIdentifier const&, class BookSwapPagesPacket const&); - // vIndex: 167, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNpcRequestPacket@@@Z + // vIndex: 166, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNpcRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class NpcRequestPacket const&); - // vIndex: 168, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPhotoTransferPacket@@@Z + // vIndex: 167, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPhotoTransferPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PhotoTransferPacket const&); - // vIndex: 169, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLabTablePacket@@@Z + // vIndex: 168, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLabTablePacket@@@Z virtual void handle(class NetworkIdentifier const&, class LabTablePacket const&); - // vIndex: 170, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNetworkSettingsPacket@@@Z + // vIndex: 169, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNetworkSettingsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class NetworkSettingsPacket const&); - // vIndex: 171, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNetworkStackLatencyPacket@@@Z + // vIndex: 170, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNetworkStackLatencyPacket@@@Z virtual void handle(class NetworkIdentifier const&, class NetworkStackLatencyPacket const&); - // vIndex: 172, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVServerStatsPacket@@@Z + // vIndex: 171, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVServerStatsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ServerStatsPacket const&); - // vIndex: 173, symbol: + // vIndex: 172, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetLocalPlayerAsInitializedPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetLocalPlayerAsInitializedPacket const&); - // vIndex: 174, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVScriptMessagePacket@@@Z + // vIndex: 173, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVScriptMessagePacket@@@Z virtual void handle(class NetworkIdentifier const&, class ScriptMessagePacket const&); - // vIndex: 175, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBiomeDefinitionListPacket@@@Z + // vIndex: 174, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVBiomeDefinitionListPacket@@@Z virtual void handle(class NetworkIdentifier const&, class BiomeDefinitionListPacket const&); - // vIndex: 176, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVEducationSettingsPacket@@@Z + // vIndex: 175, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVEducationSettingsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class EducationSettingsPacket const&); - // vIndex: 177, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVEduUriResourcePacket@@@Z + // vIndex: 176, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVEduUriResourcePacket@@@Z virtual void handle(class NetworkIdentifier const&, class EduUriResourcePacket const&); - // vIndex: 178, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVMultiplayerSettingsPacket@@@Z + // vIndex: 177, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVMultiplayerSettingsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class MultiplayerSettingsPacket const&); - // vIndex: 179, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSettingsCommandPacket@@@Z + // vIndex: 178, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSettingsCommandPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SettingsCommandPacket const&); - // vIndex: 180, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAnvilDamagePacket@@@Z + // vIndex: 179, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAnvilDamagePacket@@@Z virtual void handle(class NetworkIdentifier const&, class AnvilDamagePacket const&); - // vIndex: 181, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCreativeContentPacket@@@Z + // vIndex: 180, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCreativeContentPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CreativeContentPacket const&); - // vIndex: 182, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCodeBuilderPacket@@@Z + // vIndex: 181, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCodeBuilderPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CodeBuilderPacket const&); - // vIndex: 183, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerEnchantOptionsPacket@@@Z + // vIndex: 182, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerEnchantOptionsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerEnchantOptionsPacket const&); - // vIndex: 184, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVDebugInfoPacket@@@Z + // vIndex: 183, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVDebugInfoPacket@@@Z virtual void handle(class NetworkIdentifier const&, class DebugInfoPacket const&); - // vIndex: 185, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVChangeMobPropertyPacket@@@Z + // vIndex: 184, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVChangeMobPropertyPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ChangeMobPropertyPacket const&); - // vIndex: 186, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAnimateEntityPacket@@@Z + // vIndex: 185, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAnimateEntityPacket@@@Z virtual void handle(class NetworkIdentifier const&, class AnimateEntityPacket const&); - // vIndex: 187, symbol: + // vIndex: 186, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCorrectPlayerMovePredictionPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CorrectPlayerMovePredictionPacket const&); - // vIndex: 188, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerFogPacket@@@Z + // vIndex: 187, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerFogPacket@@@Z virtual void handle(class NetworkIdentifier const&, class PlayerFogPacket const&); - // vIndex: 189, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVItemComponentPacket@@@Z + // vIndex: 188, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVItemComponentPacket@@@Z virtual void handle(class NetworkIdentifier const&, class ItemComponentPacket const&); - // vIndex: 190, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLessonProgressPacket@@@Z + // vIndex: 189, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVLessonProgressPacket@@@Z virtual void handle(class NetworkIdentifier const&, class LessonProgressPacket const&); - // vIndex: 191, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVFeatureRegistryPacket@@@Z + // vIndex: 190, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVFeatureRegistryPacket@@@Z virtual void handle(class NetworkIdentifier const&, class FeatureRegistryPacket const&); - // vIndex: 192, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVFilterTextPacket@@@Z + // vIndex: 191, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVFilterTextPacket@@@Z virtual void handle(class NetworkIdentifier const&, class FilterTextPacket const&); - // vIndex: 193, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSyncActorPropertyPacket@@@Z + // vIndex: 192, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSyncActorPropertyPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SyncActorPropertyPacket const&); - // vIndex: 194, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSimulationTypePacket@@@Z + // vIndex: 193, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSimulationTypePacket@@@Z virtual void handle(class NetworkIdentifier const&, class SimulationTypePacket const&); - // vIndex: 195, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNpcDialoguePacket@@@Z + // vIndex: 194, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVNpcDialoguePacket@@@Z virtual void handle(class NetworkIdentifier const&, class NpcDialoguePacket const&); - // vIndex: 196, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCreatePhotoPacket@@@Z + // vIndex: 195, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCreatePhotoPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CreatePhotoPacket const&); - // vIndex: 197, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateSubChunkBlocksPacket@@@Z + // vIndex: 196, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateSubChunkBlocksPacket@@@Z virtual void handle(class NetworkIdentifier const&, class UpdateSubChunkBlocksPacket const&); - // vIndex: 198, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCodeBuilderSourcePacket@@@Z + // vIndex: 197, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCodeBuilderSourcePacket@@@Z virtual void handle(class NetworkIdentifier const&, class CodeBuilderSourcePacket const&); - // vIndex: 199, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAgentActionEventPacket@@@Z + // vIndex: 198, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAgentActionEventPacket@@@Z virtual void handle(class NetworkIdentifier const&, class AgentActionEventPacket const&); - // vIndex: 200, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVDeathInfoPacket@@@Z + // vIndex: 199, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVDeathInfoPacket@@@Z virtual void handle(class NetworkIdentifier const&, class DeathInfoPacket const&); - // vIndex: 201, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestAbilityPacket@@@Z + // vIndex: 200, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestAbilityPacket@@@Z virtual void handle(class NetworkIdentifier const&, class RequestAbilityPacket const&); - // vIndex: 202, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestPermissionsPacket@@@Z + // vIndex: 201, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestPermissionsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class RequestPermissionsPacket const&); - // vIndex: 203, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateAbilitiesPacket@@@Z + // vIndex: 202, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateAbilitiesPacket@@@Z virtual void handle(class NetworkIdentifier const&, class UpdateAbilitiesPacket const&); - // vIndex: 204, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateAdventureSettingsPacket@@@Z + // vIndex: 203, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateAdventureSettingsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class UpdateAdventureSettingsPacket const&); - // vIndex: 205, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestNetworkSettingsPacket@@@Z + // vIndex: 204, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVRequestNetworkSettingsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class RequestNetworkSettingsPacket const&); - // vIndex: 206, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVGameTestRequestPacket@@@Z + // vIndex: 205, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVGameTestRequestPacket@@@Z virtual void handle(class NetworkIdentifier const&, class GameTestRequestPacket const&); - // vIndex: 207, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVGameTestResultsPacket@@@Z + // vIndex: 206, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVGameTestResultsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class GameTestResultsPacket const&); - // vIndex: 208, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateClientInputLocksPacket@@@Z + // vIndex: 207, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUpdateClientInputLocksPacket@@@Z virtual void handle(class NetworkIdentifier const&, class UpdateClientInputLocksPacket const&); - // vIndex: 209, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUnlockedRecipesPacket@@@Z + // vIndex: 208, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVUnlockedRecipesPacket@@@Z virtual void handle(class NetworkIdentifier const&, class UnlockedRecipesPacket const&); - // vIndex: 210, symbol: + // vIndex: 209, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVCompressedBiomeDefinitionListPacket@@@Z virtual void handle(class NetworkIdentifier const&, class CompressedBiomeDefinitionListPacket const&); - // vIndex: 211, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTrimDataPacket@@@Z + // vIndex: 210, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVTrimDataPacket@@@Z virtual void handle(class NetworkIdentifier const&, class TrimDataPacket const&); - // vIndex: 212, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVOpenSignPacket@@@Z + // vIndex: 211, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVOpenSignPacket@@@Z virtual void handle(class NetworkIdentifier const&, class OpenSignPacket const&); - // vIndex: 213, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAgentAnimationPacket@@@Z + // vIndex: 212, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVAgentAnimationPacket@@@Z virtual void handle(class NetworkIdentifier const&, class AgentAnimationPacket const&); - // vIndex: 214, symbol: + // vIndex: 213, symbol: // ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetPlayerInventoryOptionsPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetPlayerInventoryOptionsPacket const&); - // vIndex: 215, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetHudPacket@@@Z + // vIndex: 214, symbol: ?handle@NetEventCallback@@UEAAXAEBVNetworkIdentifier@@AEBVSetHudPacket@@@Z virtual void handle(class NetworkIdentifier const&, class SetHudPacket const&); // NOLINTEND diff --git a/src/mc/network/ServerNetworkHandler.h b/src/mc/network/ServerNetworkHandler.h index 5466879697..9673f95a3d 100644 --- a/src/mc/network/ServerNetworkHandler.h +++ b/src/mc/network/ServerNetworkHandler.h @@ -11,6 +11,7 @@ #include "mc/enums/ParticleType.h" #include "mc/enums/SubClientId.h" #include "mc/enums/connection/DisconnectFailReason.h" +#include "mc/events/ServerTextEvent.h" #include "mc/services/ServiceReference.h" #include "mc/world/actor/player/PlayerPermissionLevel.h" @@ -104,23 +105,20 @@ class ServerNetworkHandler { // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSetDefaultGameTypePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class SetDefaultGameTypePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVActorEventPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ActorEventPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVNpcRequestPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class NpcRequestPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVBlockPickRequestPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class BlockPickRequestPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVBossEventPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class BossEventPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSetPlayerInventoryOptionsPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class SetPlayerInventoryOptionsPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestAbilityPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class RequestAbilityPacket const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerHotbarPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class PlayerHotbarPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLevelSoundEventPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class LevelSoundEventPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMovePlayerPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class MovePlayerPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLevelSoundEventPacketV2@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class LevelSoundEventPacketV2 const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerSkinPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class PlayerSkinPacket const& packet); @@ -128,128 +126,132 @@ class ServerNetworkHandler { // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVCodeBuilderSourcePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class CodeBuilderSourcePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVDisconnectPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class DisconnectPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheStatusPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class ClientCacheStatusPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLabTablePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class LabTablePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheStatusPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ClientCacheStatusPacket const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVNpcRequestPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class NpcRequestPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMapCreateLockedCopyPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class MapCreateLockedCopyPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheBlobStatusPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ClientCacheBlobStatusPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVActorPickRequestPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class ActorPickRequestPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVClientToServerHandshakePacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ClientToServerHandshakePacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLecternUpdatePacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class LecternUpdatePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSubChunkRequestPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class SubChunkRequestPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVDisconnectPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class DisconnectPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVItemFrameDropItemPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ItemFrameDropItemPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVActorEventPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class ActorEventPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVResourcePackChunkRequestPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class ResourcePackChunkRequestPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVEmotePacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class EmotePacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVItemStackRequestPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class ItemStackRequestPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVStructureBlockUpdatePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class StructureBlockUpdatePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVActorPickRequestPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ActorPickRequestPacket const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVItemStackRequestPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ItemStackRequestPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVUpdatePlayerGameTypePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class UpdatePlayerGameTypePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLevelSoundEventPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class LevelSoundEventPacket const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLevelSoundEventPacketV2@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class LevelSoundEventPacketV2 const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMobEquipmentPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class MobEquipmentPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMovePlayerPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class MovePlayerPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVTextPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class TextPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerHotbarPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class PlayerHotbarPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVGameTestRequestPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class GameTestRequestPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestAbilityPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class RequestAbilityPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSpawnExperienceOrbPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class SpawnExperienceOrbPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVBlockPickRequestPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class BlockPickRequestPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMultiplayerSettingsPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class MultiplayerSettingsPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerActionPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class PlayerActionPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVShowCreditsPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class ShowCreditsPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSimpleEventPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class SimpleEventPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVNetworkStackLatencyPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class NetworkStackLatencyPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVBossEventPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class BossEventPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVBookEditPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class BookEditPacket const& packet); + + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVEmotePacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class EmotePacket const& packet); + + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSubChunkRequestPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class SubChunkRequestPacket const& packet); + + // symbol: + // ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VInventoryTransactionPacket@@@std@@@Z + MCVAPI void handle(class NetworkIdentifier const&, std::shared_ptr); + + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVClientCacheBlobStatusPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class ClientCacheBlobStatusPacket const& packet); + + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMoveActorAbsolutePacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class MoveActorAbsolutePacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVCommandRequestPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class CommandRequestPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMapCreateLockedCopyPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class MapCreateLockedCopyPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSetDifficultyPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class SetDifficultyPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestPermissionsPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class RequestPermissionsPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerAuthInputPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class PlayerAuthInputPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVEmoteListPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class EmoteListPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVDebugInfoPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class DebugInfoPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSetLocalPlayerAsInitializedPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class SetLocalPlayerAsInitializedPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPassengerJumpPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class PassengerJumpPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMapInfoRequestPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class MapInfoRequestPacket const& packet); + + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSimpleEventPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class SimpleEventPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVModalFormResponsePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class ModalFormResponsePacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVCommandBlockUpdatePacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class CommandBlockUpdatePacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VBlockActorDataPacket@@@std@@@Z MCVAPI void handle(class NetworkIdentifier const& source, std::shared_ptr packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMapInfoRequestPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class MapInfoRequestPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMobEquipmentPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class MobEquipmentPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVScriptMessagePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class ScriptMessagePacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestPermissionsPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class RequestPermissionsPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestChunkRadiusPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class RequestChunkRadiusPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVContainerClosePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class ContainerClosePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVBookEditPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class BookEditPacket const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestNetworkSettingsPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class RequestNetworkSettingsPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerActionPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class PlayerActionPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSubClientLoginPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class SubClientLoginPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVTextPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class TextPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRespawnPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class RespawnPacket const& packet); @@ -257,31 +259,37 @@ class ServerNetworkHandler { // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVAnvilDamagePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class AnvilDamagePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerAuthInputPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class PlayerAuthInputPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSpawnExperienceOrbPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class SpawnExperienceOrbPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSettingsCommandPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class SettingsCommandPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVGameTestRequestPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class GameTestRequestPacket const& packet); + + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestNetworkSettingsPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class RequestNetworkSettingsPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPositionTrackingDBClientRequestPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class PositionTrackingDBClientRequestPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVFilterTextPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class FilterTextPacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVTickSyncPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class TickSyncPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSetPlayerGameTypePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class SetPlayerGameTypePacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVMoveActorAbsolutePacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class MoveActorAbsolutePacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVDebugInfoPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class DebugInfoPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLevelSoundEventPacketV1@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class LevelSoundEventPacketV1 const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVFilterTextPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class FilterTextPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLoginPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class LoginPacket const& packet); @@ -291,12 +299,8 @@ class ServerNetworkHandler { // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVStructureTemplateDataRequestPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class StructureTemplateDataRequestPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVNetworkStackLatencyPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class NetworkStackLatencyPacket const& packet); - - // symbol: - // ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@V?$shared_ptr@VInventoryTransactionPacket@@@std@@@Z - MCVAPI void handle(class NetworkIdentifier const&, std::shared_ptr); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVSubClientLoginPacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class SubClientLoginPacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVAnimatePacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class AnimatePacket const& packet); @@ -304,14 +308,8 @@ class ServerNetworkHandler { // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVInteractPacket@@@Z MCVAPI void handle(class NetworkIdentifier const& source, class InteractPacket const& packet); - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVCommandBlockUpdatePacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class CommandBlockUpdatePacket const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVShowCreditsPacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class ShowCreditsPacket const& packet); - - // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVLecternUpdatePacket@@@Z - MCVAPI void handle(class NetworkIdentifier const& source, class LecternUpdatePacket const& packet); + // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVClientToServerHandshakePacket@@@Z + MCVAPI void handle(class NetworkIdentifier const& source, class ClientToServerHandshakePacket const& packet); // symbol: ?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerToggleCrafterSlotRequestPacket@@@Z MCVAPI void handle(class NetworkIdentifier const&, class PlayerToggleCrafterSlotRequestPacket const&); @@ -459,6 +457,10 @@ class ServerNetworkHandler { ::PlayerPermissionLevel playerPermission ); + // symbol: + // ?removeFromDenyList@ServerNetworkHandler@@QEAAXAEBVUUID@mce@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI void removeFromDenyList(class mce::UUID const& uuid, std::string const& xuid); + // symbol: // ?sendLoginMessageLocal@ServerNetworkHandler@@QEAAXAEBVNetworkIdentifier@@AEBVConnectionRequest@@AEAVServerPlayer@@@Z MCAPI void sendLoginMessageLocal( @@ -533,6 +535,9 @@ class ServerNetworkHandler { // symbol: ?_handleSetDifficulty@ServerNetworkHandler@@AEBAXAEBVServerPlayer@@AEBVSetDifficultyPacket@@@Z MCAPI void _handleSetDifficulty(class ServerPlayer const& player, class SetDifficultyPacket const& packet) const; + // symbol: ?_isServerTextEnabled@ServerNetworkHandler@@AEBA_NAEBW4ServerTextEvent@@@Z + MCAPI bool _isServerTextEnabled(::ServerTextEvent const&) const; + // symbol: ?_loadNewPlayer@ServerNetworkHandler@@AEAA_NAEAVServerPlayer@@_N@Z MCAPI bool _loadNewPlayer(class ServerPlayer& newPlayer, bool isXboxLive); diff --git a/src/mc/network/packet/ActorEventPacket.h b/src/mc/network/packet/ActorEventPacket.h index 22e80f1bbf..e7148f6948 100644 --- a/src/mc/network/packet/ActorEventPacket.h +++ b/src/mc/network/packet/ActorEventPacket.h @@ -31,10 +31,10 @@ class ActorEventPacket : public ::Packet { // ?getName@ActorEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ActorEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ActorEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ActorEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ActorPickRequestPacket.h b/src/mc/network/packet/ActorPickRequestPacket.h index fea876f1e6..754319e7c5 100644 --- a/src/mc/network/packet/ActorPickRequestPacket.h +++ b/src/mc/network/packet/ActorPickRequestPacket.h @@ -29,10 +29,10 @@ class ActorPickRequestPacket : public ::Packet { // ?getName@ActorPickRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ActorPickRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ActorPickRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ActorPickRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AddActorPacket.h b/src/mc/network/packet/AddActorPacket.h index 0977565045..7bd431f992 100644 --- a/src/mc/network/packet/AddActorPacket.h +++ b/src/mc/network/packet/AddActorPacket.h @@ -51,10 +51,10 @@ class AddActorPacket : public ::AddActorBasePacket { // ?getName@AddActorPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AddActorPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AddActorPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AddActorPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AddBehaviorTreePacket.h b/src/mc/network/packet/AddBehaviorTreePacket.h index 3a3acfecc5..e944f5c759 100644 --- a/src/mc/network/packet/AddBehaviorTreePacket.h +++ b/src/mc/network/packet/AddBehaviorTreePacket.h @@ -27,10 +27,10 @@ class AddBehaviorTreePacket : public ::Packet { // ?getName@AddBehaviorTreePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AddBehaviorTreePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AddBehaviorTreePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AddBehaviorTreePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AddItemActorPacket.h b/src/mc/network/packet/AddItemActorPacket.h index 999cd39529..b84abd54ee 100644 --- a/src/mc/network/packet/AddItemActorPacket.h +++ b/src/mc/network/packet/AddItemActorPacket.h @@ -39,10 +39,10 @@ class AddItemActorPacket : public ::AddActorBasePacket { // ?getName@AddItemActorPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AddItemActorPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AddItemActorPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AddItemActorPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AddPaintingPacket.h b/src/mc/network/packet/AddPaintingPacket.h index 580c81422c..5b21b9785b 100644 --- a/src/mc/network/packet/AddPaintingPacket.h +++ b/src/mc/network/packet/AddPaintingPacket.h @@ -34,10 +34,10 @@ class AddPaintingPacket : public ::AddActorBasePacket { // ?getName@AddPaintingPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AddPaintingPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AddPaintingPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AddPaintingPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AddPlayerPacket.h b/src/mc/network/packet/AddPlayerPacket.h index b6f4ac08a0..f402cc868e 100644 --- a/src/mc/network/packet/AddPlayerPacket.h +++ b/src/mc/network/packet/AddPlayerPacket.h @@ -58,10 +58,10 @@ class AddPlayerPacket : public ::AddActorBasePacket { // ?getName@AddPlayerPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AddPlayerPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AddPlayerPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AddPlayerPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AddVolumeEntityPacket.h b/src/mc/network/packet/AddVolumeEntityPacket.h index d79b7310ee..74ffa68292 100644 --- a/src/mc/network/packet/AddVolumeEntityPacket.h +++ b/src/mc/network/packet/AddVolumeEntityPacket.h @@ -41,10 +41,10 @@ class AddVolumeEntityPacket : public ::Packet { // ?getName@AddVolumeEntityPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AddVolumeEntityPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AddVolumeEntityPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AddVolumeEntityPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AgentActionEventPacket.h b/src/mc/network/packet/AgentActionEventPacket.h index 279f16f55e..80a02c2218 100644 --- a/src/mc/network/packet/AgentActionEventPacket.h +++ b/src/mc/network/packet/AgentActionEventPacket.h @@ -32,10 +32,10 @@ class AgentActionEventPacket : public ::Packet { // ?getName@AgentActionEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AgentActionEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AgentActionEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AgentActionEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AgentAnimationPacket.h b/src/mc/network/packet/AgentAnimationPacket.h index 69b23d6d9e..2f183c2a4e 100644 --- a/src/mc/network/packet/AgentAnimationPacket.h +++ b/src/mc/network/packet/AgentAnimationPacket.h @@ -29,10 +29,10 @@ class AgentAnimationPacket : public ::Packet { // ?getName@AgentAnimationPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AgentAnimationPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AgentAnimationPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream&) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AgentAnimationPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&); diff --git a/src/mc/network/packet/AnimateEntityPacket.h b/src/mc/network/packet/AnimateEntityPacket.h index 37c9efd4da..b3e0aa2a5a 100644 --- a/src/mc/network/packet/AnimateEntityPacket.h +++ b/src/mc/network/packet/AnimateEntityPacket.h @@ -36,10 +36,10 @@ class AnimateEntityPacket : public ::Packet { // ?getName@AnimateEntityPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AnimateEntityPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AnimateEntityPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& s) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AnimateEntityPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& s); diff --git a/src/mc/network/packet/AnimatePacket.h b/src/mc/network/packet/AnimatePacket.h index 8778b03d6a..eca2e8cee0 100644 --- a/src/mc/network/packet/AnimatePacket.h +++ b/src/mc/network/packet/AnimatePacket.h @@ -36,10 +36,10 @@ class AnimatePacket : public ::Packet { // vIndex: 2, symbol: ?getName@AnimatePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AnimatePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AnimatePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: ?_read@AnimatePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@AnimatePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0AnimatePacket@@QEAA@XZ diff --git a/src/mc/network/packet/AnvilDamagePacket.h b/src/mc/network/packet/AnvilDamagePacket.h index 82accd80ff..d842ac0231 100644 --- a/src/mc/network/packet/AnvilDamagePacket.h +++ b/src/mc/network/packet/AnvilDamagePacket.h @@ -29,10 +29,10 @@ class AnvilDamagePacket : public ::Packet { // ?getName@AnvilDamagePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AnvilDamagePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AnvilDamagePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AnvilDamagePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AutomationClientConnectPacket.h b/src/mc/network/packet/AutomationClientConnectPacket.h index 8fa643919d..fd7886d639 100644 --- a/src/mc/network/packet/AutomationClientConnectPacket.h +++ b/src/mc/network/packet/AutomationClientConnectPacket.h @@ -28,10 +28,10 @@ class AutomationClientConnectPacket : public ::Packet { // ?getName@AutomationClientConnectPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AutomationClientConnectPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AutomationClientConnectPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AutomationClientConnectPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AvailableActorIdentifiersPacket.h b/src/mc/network/packet/AvailableActorIdentifiersPacket.h index 9c3c6a3acc..657806ac31 100644 --- a/src/mc/network/packet/AvailableActorIdentifiersPacket.h +++ b/src/mc/network/packet/AvailableActorIdentifiersPacket.h @@ -28,14 +28,14 @@ class AvailableActorIdentifiersPacket : public ::Packet { // ?getName@AvailableActorIdentifiersPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AvailableActorIdentifiersPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AvailableActorIdentifiersPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?read@AvailableActorIdentifiersPacket@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& stream); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AvailableActorIdentifiersPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/AvailableCommandsPacket.h b/src/mc/network/packet/AvailableCommandsPacket.h index 883d9b5630..4e636538dd 100644 --- a/src/mc/network/packet/AvailableCommandsPacket.h +++ b/src/mc/network/packet/AvailableCommandsPacket.h @@ -155,10 +155,10 @@ class AvailableCommandsPacket : public ::Packet { // ?getName@AvailableCommandsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@AvailableCommandsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@AvailableCommandsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@AvailableCommandsPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/BiomeDefinitionListPacket.h b/src/mc/network/packet/BiomeDefinitionListPacket.h index cb3c1d2100..b5d36bb015 100644 --- a/src/mc/network/packet/BiomeDefinitionListPacket.h +++ b/src/mc/network/packet/BiomeDefinitionListPacket.h @@ -28,14 +28,14 @@ class BiomeDefinitionListPacket : public ::Packet { // ?getName@BiomeDefinitionListPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@BiomeDefinitionListPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@BiomeDefinitionListPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?read@BiomeDefinitionListPacket@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& stream); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@BiomeDefinitionListPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/BlockActorDataPacket.h b/src/mc/network/packet/BlockActorDataPacket.h index cdbccc0be2..620ab762d0 100644 --- a/src/mc/network/packet/BlockActorDataPacket.h +++ b/src/mc/network/packet/BlockActorDataPacket.h @@ -30,10 +30,10 @@ class BlockActorDataPacket : public ::Packet { // ?getName@BlockActorDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@BlockActorDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@BlockActorDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@BlockActorDataPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/BlockEventPacket.h b/src/mc/network/packet/BlockEventPacket.h index 3c9d9b6ffc..e3ea3e033e 100644 --- a/src/mc/network/packet/BlockEventPacket.h +++ b/src/mc/network/packet/BlockEventPacket.h @@ -30,10 +30,10 @@ class BlockEventPacket : public ::Packet { // ?getName@BlockEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@BlockEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@BlockEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@BlockEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/BlockPickRequestPacket.h b/src/mc/network/packet/BlockPickRequestPacket.h index c2232f4db2..a72d939bcc 100644 --- a/src/mc/network/packet/BlockPickRequestPacket.h +++ b/src/mc/network/packet/BlockPickRequestPacket.h @@ -30,10 +30,10 @@ class BlockPickRequestPacket : public ::Packet { // ?getName@BlockPickRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@BlockPickRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@BlockPickRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@BlockPickRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/BookEditPacket.h b/src/mc/network/packet/BookEditPacket.h index b12f6597e4..438d55eacb 100644 --- a/src/mc/network/packet/BookEditPacket.h +++ b/src/mc/network/packet/BookEditPacket.h @@ -33,10 +33,10 @@ class BookEditPacket : public ::Packet { // ?getName@BookEditPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@BookEditPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@BookEditPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@BookEditPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/BossEventPacket.h b/src/mc/network/packet/BossEventPacket.h index 182b31901e..f7d2592211 100644 --- a/src/mc/network/packet/BossEventPacket.h +++ b/src/mc/network/packet/BossEventPacket.h @@ -41,10 +41,10 @@ class BossEventPacket : public ::Packet { // ?getName@BossEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@BossEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@BossEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@BossEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CameraInstructionPacket.h b/src/mc/network/packet/CameraInstructionPacket.h index b9f0fa0c31..3b891793c8 100644 --- a/src/mc/network/packet/CameraInstructionPacket.h +++ b/src/mc/network/packet/CameraInstructionPacket.h @@ -28,14 +28,14 @@ class CameraInstructionPacket : public ::Packet { // ?getName@CameraInstructionPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CameraInstructionPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CameraInstructionPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?read@CameraInstructionPacket@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& stream); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CameraInstructionPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CameraPacket.h b/src/mc/network/packet/CameraPacket.h index 5e50bee69d..ef7b2072a6 100644 --- a/src/mc/network/packet/CameraPacket.h +++ b/src/mc/network/packet/CameraPacket.h @@ -28,10 +28,10 @@ class CameraPacket : public ::Packet { // vIndex: 2, symbol: ?getName@CameraPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CameraPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CameraPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: ?_read@CameraPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@CameraPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0CameraPacket@@QEAA@XZ diff --git a/src/mc/network/packet/CameraPresetsPacket.h b/src/mc/network/packet/CameraPresetsPacket.h index 9efb653a44..a7595cfb8a 100644 --- a/src/mc/network/packet/CameraPresetsPacket.h +++ b/src/mc/network/packet/CameraPresetsPacket.h @@ -28,14 +28,14 @@ class CameraPresetsPacket : public ::Packet { // ?getName@CameraPresetsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CameraPresetsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CameraPresetsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?read@CameraPresetsPacket@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& stream); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CameraPresetsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CameraShakePacket.h b/src/mc/network/packet/CameraShakePacket.h index faccdcd435..6cc7217180 100644 --- a/src/mc/network/packet/CameraShakePacket.h +++ b/src/mc/network/packet/CameraShakePacket.h @@ -34,10 +34,10 @@ class CameraShakePacket : public ::Packet { // ?getName@CameraShakePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CameraShakePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CameraShakePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CameraShakePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ChangeDimensionPacket.h b/src/mc/network/packet/ChangeDimensionPacket.h index a02c90d50c..e52448a78a 100644 --- a/src/mc/network/packet/ChangeDimensionPacket.h +++ b/src/mc/network/packet/ChangeDimensionPacket.h @@ -32,10 +32,10 @@ class ChangeDimensionPacket : public ::Packet { // ?getName@ChangeDimensionPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ChangeDimensionPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ChangeDimensionPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ChangeDimensionPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ChangeMobPropertyPacket.h b/src/mc/network/packet/ChangeMobPropertyPacket.h index 5c9bc26058..78ee4986a1 100644 --- a/src/mc/network/packet/ChangeMobPropertyPacket.h +++ b/src/mc/network/packet/ChangeMobPropertyPacket.h @@ -29,10 +29,10 @@ class ChangeMobPropertyPacket : public ::Packet { // ?getName@ChangeMobPropertyPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ChangeMobPropertyPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ChangeMobPropertyPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ChangeMobPropertyPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ChunkRadiusUpdatedPacket.h b/src/mc/network/packet/ChunkRadiusUpdatedPacket.h index b9bce97788..0715a5d5f5 100644 --- a/src/mc/network/packet/ChunkRadiusUpdatedPacket.h +++ b/src/mc/network/packet/ChunkRadiusUpdatedPacket.h @@ -27,10 +27,10 @@ class ChunkRadiusUpdatedPacket : public ::Packet { // ?getName@ChunkRadiusUpdatedPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ChunkRadiusUpdatedPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ChunkRadiusUpdatedPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ChunkRadiusUpdatedPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ClientCacheBlobStatusPacket.h b/src/mc/network/packet/ClientCacheBlobStatusPacket.h index 0c42e7a89b..8c8c753341 100644 --- a/src/mc/network/packet/ClientCacheBlobStatusPacket.h +++ b/src/mc/network/packet/ClientCacheBlobStatusPacket.h @@ -29,10 +29,10 @@ class ClientCacheBlobStatusPacket : public ::Packet { // ?getName@ClientCacheBlobStatusPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ClientCacheBlobStatusPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ClientCacheBlobStatusPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ClientCacheBlobStatusPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ClientCacheMissResponsePacket.h b/src/mc/network/packet/ClientCacheMissResponsePacket.h index c54fa8240c..c31a7f0720 100644 --- a/src/mc/network/packet/ClientCacheMissResponsePacket.h +++ b/src/mc/network/packet/ClientCacheMissResponsePacket.h @@ -30,10 +30,10 @@ class ClientCacheMissResponsePacket : public ::Packet { // ?getName@ClientCacheMissResponsePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ClientCacheMissResponsePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ClientCacheMissResponsePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ClientCacheMissResponsePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ClientCacheStatusPacket.h b/src/mc/network/packet/ClientCacheStatusPacket.h index caa57f737d..81a96ecc0d 100644 --- a/src/mc/network/packet/ClientCacheStatusPacket.h +++ b/src/mc/network/packet/ClientCacheStatusPacket.h @@ -27,10 +27,10 @@ class ClientCacheStatusPacket : public ::Packet { // ?getName@ClientCacheStatusPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ClientCacheStatusPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ClientCacheStatusPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ClientCacheStatusPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ClientToServerHandshakePacket.h b/src/mc/network/packet/ClientToServerHandshakePacket.h index 3f280dc45f..4d0372e5a8 100644 --- a/src/mc/network/packet/ClientToServerHandshakePacket.h +++ b/src/mc/network/packet/ClientToServerHandshakePacket.h @@ -25,10 +25,10 @@ class ClientToServerHandshakePacket : public ::Packet { // ?getName@ClientToServerHandshakePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ClientToServerHandshakePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ClientToServerHandshakePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ClientToServerHandshakePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ClientboundDebugRendererPacket.h b/src/mc/network/packet/ClientboundDebugRendererPacket.h index a802dee41f..9319db8101 100644 --- a/src/mc/network/packet/ClientboundDebugRendererPacket.h +++ b/src/mc/network/packet/ClientboundDebugRendererPacket.h @@ -46,10 +46,10 @@ class ClientboundDebugRendererPacket : public ::Packet { // ?getName@ClientboundDebugRendererPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ClientboundDebugRendererPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ClientboundDebugRendererPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ClientboundDebugRendererPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ClientboundMapItemDataPacket.h b/src/mc/network/packet/ClientboundMapItemDataPacket.h index 388ec03213..3bc345d8bd 100644 --- a/src/mc/network/packet/ClientboundMapItemDataPacket.h +++ b/src/mc/network/packet/ClientboundMapItemDataPacket.h @@ -54,10 +54,10 @@ class ClientboundMapItemDataPacket : public ::Packet { // ?getName@ClientboundMapItemDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ClientboundMapItemDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ClientboundMapItemDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ClientboundMapItemDataPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CodeBuilderPacket.h b/src/mc/network/packet/CodeBuilderPacket.h index 67eea63c16..6e43352d0a 100644 --- a/src/mc/network/packet/CodeBuilderPacket.h +++ b/src/mc/network/packet/CodeBuilderPacket.h @@ -29,10 +29,10 @@ class CodeBuilderPacket : public ::Packet { // ?getName@CodeBuilderPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CodeBuilderPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CodeBuilderPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CodeBuilderPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CodeBuilderSourcePacket.h b/src/mc/network/packet/CodeBuilderSourcePacket.h index 4cab8923f7..94dde12b47 100644 --- a/src/mc/network/packet/CodeBuilderSourcePacket.h +++ b/src/mc/network/packet/CodeBuilderSourcePacket.h @@ -31,10 +31,10 @@ class CodeBuilderSourcePacket : public ::Packet { // ?getName@CodeBuilderSourcePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CodeBuilderSourcePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CodeBuilderSourcePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CodeBuilderSourcePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CommandBlockUpdatePacket.h b/src/mc/network/packet/CommandBlockUpdatePacket.h index 620c47edf5..a5ceecb8b8 100644 --- a/src/mc/network/packet/CommandBlockUpdatePacket.h +++ b/src/mc/network/packet/CommandBlockUpdatePacket.h @@ -40,10 +40,10 @@ class CommandBlockUpdatePacket : public ::Packet { // ?getName@CommandBlockUpdatePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CommandBlockUpdatePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CommandBlockUpdatePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CommandBlockUpdatePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CommandOutputPacket.h b/src/mc/network/packet/CommandOutputPacket.h index 5ad78c7cff..3c6ef33bc8 100644 --- a/src/mc/network/packet/CommandOutputPacket.h +++ b/src/mc/network/packet/CommandOutputPacket.h @@ -30,10 +30,10 @@ class CommandOutputPacket : public ::Packet { // ?getName@CommandOutputPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CommandOutputPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CommandOutputPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CommandOutputPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CommandRequestPacket.h b/src/mc/network/packet/CommandRequestPacket.h index d1d6fc3441..45e90441fb 100644 --- a/src/mc/network/packet/CommandRequestPacket.h +++ b/src/mc/network/packet/CommandRequestPacket.h @@ -31,10 +31,10 @@ class CommandRequestPacket : public ::Packet { // ?getName@CommandRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CommandRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CommandRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CommandRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CompletedUsingItemPacket.h b/src/mc/network/packet/CompletedUsingItemPacket.h index a45d53938e..6d016143a7 100644 --- a/src/mc/network/packet/CompletedUsingItemPacket.h +++ b/src/mc/network/packet/CompletedUsingItemPacket.h @@ -28,10 +28,10 @@ class CompletedUsingItemPacket : public ::Packet { // ?getName@CompletedUsingItemPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CompletedUsingItemPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CompletedUsingItemPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CompletedUsingItemPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CompressedBiomeDefinitionListPacket.h b/src/mc/network/packet/CompressedBiomeDefinitionListPacket.h index 82df124e8a..c9069534de 100644 --- a/src/mc/network/packet/CompressedBiomeDefinitionListPacket.h +++ b/src/mc/network/packet/CompressedBiomeDefinitionListPacket.h @@ -27,10 +27,10 @@ class CompressedBiomeDefinitionListPacket : public ::BiomeDefinitionListPacket { // ?getName@CompressedBiomeDefinitionListPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CompressedBiomeDefinitionListPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CompressedBiomeDefinitionListPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?read@CompressedBiomeDefinitionListPacket@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ContainerClosePacket.h b/src/mc/network/packet/ContainerClosePacket.h index 32aecbfaa2..80fa792e3c 100644 --- a/src/mc/network/packet/ContainerClosePacket.h +++ b/src/mc/network/packet/ContainerClosePacket.h @@ -30,10 +30,10 @@ class ContainerClosePacket : public ::Packet { // ?getName@ContainerClosePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ContainerClosePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ContainerClosePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ContainerClosePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ContainerOpenPacket.h b/src/mc/network/packet/ContainerOpenPacket.h index 47731adfae..d6c70bf98d 100644 --- a/src/mc/network/packet/ContainerOpenPacket.h +++ b/src/mc/network/packet/ContainerOpenPacket.h @@ -36,10 +36,10 @@ class ContainerOpenPacket : public ::Packet { // ?getName@ContainerOpenPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ContainerOpenPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ContainerOpenPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ContainerOpenPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ContainerSetDataPacket.h b/src/mc/network/packet/ContainerSetDataPacket.h index e62268359e..8be566bc51 100644 --- a/src/mc/network/packet/ContainerSetDataPacket.h +++ b/src/mc/network/packet/ContainerSetDataPacket.h @@ -31,10 +31,10 @@ class ContainerSetDataPacket : public ::Packet { // ?getName@ContainerSetDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ContainerSetDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ContainerSetDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ContainerSetDataPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CorrectPlayerMovePredictionPacket.h b/src/mc/network/packet/CorrectPlayerMovePredictionPacket.h index 2a7ab171fb..0c5864a8cb 100644 --- a/src/mc/network/packet/CorrectPlayerMovePredictionPacket.h +++ b/src/mc/network/packet/CorrectPlayerMovePredictionPacket.h @@ -32,10 +32,10 @@ class CorrectPlayerMovePredictionPacket : public ::Packet { // ?getName@CorrectPlayerMovePredictionPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CorrectPlayerMovePredictionPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CorrectPlayerMovePredictionPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CorrectPlayerMovePredictionPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CraftingDataPacket.h b/src/mc/network/packet/CraftingDataPacket.h index c9c3f9575c..d7398997e5 100644 --- a/src/mc/network/packet/CraftingDataPacket.h +++ b/src/mc/network/packet/CraftingDataPacket.h @@ -35,10 +35,10 @@ class CraftingDataPacket : public ::Packet { // ?getName@CraftingDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CraftingDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CraftingDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CraftingDataPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CreatePhotoPacket.h b/src/mc/network/packet/CreatePhotoPacket.h index dd53252ff8..03784acd78 100644 --- a/src/mc/network/packet/CreatePhotoPacket.h +++ b/src/mc/network/packet/CreatePhotoPacket.h @@ -31,10 +31,10 @@ class CreatePhotoPacket : public ::Packet { // ?getName@CreatePhotoPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CreatePhotoPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CreatePhotoPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CreatePhotoPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/CreativeContentPacket.h b/src/mc/network/packet/CreativeContentPacket.h index cf6975276a..2aea65d6ec 100644 --- a/src/mc/network/packet/CreativeContentPacket.h +++ b/src/mc/network/packet/CreativeContentPacket.h @@ -38,10 +38,10 @@ class CreativeContentPacket : public ::Packet { // ?getName@CreativeContentPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@CreativeContentPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@CreativeContentPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@CreativeContentPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/DeathInfoPacket.h b/src/mc/network/packet/DeathInfoPacket.h index d735b62035..47bcdfbeae 100644 --- a/src/mc/network/packet/DeathInfoPacket.h +++ b/src/mc/network/packet/DeathInfoPacket.h @@ -27,10 +27,10 @@ class DeathInfoPacket : public ::Packet { // ?getName@DeathInfoPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@DeathInfoPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@DeathInfoPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@DeathInfoPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/DebugInfoPacket.h b/src/mc/network/packet/DebugInfoPacket.h index 5ce32f0fae..3d6b30cb9b 100644 --- a/src/mc/network/packet/DebugInfoPacket.h +++ b/src/mc/network/packet/DebugInfoPacket.h @@ -29,10 +29,10 @@ class DebugInfoPacket : public ::Packet { // ?getName@DebugInfoPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@DebugInfoPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@DebugInfoPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@DebugInfoPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/DimensionDataPacket.h b/src/mc/network/packet/DimensionDataPacket.h index 8e06a535af..78470f853f 100644 --- a/src/mc/network/packet/DimensionDataPacket.h +++ b/src/mc/network/packet/DimensionDataPacket.h @@ -29,10 +29,10 @@ class DimensionDataPacket : public ::Packet { // ?getName@DimensionDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@DimensionDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@DimensionDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@DimensionDataPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/DisconnectPacket.h b/src/mc/network/packet/DisconnectPacket.h index 167b1525b6..7501b6eb8e 100644 --- a/src/mc/network/packet/DisconnectPacket.h +++ b/src/mc/network/packet/DisconnectPacket.h @@ -31,10 +31,10 @@ class DisconnectPacket : public ::Packet { // ?getName@DisconnectPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@DisconnectPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@DisconnectPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@DisconnectPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/EditorNetworkPacket.h b/src/mc/network/packet/EditorNetworkPacket.h index ad6ec52ab3..39fba07725 100644 --- a/src/mc/network/packet/EditorNetworkPacket.h +++ b/src/mc/network/packet/EditorNetworkPacket.h @@ -28,10 +28,10 @@ class EditorNetworkPacket : public ::Packet { // ?getName@EditorNetworkPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@EditorNetworkPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@EditorNetworkPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@EditorNetworkPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/EduUriResourcePacket.h b/src/mc/network/packet/EduUriResourcePacket.h index a2d8971a7a..5108676dda 100644 --- a/src/mc/network/packet/EduUriResourcePacket.h +++ b/src/mc/network/packet/EduUriResourcePacket.h @@ -28,10 +28,10 @@ class EduUriResourcePacket : public ::Packet { // ?getName@EduUriResourcePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@EduUriResourcePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@EduUriResourcePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@EduUriResourcePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/EducationSettingsPacket.h b/src/mc/network/packet/EducationSettingsPacket.h index d1528995ec..a7ca38d148 100644 --- a/src/mc/network/packet/EducationSettingsPacket.h +++ b/src/mc/network/packet/EducationSettingsPacket.h @@ -28,10 +28,10 @@ class EducationSettingsPacket : public ::Packet { // ?getName@EducationSettingsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@EducationSettingsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@EducationSettingsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@EducationSettingsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/EmoteListPacket.h b/src/mc/network/packet/EmoteListPacket.h index b9dcc4a09c..cafd2e3bee 100644 --- a/src/mc/network/packet/EmoteListPacket.h +++ b/src/mc/network/packet/EmoteListPacket.h @@ -30,10 +30,10 @@ class EmoteListPacket : public ::Packet { // ?getName@EmoteListPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@EmoteListPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@EmoteListPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@EmoteListPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/EmotePacket.h b/src/mc/network/packet/EmotePacket.h index 1340274012..4d20eda068 100644 --- a/src/mc/network/packet/EmotePacket.h +++ b/src/mc/network/packet/EmotePacket.h @@ -31,10 +31,10 @@ class EmotePacket : public ::Packet { // vIndex: 2, symbol: ?getName@EmotePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@EmotePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@EmotePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: ?_read@EmotePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@EmotePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0EmotePacket@@QEAA@XZ diff --git a/src/mc/network/packet/FeatureRegistryPacket.h b/src/mc/network/packet/FeatureRegistryPacket.h index d1a00714c2..43c0cf11a5 100644 --- a/src/mc/network/packet/FeatureRegistryPacket.h +++ b/src/mc/network/packet/FeatureRegistryPacket.h @@ -29,10 +29,10 @@ class FeatureRegistryPacket : public ::Packet { // ?getName@FeatureRegistryPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@FeatureRegistryPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@FeatureRegistryPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@FeatureRegistryPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/FilterTextPacket.h b/src/mc/network/packet/FilterTextPacket.h index fafddc72fd..ff5b792643 100644 --- a/src/mc/network/packet/FilterTextPacket.h +++ b/src/mc/network/packet/FilterTextPacket.h @@ -28,10 +28,10 @@ class FilterTextPacket : public ::Packet { // ?getName@FilterTextPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@FilterTextPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@FilterTextPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@FilterTextPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/GameRulesChangedPacket.h b/src/mc/network/packet/GameRulesChangedPacket.h index 168aacc48b..045a2af402 100644 --- a/src/mc/network/packet/GameRulesChangedPacket.h +++ b/src/mc/network/packet/GameRulesChangedPacket.h @@ -29,10 +29,10 @@ class GameRulesChangedPacket : public ::Packet { // ?getName@GameRulesChangedPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@GameRulesChangedPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@GameRulesChangedPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@GameRulesChangedPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/GameTestRequestPacket.h b/src/mc/network/packet/GameTestRequestPacket.h index 67523f5da3..3bde851a75 100644 --- a/src/mc/network/packet/GameTestRequestPacket.h +++ b/src/mc/network/packet/GameTestRequestPacket.h @@ -29,10 +29,10 @@ class GameTestRequestPacket : public ::Packet { // ?getName@GameTestRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@GameTestRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@GameTestRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@GameTestRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/GameTestResultsPacket.h b/src/mc/network/packet/GameTestResultsPacket.h index cab6c711f3..4e270b9be5 100644 --- a/src/mc/network/packet/GameTestResultsPacket.h +++ b/src/mc/network/packet/GameTestResultsPacket.h @@ -29,10 +29,10 @@ class GameTestResultsPacket : public ::Packet { // ?getName@GameTestResultsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@GameTestResultsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@GameTestResultsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@GameTestResultsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/GuiDataPickItemPacket.h b/src/mc/network/packet/GuiDataPickItemPacket.h index aa6cbf9bf0..5ebfc4a234 100644 --- a/src/mc/network/packet/GuiDataPickItemPacket.h +++ b/src/mc/network/packet/GuiDataPickItemPacket.h @@ -29,10 +29,10 @@ class GuiDataPickItemPacket : public ::Packet { // ?getName@GuiDataPickItemPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@GuiDataPickItemPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@GuiDataPickItemPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@GuiDataPickItemPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/HurtArmorPacket.h b/src/mc/network/packet/HurtArmorPacket.h index dd1877f8a2..7b42c5e530 100644 --- a/src/mc/network/packet/HurtArmorPacket.h +++ b/src/mc/network/packet/HurtArmorPacket.h @@ -31,10 +31,10 @@ class HurtArmorPacket : public ::Packet { // ?getName@HurtArmorPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@HurtArmorPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@HurtArmorPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@HurtArmorPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/InteractPacket.h b/src/mc/network/packet/InteractPacket.h index 368feb04c9..cb0637a736 100644 --- a/src/mc/network/packet/InteractPacket.h +++ b/src/mc/network/packet/InteractPacket.h @@ -41,10 +41,10 @@ class InteractPacket : public ::Packet { // ?getName@InteractPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@InteractPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@InteractPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@InteractPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/InventoryContentPacket.h b/src/mc/network/packet/InventoryContentPacket.h index f5f8896ce2..7f03f61e24 100644 --- a/src/mc/network/packet/InventoryContentPacket.h +++ b/src/mc/network/packet/InventoryContentPacket.h @@ -31,10 +31,10 @@ class InventoryContentPacket : public ::Packet { // ?getName@InventoryContentPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@InventoryContentPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@InventoryContentPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@InventoryContentPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/InventorySlotPacket.h b/src/mc/network/packet/InventorySlotPacket.h index bea7cb7e9f..03147fff50 100644 --- a/src/mc/network/packet/InventorySlotPacket.h +++ b/src/mc/network/packet/InventorySlotPacket.h @@ -32,10 +32,10 @@ class InventorySlotPacket : public ::Packet { // ?getName@InventorySlotPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@InventorySlotPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@InventorySlotPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@InventorySlotPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/InventoryTransactionPacket.h b/src/mc/network/packet/InventoryTransactionPacket.h index 8a1822efee..d2a84759e4 100644 --- a/src/mc/network/packet/InventoryTransactionPacket.h +++ b/src/mc/network/packet/InventoryTransactionPacket.h @@ -34,10 +34,10 @@ class InventoryTransactionPacket : public ::Packet { // ?getName@InventoryTransactionPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@InventoryTransactionPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@InventoryTransactionPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@InventoryTransactionPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ItemComponentPacket.h b/src/mc/network/packet/ItemComponentPacket.h index c88c8973c1..fad9e40aed 100644 --- a/src/mc/network/packet/ItemComponentPacket.h +++ b/src/mc/network/packet/ItemComponentPacket.h @@ -28,10 +28,10 @@ class ItemComponentPacket : public ::Packet { // ?getName@ItemComponentPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ItemComponentPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ItemComponentPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ItemComponentPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ItemFrameDropItemPacket.h b/src/mc/network/packet/ItemFrameDropItemPacket.h deleted file mode 100644 index b041ce9c3b..0000000000 --- a/src/mc/network/packet/ItemFrameDropItemPacket.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" -#include "mc/network/NetworkBlockPosition.h" - -// auto generated inclusion list -#include "mc/deps/core/common/bedrock/Result.h" -#include "mc/enums/MinecraftPacketIds.h" -#include "mc/network/packet/Packet.h" - -class ItemFrameDropItemPacket : public ::Packet { -public: - NetworkBlockPosition mPos; // this+0x30 - - // prevent constructor by default - ItemFrameDropItemPacket& operator=(ItemFrameDropItemPacket const&); - ItemFrameDropItemPacket(ItemFrameDropItemPacket const&); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: ??1ItemFrameDropItemPacket@@UEAA@XZ - virtual ~ItemFrameDropItemPacket(); - - // vIndex: 1, symbol: ?getId@ItemFrameDropItemPacket@@UEBA?AW4MinecraftPacketIds@@XZ - virtual ::MinecraftPacketIds getId() const; - - // vIndex: 2, symbol: - // ?getName@ItemFrameDropItemPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - virtual std::string getName() const; - - // vIndex: 3, symbol: ?write@ItemFrameDropItemPacket@@UEBAXAEAVBinaryStream@@@Z - virtual void write(class BinaryStream& stream) const; - - // vIndex: 7, symbol: - // ?_read@ItemFrameDropItemPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z - virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); - - // symbol: ??0ItemFrameDropItemPacket@@QEAA@XZ - MCAPI ItemFrameDropItemPacket(); - - // NOLINTEND -}; diff --git a/src/mc/network/packet/ItemStackRequestPacket.h b/src/mc/network/packet/ItemStackRequestPacket.h index 769f628524..d7b791ffac 100644 --- a/src/mc/network/packet/ItemStackRequestPacket.h +++ b/src/mc/network/packet/ItemStackRequestPacket.h @@ -28,10 +28,10 @@ class ItemStackRequestPacket : public ::Packet { // ?getName@ItemStackRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ItemStackRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ItemStackRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ItemStackRequestPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ItemStackResponsePacket.h b/src/mc/network/packet/ItemStackResponsePacket.h index 41997562a3..8f197c6e8c 100644 --- a/src/mc/network/packet/ItemStackResponsePacket.h +++ b/src/mc/network/packet/ItemStackResponsePacket.h @@ -28,10 +28,10 @@ class ItemStackResponsePacket : public ::Packet { // ?getName@ItemStackResponsePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ItemStackResponsePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ItemStackResponsePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ItemStackResponsePacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LabTablePacket.h b/src/mc/network/packet/LabTablePacket.h index 04e2fbe21c..8d39e02816 100644 --- a/src/mc/network/packet/LabTablePacket.h +++ b/src/mc/network/packet/LabTablePacket.h @@ -40,10 +40,10 @@ class LabTablePacket : public ::Packet { // ?getName@LabTablePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LabTablePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LabTablePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LabTablePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LecternUpdatePacket.h b/src/mc/network/packet/LecternUpdatePacket.h index 9a22e7bfd5..0a49d6a420 100644 --- a/src/mc/network/packet/LecternUpdatePacket.h +++ b/src/mc/network/packet/LecternUpdatePacket.h @@ -21,8 +21,8 @@ class LecternUpdatePacket : public ::Packet { public: // NOLINTBEGIN - // vIndex: 0, symbol: ??1LecternUpdatePacket@@UEAA@XZ - virtual ~LecternUpdatePacket(); + // vIndex: 0, symbol: __gen_??1LecternUpdatePacket@@UEAA@XZ + virtual ~LecternUpdatePacket() = default; // vIndex: 1, symbol: ?getId@LecternUpdatePacket@@UEBA?AW4MinecraftPacketIds@@XZ virtual ::MinecraftPacketIds getId() const; @@ -31,10 +31,10 @@ class LecternUpdatePacket : public ::Packet { // ?getName@LecternUpdatePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LecternUpdatePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LecternUpdatePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LecternUpdatePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LegacyTelemetryEventPacket.h b/src/mc/network/packet/LegacyTelemetryEventPacket.h index 295eb30d2b..b01d0ac494 100644 --- a/src/mc/network/packet/LegacyTelemetryEventPacket.h +++ b/src/mc/network/packet/LegacyTelemetryEventPacket.h @@ -204,10 +204,10 @@ class LegacyTelemetryEventPacket : public ::Packet { // ?getName@LegacyTelemetryEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LegacyTelemetryEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LegacyTelemetryEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream&) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LegacyTelemetryEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&); diff --git a/src/mc/network/packet/LessonProgressPacket.h b/src/mc/network/packet/LessonProgressPacket.h index 313d4deb21..e07e6c3fd5 100644 --- a/src/mc/network/packet/LessonProgressPacket.h +++ b/src/mc/network/packet/LessonProgressPacket.h @@ -31,10 +31,10 @@ class LessonProgressPacket : public ::Packet { // ?getName@LessonProgressPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LessonProgressPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LessonProgressPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LessonProgressPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LevelChunkPacket.h b/src/mc/network/packet/LevelChunkPacket.h index c7aceab263..4efb0d9cc0 100644 --- a/src/mc/network/packet/LevelChunkPacket.h +++ b/src/mc/network/packet/LevelChunkPacket.h @@ -42,10 +42,10 @@ class LevelChunkPacket : public ::Packet { // ?getName@LevelChunkPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LevelChunkPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LevelChunkPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LevelChunkPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LevelEventGenericPacket.h b/src/mc/network/packet/LevelEventGenericPacket.h index 4460f7868e..233350c0fd 100644 --- a/src/mc/network/packet/LevelEventGenericPacket.h +++ b/src/mc/network/packet/LevelEventGenericPacket.h @@ -30,10 +30,10 @@ class LevelEventGenericPacket : public ::Packet { // ?getName@LevelEventGenericPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LevelEventGenericPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LevelEventGenericPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LevelEventGenericPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LevelEventPacket.h b/src/mc/network/packet/LevelEventPacket.h index 7d9e9c50dd..60aaf965dd 100644 --- a/src/mc/network/packet/LevelEventPacket.h +++ b/src/mc/network/packet/LevelEventPacket.h @@ -31,10 +31,10 @@ class LevelEventPacket : public ::Packet { // ?getName@LevelEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LevelEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LevelEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LevelEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LevelSoundEventPacket.h b/src/mc/network/packet/LevelSoundEventPacket.h index e4c905e6ef..e1117da834 100644 --- a/src/mc/network/packet/LevelSoundEventPacket.h +++ b/src/mc/network/packet/LevelSoundEventPacket.h @@ -36,10 +36,10 @@ class LevelSoundEventPacket : public ::Packet { // ?getName@LevelSoundEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LevelSoundEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LevelSoundEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LevelSoundEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LevelSoundEventPacketV1.h b/src/mc/network/packet/LevelSoundEventPacketV1.h index 629d8eed88..bcdade6478 100644 --- a/src/mc/network/packet/LevelSoundEventPacketV1.h +++ b/src/mc/network/packet/LevelSoundEventPacketV1.h @@ -35,10 +35,10 @@ class LevelSoundEventPacketV1 : public ::Packet { // ?getName@LevelSoundEventPacketV1@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LevelSoundEventPacketV1@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LevelSoundEventPacketV1@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LevelSoundEventPacketV1@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LevelSoundEventPacketV2.h b/src/mc/network/packet/LevelSoundEventPacketV2.h index 23f3bb4477..56513b5c17 100644 --- a/src/mc/network/packet/LevelSoundEventPacketV2.h +++ b/src/mc/network/packet/LevelSoundEventPacketV2.h @@ -34,10 +34,10 @@ class LevelSoundEventPacketV2 : public ::Packet { // ?getName@LevelSoundEventPacketV2@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LevelSoundEventPacketV2@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LevelSoundEventPacketV2@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@LevelSoundEventPacketV2@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/LoginPacket.h b/src/mc/network/packet/LoginPacket.h index 2de4b191c6..d7c8aff2be 100644 --- a/src/mc/network/packet/LoginPacket.h +++ b/src/mc/network/packet/LoginPacket.h @@ -28,13 +28,13 @@ class LoginPacket : public ::Packet { // vIndex: 2, symbol: ?getName@LoginPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@LoginPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@LoginPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 5, symbol: ?disallowBatching@LoginPacket@@UEBA_NXZ + // vIndex: 6, symbol: ?disallowBatching@LoginPacket@@UEBA_NXZ virtual bool disallowBatching() const; - // vIndex: 7, symbol: ?_read@LoginPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@LoginPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0LoginPacket@@QEAA@XZ diff --git a/src/mc/network/packet/MapCreateLockedCopyPacket.h b/src/mc/network/packet/MapCreateLockedCopyPacket.h index cd720f233b..ac1cd13f56 100644 --- a/src/mc/network/packet/MapCreateLockedCopyPacket.h +++ b/src/mc/network/packet/MapCreateLockedCopyPacket.h @@ -29,10 +29,10 @@ class MapCreateLockedCopyPacket : public ::Packet { // ?getName@MapCreateLockedCopyPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MapCreateLockedCopyPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MapCreateLockedCopyPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MapCreateLockedCopyPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MapInfoRequestPacket.h b/src/mc/network/packet/MapInfoRequestPacket.h index 26936e8a63..5809ce1d45 100644 --- a/src/mc/network/packet/MapInfoRequestPacket.h +++ b/src/mc/network/packet/MapInfoRequestPacket.h @@ -29,10 +29,10 @@ class MapInfoRequestPacket : public ::Packet { // ?getName@MapInfoRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MapInfoRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MapInfoRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MapInfoRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MobArmorEquipmentPacket.h b/src/mc/network/packet/MobArmorEquipmentPacket.h index 78d2f312ea..8aa606725c 100644 --- a/src/mc/network/packet/MobArmorEquipmentPacket.h +++ b/src/mc/network/packet/MobArmorEquipmentPacket.h @@ -34,10 +34,10 @@ class MobArmorEquipmentPacket : public ::Packet { // ?getName@MobArmorEquipmentPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MobArmorEquipmentPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MobArmorEquipmentPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MobArmorEquipmentPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MobEffectPacket.h b/src/mc/network/packet/MobEffectPacket.h index 4cbc637bd0..3ea3243e19 100644 --- a/src/mc/network/packet/MobEffectPacket.h +++ b/src/mc/network/packet/MobEffectPacket.h @@ -32,8 +32,8 @@ class MobEffectPacket : public ::Packet { public: // NOLINTBEGIN - // vIndex: 0, symbol: ??1MobEffectPacket@@UEAA@XZ - virtual ~MobEffectPacket(); + // vIndex: 0, symbol: __gen_??1MobEffectPacket@@UEAA@XZ + virtual ~MobEffectPacket() = default; // vIndex: 1, symbol: ?getId@MobEffectPacket@@UEBA?AW4MinecraftPacketIds@@XZ virtual ::MinecraftPacketIds getId() const; @@ -42,25 +42,15 @@ class MobEffectPacket : public ::Packet { // ?getName@MobEffectPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MobEffectPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MobEffectPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MobEffectPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0MobEffectPacket@@QEAA@XZ MCAPI MobEffectPacket(); - // symbol: ??0MobEffectPacket@@QEAA@VActorRuntimeID@@W4Event@0@HHH_N@Z - MCAPI MobEffectPacket( - class ActorRuntimeID runtimeId, - ::MobEffectPacket::Event event, - int effectId, - int duration, - int amplifier, - bool showParticles - ); - // NOLINTEND }; diff --git a/src/mc/network/packet/MobEquipmentPacket.h b/src/mc/network/packet/MobEquipmentPacket.h index 31299127c0..a64a3f93b1 100644 --- a/src/mc/network/packet/MobEquipmentPacket.h +++ b/src/mc/network/packet/MobEquipmentPacket.h @@ -39,10 +39,10 @@ class MobEquipmentPacket : public ::Packet { // ?getName@MobEquipmentPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MobEquipmentPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MobEquipmentPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MobEquipmentPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ModalFormRequestPacket.h b/src/mc/network/packet/ModalFormRequestPacket.h index 1bb47d163c..5d2c9b58af 100644 --- a/src/mc/network/packet/ModalFormRequestPacket.h +++ b/src/mc/network/packet/ModalFormRequestPacket.h @@ -28,10 +28,10 @@ class ModalFormRequestPacket : public ::Packet { // ?getName@ModalFormRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ModalFormRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ModalFormRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ModalFormRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ModalFormResponsePacket.h b/src/mc/network/packet/ModalFormResponsePacket.h index 0383a67333..9a58aa12d0 100644 --- a/src/mc/network/packet/ModalFormResponsePacket.h +++ b/src/mc/network/packet/ModalFormResponsePacket.h @@ -31,10 +31,10 @@ class ModalFormResponsePacket : public ::Packet { // ?getName@ModalFormResponsePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ModalFormResponsePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ModalFormResponsePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ModalFormResponsePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MotionPredictionHintsPacket.h b/src/mc/network/packet/MotionPredictionHintsPacket.h index 9c633d4f30..59c6259ff5 100644 --- a/src/mc/network/packet/MotionPredictionHintsPacket.h +++ b/src/mc/network/packet/MotionPredictionHintsPacket.h @@ -31,10 +31,10 @@ class MotionPredictionHintsPacket : public ::Packet { // ?getName@MotionPredictionHintsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MotionPredictionHintsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MotionPredictionHintsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MotionPredictionHintsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MoveActorAbsolutePacket.h b/src/mc/network/packet/MoveActorAbsolutePacket.h index 4bc1256715..05d4013e81 100644 --- a/src/mc/network/packet/MoveActorAbsolutePacket.h +++ b/src/mc/network/packet/MoveActorAbsolutePacket.h @@ -28,10 +28,10 @@ class MoveActorAbsolutePacket : public ::Packet { // ?getName@MoveActorAbsolutePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MoveActorAbsolutePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MoveActorAbsolutePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MoveActorAbsolutePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MoveActorDeltaPacket.h b/src/mc/network/packet/MoveActorDeltaPacket.h index 316c0e8e55..bb751ff1de 100644 --- a/src/mc/network/packet/MoveActorDeltaPacket.h +++ b/src/mc/network/packet/MoveActorDeltaPacket.h @@ -28,10 +28,10 @@ class MoveActorDeltaPacket : public ::Packet { // ?getName@MoveActorDeltaPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MoveActorDeltaPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MoveActorDeltaPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MoveActorDeltaPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MovePlayerPacket.h b/src/mc/network/packet/MovePlayerPacket.h index d49a147208..fe9e239133 100644 --- a/src/mc/network/packet/MovePlayerPacket.h +++ b/src/mc/network/packet/MovePlayerPacket.h @@ -44,13 +44,13 @@ class MovePlayerPacket : public ::Packet { // ?getName@MovePlayerPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MovePlayerPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MovePlayerPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 6, symbol: ?isValid@MovePlayerPacket@@UEBA_NXZ + // vIndex: 7, symbol: ?isValid@MovePlayerPacket@@UEBA_NXZ virtual bool isValid() const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MovePlayerPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/MultiplayerSettingsPacket.h b/src/mc/network/packet/MultiplayerSettingsPacket.h index d80afd5497..47d507aa29 100644 --- a/src/mc/network/packet/MultiplayerSettingsPacket.h +++ b/src/mc/network/packet/MultiplayerSettingsPacket.h @@ -29,10 +29,10 @@ class MultiplayerSettingsPacket : public ::Packet { // ?getName@MultiplayerSettingsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@MultiplayerSettingsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@MultiplayerSettingsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@MultiplayerSettingsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/NetworkChunkPublisherUpdatePacket.h b/src/mc/network/packet/NetworkChunkPublisherUpdatePacket.h index d2e742db1c..2abeab9fda 100644 --- a/src/mc/network/packet/NetworkChunkPublisherUpdatePacket.h +++ b/src/mc/network/packet/NetworkChunkPublisherUpdatePacket.h @@ -31,10 +31,10 @@ class NetworkChunkPublisherUpdatePacket : public ::Packet { // ?getName@NetworkChunkPublisherUpdatePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@NetworkChunkPublisherUpdatePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@NetworkChunkPublisherUpdatePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@NetworkChunkPublisherUpdatePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/NetworkSettingsPacket.h b/src/mc/network/packet/NetworkSettingsPacket.h index 3078643ff6..9f925061e5 100644 --- a/src/mc/network/packet/NetworkSettingsPacket.h +++ b/src/mc/network/packet/NetworkSettingsPacket.h @@ -29,10 +29,10 @@ class NetworkSettingsPacket : public ::Packet { // ?getName@NetworkSettingsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@NetworkSettingsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@NetworkSettingsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@NetworkSettingsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/NetworkStackLatencyPacket.h b/src/mc/network/packet/NetworkStackLatencyPacket.h index 0005e2ad6c..e533d6b6c6 100644 --- a/src/mc/network/packet/NetworkStackLatencyPacket.h +++ b/src/mc/network/packet/NetworkStackLatencyPacket.h @@ -29,10 +29,10 @@ class NetworkStackLatencyPacket : public ::Packet { // ?getName@NetworkStackLatencyPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@NetworkStackLatencyPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@NetworkStackLatencyPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@NetworkStackLatencyPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/NpcDialoguePacket.h b/src/mc/network/packet/NpcDialoguePacket.h index 9d81bf7ebc..87d1371723 100644 --- a/src/mc/network/packet/NpcDialoguePacket.h +++ b/src/mc/network/packet/NpcDialoguePacket.h @@ -40,10 +40,10 @@ class NpcDialoguePacket : public ::Packet { // ?getName@NpcDialoguePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@NpcDialoguePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@NpcDialoguePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@NpcDialoguePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/NpcRequestPacket.h b/src/mc/network/packet/NpcRequestPacket.h index 83f265b926..265b699793 100644 --- a/src/mc/network/packet/NpcRequestPacket.h +++ b/src/mc/network/packet/NpcRequestPacket.h @@ -44,10 +44,10 @@ class NpcRequestPacket : public ::Packet { // ?getName@NpcRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@NpcRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@NpcRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@NpcRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/OnScreenTextureAnimationPacket.h b/src/mc/network/packet/OnScreenTextureAnimationPacket.h index 64a1946c89..e17c6d3df5 100644 --- a/src/mc/network/packet/OnScreenTextureAnimationPacket.h +++ b/src/mc/network/packet/OnScreenTextureAnimationPacket.h @@ -27,10 +27,10 @@ class OnScreenTextureAnimationPacket : public ::Packet { // ?getName@OnScreenTextureAnimationPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@OnScreenTextureAnimationPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@OnScreenTextureAnimationPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@OnScreenTextureAnimationPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/OpenSignPacket.h b/src/mc/network/packet/OpenSignPacket.h index 92ff9718bb..0d8cbc8287 100644 --- a/src/mc/network/packet/OpenSignPacket.h +++ b/src/mc/network/packet/OpenSignPacket.h @@ -29,10 +29,10 @@ class OpenSignPacket : public ::Packet { // ?getName@OpenSignPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@OpenSignPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@OpenSignPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@OpenSignPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/Packet.h b/src/mc/network/packet/Packet.h index 603f0614e1..d0c5d0c2cf 100644 --- a/src/mc/network/packet/Packet.h +++ b/src/mc/network/packet/Packet.h @@ -90,19 +90,22 @@ class Packet { // ?getName@ActorEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const = 0; - // vIndex: 3, symbol: ?write@ActorEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 3, symbol: ?checkSize@Packet@@UEBA?AV?$Result@XVerror_code@std@@@Bedrock@@_K_N@Z + virtual class Bedrock::Result checkSize(uint64, bool) const; + + // vIndex: 4, symbol: ?write@ActorEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const = 0; - // vIndex: 4, symbol: ?read@Packet@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 5, symbol: ?read@Packet@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& bitStream); - // vIndex: 5, symbol: ?disallowBatching@Packet@@UEBA_NXZ + // vIndex: 6, symbol: ?disallowBatching@Packet@@UEBA_NXZ virtual bool disallowBatching() const; - // vIndex: 6, symbol: ?isValid@Packet@@UEBA_NXZ + // vIndex: 7, symbol: ?isValid@Packet@@UEBA_NXZ virtual bool isValid() const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ActorEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream) = 0; diff --git a/src/mc/network/packet/PacketViolationWarningPacket.h b/src/mc/network/packet/PacketViolationWarningPacket.h index e1b0bcbc93..2464922c3e 100644 --- a/src/mc/network/packet/PacketViolationWarningPacket.h +++ b/src/mc/network/packet/PacketViolationWarningPacket.h @@ -33,10 +33,10 @@ class PacketViolationWarningPacket : public ::Packet { // ?getName@PacketViolationWarningPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PacketViolationWarningPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PacketViolationWarningPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PacketViolationWarningPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PassengerJumpPacket.h b/src/mc/network/packet/PassengerJumpPacket.h index da0ee2ed8c..ea885656e9 100644 --- a/src/mc/network/packet/PassengerJumpPacket.h +++ b/src/mc/network/packet/PassengerJumpPacket.h @@ -27,10 +27,10 @@ class PassengerJumpPacket : public ::Packet { // ?getName@PassengerJumpPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PassengerJumpPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PassengerJumpPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PassengerJumpPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PhotoTransferPacket.h b/src/mc/network/packet/PhotoTransferPacket.h index 5d1e51db1f..f83c3c2994 100644 --- a/src/mc/network/packet/PhotoTransferPacket.h +++ b/src/mc/network/packet/PhotoTransferPacket.h @@ -36,10 +36,10 @@ class PhotoTransferPacket : public ::Packet { // ?getName@PhotoTransferPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PhotoTransferPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PhotoTransferPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PhotoTransferPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlaySoundPacket.h b/src/mc/network/packet/PlaySoundPacket.h index 3e37be3358..d10ee7d63b 100644 --- a/src/mc/network/packet/PlaySoundPacket.h +++ b/src/mc/network/packet/PlaySoundPacket.h @@ -31,10 +31,10 @@ class PlaySoundPacket : public ::Packet { // ?getName@PlaySoundPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlaySoundPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlaySoundPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlaySoundPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayStatusPacket.h b/src/mc/network/packet/PlayStatusPacket.h index 58b8e7a3ff..00297907a1 100644 --- a/src/mc/network/packet/PlayStatusPacket.h +++ b/src/mc/network/packet/PlayStatusPacket.h @@ -29,10 +29,10 @@ class PlayStatusPacket : public ::Packet { // ?getName@PlayStatusPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayStatusPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayStatusPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayStatusPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerActionPacket.h b/src/mc/network/packet/PlayerActionPacket.h index ec9e33799e..3a1e701d95 100644 --- a/src/mc/network/packet/PlayerActionPacket.h +++ b/src/mc/network/packet/PlayerActionPacket.h @@ -36,10 +36,10 @@ class PlayerActionPacket : public ::Packet { // ?getName@PlayerActionPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerActionPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerActionPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerActionPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerArmorDamagePacket.h b/src/mc/network/packet/PlayerArmorDamagePacket.h index 5d5e7cf1c9..90b444bda5 100644 --- a/src/mc/network/packet/PlayerArmorDamagePacket.h +++ b/src/mc/network/packet/PlayerArmorDamagePacket.h @@ -29,10 +29,10 @@ class PlayerArmorDamagePacket : public ::Packet { // ?getName@PlayerArmorDamagePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerArmorDamagePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerArmorDamagePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerArmorDamagePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerAuthInputPacket.h b/src/mc/network/packet/PlayerAuthInputPacket.h index c4c438e6e6..9619d6185d 100644 --- a/src/mc/network/packet/PlayerAuthInputPacket.h +++ b/src/mc/network/packet/PlayerAuthInputPacket.h @@ -104,13 +104,13 @@ class PlayerAuthInputPacket : public ::Packet { // ?getName@PlayerAuthInputPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerAuthInputPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerAuthInputPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 6, symbol: ?isValid@PlayerAuthInputPacket@@UEBA_NXZ + // vIndex: 7, symbol: ?isValid@PlayerAuthInputPacket@@UEBA_NXZ virtual bool isValid() const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerAuthInputPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerEnchantOptionsPacket.h b/src/mc/network/packet/PlayerEnchantOptionsPacket.h index 896139a5f9..adf1ad27a9 100644 --- a/src/mc/network/packet/PlayerEnchantOptionsPacket.h +++ b/src/mc/network/packet/PlayerEnchantOptionsPacket.h @@ -28,10 +28,10 @@ class PlayerEnchantOptionsPacket : public ::Packet { // ?getName@PlayerEnchantOptionsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerEnchantOptionsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerEnchantOptionsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerEnchantOptionsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerFogPacket.h b/src/mc/network/packet/PlayerFogPacket.h index aca60c6579..4598511c51 100644 --- a/src/mc/network/packet/PlayerFogPacket.h +++ b/src/mc/network/packet/PlayerFogPacket.h @@ -28,10 +28,10 @@ class PlayerFogPacket : public ::Packet { // ?getName@PlayerFogPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerFogPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerFogPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerFogPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerHotbarPacket.h b/src/mc/network/packet/PlayerHotbarPacket.h index 164f715ba8..6554a0cffa 100644 --- a/src/mc/network/packet/PlayerHotbarPacket.h +++ b/src/mc/network/packet/PlayerHotbarPacket.h @@ -31,10 +31,10 @@ class PlayerHotbarPacket : public ::Packet { // ?getName@PlayerHotbarPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerHotbarPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerHotbarPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerHotbarPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerInputPacket.h b/src/mc/network/packet/PlayerInputPacket.h index 80e9d9d2cc..e74f637b11 100644 --- a/src/mc/network/packet/PlayerInputPacket.h +++ b/src/mc/network/packet/PlayerInputPacket.h @@ -30,10 +30,10 @@ class PlayerInputPacket : public ::Packet { // ?getName@PlayerInputPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerInputPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerInputPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerInputPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerListPacket.h b/src/mc/network/packet/PlayerListPacket.h index 1d16f61bf4..5576ef1b0e 100644 --- a/src/mc/network/packet/PlayerListPacket.h +++ b/src/mc/network/packet/PlayerListPacket.h @@ -26,14 +26,14 @@ class PlayerListPacket : public ::Packet { // ?getName@PlayerListPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerListPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerListPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?read@PlayerListPacket@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& stream); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerListPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerSkinPacket.h b/src/mc/network/packet/PlayerSkinPacket.h index 7db2d6c6f2..36fd02a97d 100644 --- a/src/mc/network/packet/PlayerSkinPacket.h +++ b/src/mc/network/packet/PlayerSkinPacket.h @@ -32,14 +32,14 @@ class PlayerSkinPacket : public ::Packet { // ?getName@PlayerSkinPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerSkinPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerSkinPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?read@PlayerSkinPacket@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result read(class ReadOnlyBinaryStream& stream); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerSkinPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerStartItemCooldownPacket.h b/src/mc/network/packet/PlayerStartItemCooldownPacket.h index 05204534a2..ab9bc6a8a5 100644 --- a/src/mc/network/packet/PlayerStartItemCooldownPacket.h +++ b/src/mc/network/packet/PlayerStartItemCooldownPacket.h @@ -28,10 +28,10 @@ class PlayerStartItemCooldownPacket : public ::Packet { // ?getName@PlayerStartItemCooldownPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerStartItemCooldownPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerStartItemCooldownPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerStartItemCooldownPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PlayerToggleCrafterSlotRequestPacket.h b/src/mc/network/packet/PlayerToggleCrafterSlotRequestPacket.h index cf071ffe38..692e736b6d 100644 --- a/src/mc/network/packet/PlayerToggleCrafterSlotRequestPacket.h +++ b/src/mc/network/packet/PlayerToggleCrafterSlotRequestPacket.h @@ -30,10 +30,10 @@ class PlayerToggleCrafterSlotRequestPacket : public ::Packet { // ?getName@PlayerToggleCrafterSlotRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PlayerToggleCrafterSlotRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PlayerToggleCrafterSlotRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream&) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PlayerToggleCrafterSlotRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&); diff --git a/src/mc/network/packet/PositionTrackingDBClientRequestPacket.h b/src/mc/network/packet/PositionTrackingDBClientRequestPacket.h index 592c23ba01..bf51143942 100644 --- a/src/mc/network/packet/PositionTrackingDBClientRequestPacket.h +++ b/src/mc/network/packet/PositionTrackingDBClientRequestPacket.h @@ -34,10 +34,10 @@ class PositionTrackingDBClientRequestPacket : public ::Packet { // ?getName@PositionTrackingDBClientRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PositionTrackingDBClientRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PositionTrackingDBClientRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PositionTrackingDBClientRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PositionTrackingDBServerBroadcastPacket.h b/src/mc/network/packet/PositionTrackingDBServerBroadcastPacket.h index 4430f2d432..0a51603477 100644 --- a/src/mc/network/packet/PositionTrackingDBServerBroadcastPacket.h +++ b/src/mc/network/packet/PositionTrackingDBServerBroadcastPacket.h @@ -39,10 +39,10 @@ class PositionTrackingDBServerBroadcastPacket : public ::Packet { // ?getName@PositionTrackingDBServerBroadcastPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PositionTrackingDBServerBroadcastPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PositionTrackingDBServerBroadcastPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PositionTrackingDBServerBroadcastPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/PurchaseReceiptPacket.h b/src/mc/network/packet/PurchaseReceiptPacket.h index c48643ce72..80098fc040 100644 --- a/src/mc/network/packet/PurchaseReceiptPacket.h +++ b/src/mc/network/packet/PurchaseReceiptPacket.h @@ -27,10 +27,10 @@ class PurchaseReceiptPacket : public ::Packet { // ?getName@PurchaseReceiptPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@PurchaseReceiptPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@PurchaseReceiptPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@PurchaseReceiptPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/RefreshEntitlementsPacket.h b/src/mc/network/packet/RefreshEntitlementsPacket.h index e44954dd49..30b8416a4a 100644 --- a/src/mc/network/packet/RefreshEntitlementsPacket.h +++ b/src/mc/network/packet/RefreshEntitlementsPacket.h @@ -26,10 +26,10 @@ class RefreshEntitlementsPacket : public ::Packet { // ?getName@RefreshEntitlementsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RefreshEntitlementsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RefreshEntitlementsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream&) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RefreshEntitlementsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&); diff --git a/src/mc/network/packet/RemoveActorPacket.h b/src/mc/network/packet/RemoveActorPacket.h index 79694698a1..704375d3ae 100644 --- a/src/mc/network/packet/RemoveActorPacket.h +++ b/src/mc/network/packet/RemoveActorPacket.h @@ -28,10 +28,10 @@ class RemoveActorPacket : public ::Packet { // ?getName@RemoveActorPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RemoveActorPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RemoveActorPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RemoveActorPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/RemoveObjectivePacket.h b/src/mc/network/packet/RemoveObjectivePacket.h index b3cf86d137..4b5fa94d20 100644 --- a/src/mc/network/packet/RemoveObjectivePacket.h +++ b/src/mc/network/packet/RemoveObjectivePacket.h @@ -27,10 +27,10 @@ class RemoveObjectivePacket : public ::Packet { // ?getName@RemoveObjectivePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RemoveObjectivePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RemoveObjectivePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RemoveObjectivePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/RemoveVolumeEntityPacket.h b/src/mc/network/packet/RemoveVolumeEntityPacket.h index fd2157d3dd..c329b4463f 100644 --- a/src/mc/network/packet/RemoveVolumeEntityPacket.h +++ b/src/mc/network/packet/RemoveVolumeEntityPacket.h @@ -30,10 +30,10 @@ class RemoveVolumeEntityPacket : public ::Packet { // ?getName@RemoveVolumeEntityPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RemoveVolumeEntityPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RemoveVolumeEntityPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RemoveVolumeEntityPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/RequestAbilityPacket.h b/src/mc/network/packet/RequestAbilityPacket.h index b3dc075ffc..f0f8c609f4 100644 --- a/src/mc/network/packet/RequestAbilityPacket.h +++ b/src/mc/network/packet/RequestAbilityPacket.h @@ -39,10 +39,10 @@ class RequestAbilityPacket : public ::Packet { // ?getName@RequestAbilityPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RequestAbilityPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RequestAbilityPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RequestAbilityPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/RequestChunkRadiusPacket.h b/src/mc/network/packet/RequestChunkRadiusPacket.h index 2fa9dbdc2d..df272e2c97 100644 --- a/src/mc/network/packet/RequestChunkRadiusPacket.h +++ b/src/mc/network/packet/RequestChunkRadiusPacket.h @@ -27,10 +27,10 @@ class RequestChunkRadiusPacket : public ::Packet { // ?getName@RequestChunkRadiusPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RequestChunkRadiusPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RequestChunkRadiusPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RequestChunkRadiusPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/RequestNetworkSettingsPacket.h b/src/mc/network/packet/RequestNetworkSettingsPacket.h index e01c803840..e3d9d4c9d0 100644 --- a/src/mc/network/packet/RequestNetworkSettingsPacket.h +++ b/src/mc/network/packet/RequestNetworkSettingsPacket.h @@ -27,10 +27,10 @@ class RequestNetworkSettingsPacket : public ::Packet { // ?getName@RequestNetworkSettingsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RequestNetworkSettingsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RequestNetworkSettingsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RequestNetworkSettingsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/RequestPermissionsPacket.h b/src/mc/network/packet/RequestPermissionsPacket.h index 18638290a5..2df6972ec8 100644 --- a/src/mc/network/packet/RequestPermissionsPacket.h +++ b/src/mc/network/packet/RequestPermissionsPacket.h @@ -33,10 +33,10 @@ class RequestPermissionsPacket : public ::Packet { // ?getName@RequestPermissionsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RequestPermissionsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RequestPermissionsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@RequestPermissionsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ResourcePackChunkDataPacket.h b/src/mc/network/packet/ResourcePackChunkDataPacket.h index 958e1a8820..1988cd08c6 100644 --- a/src/mc/network/packet/ResourcePackChunkDataPacket.h +++ b/src/mc/network/packet/ResourcePackChunkDataPacket.h @@ -30,10 +30,10 @@ class ResourcePackChunkDataPacket : public ::Packet { // ?getName@ResourcePackChunkDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ResourcePackChunkDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ResourcePackChunkDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ResourcePackChunkDataPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ResourcePackChunkRequestPacket.h b/src/mc/network/packet/ResourcePackChunkRequestPacket.h index 170fa66138..257f319c8e 100644 --- a/src/mc/network/packet/ResourcePackChunkRequestPacket.h +++ b/src/mc/network/packet/ResourcePackChunkRequestPacket.h @@ -28,10 +28,10 @@ class ResourcePackChunkRequestPacket : public ::Packet { // ?getName@ResourcePackChunkRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ResourcePackChunkRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ResourcePackChunkRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ResourcePackChunkRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ResourcePackClientResponsePacket.h b/src/mc/network/packet/ResourcePackClientResponsePacket.h index 5082d5e3a3..287bdecb88 100644 --- a/src/mc/network/packet/ResourcePackClientResponsePacket.h +++ b/src/mc/network/packet/ResourcePackClientResponsePacket.h @@ -30,10 +30,10 @@ class ResourcePackClientResponsePacket : public ::Packet { // ?getName@ResourcePackClientResponsePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ResourcePackClientResponsePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ResourcePackClientResponsePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ResourcePackClientResponsePacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ResourcePackDataInfoPacket.h b/src/mc/network/packet/ResourcePackDataInfoPacket.h index 9f05c8111c..2f6675f3e0 100644 --- a/src/mc/network/packet/ResourcePackDataInfoPacket.h +++ b/src/mc/network/packet/ResourcePackDataInfoPacket.h @@ -35,10 +35,10 @@ class ResourcePackDataInfoPacket : public ::Packet { // ?getName@ResourcePackDataInfoPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ResourcePackDataInfoPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ResourcePackDataInfoPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ResourcePackDataInfoPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ResourcePackStackPacket.h b/src/mc/network/packet/ResourcePackStackPacket.h index bc4f139d47..d64a118b26 100644 --- a/src/mc/network/packet/ResourcePackStackPacket.h +++ b/src/mc/network/packet/ResourcePackStackPacket.h @@ -34,10 +34,10 @@ class ResourcePackStackPacket : public ::Packet { // ?getName@ResourcePackStackPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ResourcePackStackPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ResourcePackStackPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ResourcePackStackPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ResourcePacksInfoPacket.h b/src/mc/network/packet/ResourcePacksInfoPacket.h index 20d334eb29..e82891dc5c 100644 --- a/src/mc/network/packet/ResourcePacksInfoPacket.h +++ b/src/mc/network/packet/ResourcePacksInfoPacket.h @@ -29,10 +29,10 @@ class ResourcePacksInfoPacket : public ::Packet { // ?getName@ResourcePacksInfoPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ResourcePacksInfoPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ResourcePacksInfoPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ResourcePacksInfoPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); @@ -40,14 +40,14 @@ class ResourcePacksInfoPacket : public ::Packet { MCAPI ResourcePacksInfoPacket(); // symbol: - // ??0ResourcePacksInfoPacket@@QEAA@_NAEAV?$vector@UPackInfoData@@V?$allocator@UPackInfoData@@@std@@@std@@10$$QEAV?$vector@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@V?$allocator@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@@2@@2@@Z - MCAPI - ResourcePacksInfoPacket( - bool resourcePackRequired, - std::vector& behaviorPacks, - std::vector& resourcePacks, - bool forceServerPacksEnabled, - std::vector>&& cdnUrls + // ??0ResourcePacksInfoPacket@@QEAA@_NAEAV?$vector@UPackInfoData@@V?$allocator@UPackInfoData@@@std@@@std@@10$$QEAV?$vector@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@V?$allocator@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@@2@@2@0@Z + MCAPI ResourcePacksInfoPacket( + bool, + std::vector&, + std::vector&, + bool, + std::vector>&&, + bool ); // NOLINTEND diff --git a/src/mc/network/packet/RespawnPacket.h b/src/mc/network/packet/RespawnPacket.h index 88c8fb910d..d67dae2ec4 100644 --- a/src/mc/network/packet/RespawnPacket.h +++ b/src/mc/network/packet/RespawnPacket.h @@ -32,10 +32,10 @@ class RespawnPacket : public ::Packet { // vIndex: 2, symbol: ?getName@RespawnPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@RespawnPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@RespawnPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: ?_read@RespawnPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@RespawnPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0RespawnPacket@@QEAA@XZ diff --git a/src/mc/network/packet/ScriptMessagePacket.h b/src/mc/network/packet/ScriptMessagePacket.h index 521307f6d6..df0adaead7 100644 --- a/src/mc/network/packet/ScriptMessagePacket.h +++ b/src/mc/network/packet/ScriptMessagePacket.h @@ -28,10 +28,10 @@ class ScriptMessagePacket : public ::Packet { // ?getName@ScriptMessagePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ScriptMessagePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ScriptMessagePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ScriptMessagePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ServerSettingsRequestPacket.h b/src/mc/network/packet/ServerSettingsRequestPacket.h index 9a67bc178e..08ad10eb2a 100644 --- a/src/mc/network/packet/ServerSettingsRequestPacket.h +++ b/src/mc/network/packet/ServerSettingsRequestPacket.h @@ -25,10 +25,10 @@ class ServerSettingsRequestPacket : public ::Packet { // ?getName@ServerSettingsRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ServerSettingsRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ServerSettingsRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ServerSettingsRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ServerSettingsResponsePacket.h b/src/mc/network/packet/ServerSettingsResponsePacket.h index 44675ba222..d95f59d7d5 100644 --- a/src/mc/network/packet/ServerSettingsResponsePacket.h +++ b/src/mc/network/packet/ServerSettingsResponsePacket.h @@ -28,10 +28,10 @@ class ServerSettingsResponsePacket : public ::Packet { // ?getName@ServerSettingsResponsePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ServerSettingsResponsePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ServerSettingsResponsePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ServerSettingsResponsePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ServerStatsPacket.h b/src/mc/network/packet/ServerStatsPacket.h index dfb7baeee2..9042283ac8 100644 --- a/src/mc/network/packet/ServerStatsPacket.h +++ b/src/mc/network/packet/ServerStatsPacket.h @@ -29,10 +29,10 @@ class ServerStatsPacket : public ::Packet { // ?getName@ServerStatsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ServerStatsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ServerStatsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ServerStatsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ServerToClientHandshakePacket.h b/src/mc/network/packet/ServerToClientHandshakePacket.h index e96b59c78c..e2e05a3808 100644 --- a/src/mc/network/packet/ServerToClientHandshakePacket.h +++ b/src/mc/network/packet/ServerToClientHandshakePacket.h @@ -27,10 +27,10 @@ class ServerToClientHandshakePacket : public ::Packet { // ?getName@ServerToClientHandshakePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ServerToClientHandshakePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ServerToClientHandshakePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ServerToClientHandshakePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetActorDataPacket.h b/src/mc/network/packet/SetActorDataPacket.h index dc211c2d2f..21cecc4dbd 100644 --- a/src/mc/network/packet/SetActorDataPacket.h +++ b/src/mc/network/packet/SetActorDataPacket.h @@ -33,10 +33,10 @@ class SetActorDataPacket : public ::Packet { // ?getName@SetActorDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetActorDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetActorDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetActorDataPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetActorLinkPacket.h b/src/mc/network/packet/SetActorLinkPacket.h index dfda7e2e03..db8467ab64 100644 --- a/src/mc/network/packet/SetActorLinkPacket.h +++ b/src/mc/network/packet/SetActorLinkPacket.h @@ -28,10 +28,10 @@ class SetActorLinkPacket : public ::Packet { // ?getName@SetActorLinkPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetActorLinkPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetActorLinkPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetActorLinkPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetActorMotionPacket.h b/src/mc/network/packet/SetActorMotionPacket.h index 16008b6b7e..653c218532 100644 --- a/src/mc/network/packet/SetActorMotionPacket.h +++ b/src/mc/network/packet/SetActorMotionPacket.h @@ -30,10 +30,10 @@ class SetActorMotionPacket : public ::Packet { // ?getName@SetActorMotionPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetActorMotionPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetActorMotionPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetActorMotionPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetCommandsEnabledPacket.h b/src/mc/network/packet/SetCommandsEnabledPacket.h index 0b07fa2ef6..21ab589e3c 100644 --- a/src/mc/network/packet/SetCommandsEnabledPacket.h +++ b/src/mc/network/packet/SetCommandsEnabledPacket.h @@ -27,10 +27,10 @@ class SetCommandsEnabledPacket : public ::Packet { // ?getName@SetCommandsEnabledPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetCommandsEnabledPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetCommandsEnabledPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetCommandsEnabledPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetDefaultGameTypePacket.h b/src/mc/network/packet/SetDefaultGameTypePacket.h index eead2f221e..48bfaec4c4 100644 --- a/src/mc/network/packet/SetDefaultGameTypePacket.h +++ b/src/mc/network/packet/SetDefaultGameTypePacket.h @@ -29,10 +29,10 @@ class SetDefaultGameTypePacket : public ::Packet { // ?getName@SetDefaultGameTypePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetDefaultGameTypePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetDefaultGameTypePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetDefaultGameTypePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetDifficultyPacket.h b/src/mc/network/packet/SetDifficultyPacket.h index b1b029140a..43b5b4b4b8 100644 --- a/src/mc/network/packet/SetDifficultyPacket.h +++ b/src/mc/network/packet/SetDifficultyPacket.h @@ -29,10 +29,10 @@ class SetDifficultyPacket : public ::Packet { // ?getName@SetDifficultyPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetDifficultyPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetDifficultyPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetDifficultyPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetDisplayObjectivePacket.h b/src/mc/network/packet/SetDisplayObjectivePacket.h index a7416e1d5e..2868fc0a29 100644 --- a/src/mc/network/packet/SetDisplayObjectivePacket.h +++ b/src/mc/network/packet/SetDisplayObjectivePacket.h @@ -33,10 +33,10 @@ class SetDisplayObjectivePacket : public ::Packet { // ?getName@SetDisplayObjectivePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetDisplayObjectivePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetDisplayObjectivePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetDisplayObjectivePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetHealthPacket.h b/src/mc/network/packet/SetHealthPacket.h index 39987928f1..6773b1d48d 100644 --- a/src/mc/network/packet/SetHealthPacket.h +++ b/src/mc/network/packet/SetHealthPacket.h @@ -27,10 +27,10 @@ class SetHealthPacket : public ::Packet { // ?getName@SetHealthPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetHealthPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetHealthPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetHealthPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetHudPacket.h b/src/mc/network/packet/SetHudPacket.h index 9b33657d7f..5e60e288ce 100644 --- a/src/mc/network/packet/SetHudPacket.h +++ b/src/mc/network/packet/SetHudPacket.h @@ -6,6 +6,8 @@ // auto generated inclusion list #include "mc/deps/core/common/bedrock/Result.h" +#include "mc/enums/HudElement.h" +#include "mc/enums/HudVisibility.h" #include "mc/enums/MinecraftPacketIds.h" #include "mc/network/packet/Packet.h" @@ -29,14 +31,17 @@ class SetHudPacket : public ::Packet { // vIndex: 2, symbol: ?getName@SetHudPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetHudPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetHudPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream&) const; - // vIndex: 7, symbol: ?_read@SetHudPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@SetHudPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&); // symbol: ??0SetHudPacket@@QEAA@XZ MCAPI SetHudPacket(); + // symbol: ??0SetHudPacket@@QEAA@V?$vector@W4HudElement@@V?$allocator@W4HudElement@@@std@@@std@@W4HudVisibility@@@Z + MCAPI SetHudPacket(std::vector<::HudElement>, ::HudVisibility); + // NOLINTEND }; diff --git a/src/mc/network/packet/SetLastHurtByPacket.h b/src/mc/network/packet/SetLastHurtByPacket.h index d419d9c902..7c3b34b681 100644 --- a/src/mc/network/packet/SetLastHurtByPacket.h +++ b/src/mc/network/packet/SetLastHurtByPacket.h @@ -29,10 +29,10 @@ class SetLastHurtByPacket : public ::Packet { // ?getName@SetLastHurtByPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetLastHurtByPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetLastHurtByPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetLastHurtByPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetLocalPlayerAsInitializedPacket.h b/src/mc/network/packet/SetLocalPlayerAsInitializedPacket.h index 6aaf87f6c4..5c93f82f35 100644 --- a/src/mc/network/packet/SetLocalPlayerAsInitializedPacket.h +++ b/src/mc/network/packet/SetLocalPlayerAsInitializedPacket.h @@ -28,10 +28,10 @@ class SetLocalPlayerAsInitializedPacket : public ::Packet { // ?getName@SetLocalPlayerAsInitializedPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetLocalPlayerAsInitializedPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetLocalPlayerAsInitializedPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetLocalPlayerAsInitializedPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetPlayerGameTypePacket.h b/src/mc/network/packet/SetPlayerGameTypePacket.h index ef72f02b53..5b55060806 100644 --- a/src/mc/network/packet/SetPlayerGameTypePacket.h +++ b/src/mc/network/packet/SetPlayerGameTypePacket.h @@ -28,10 +28,10 @@ class SetPlayerGameTypePacket : public ::Packet { // ?getName@SetPlayerGameTypePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetPlayerGameTypePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetPlayerGameTypePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetPlayerGameTypePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetPlayerInventoryOptionsPacket.h b/src/mc/network/packet/SetPlayerInventoryOptionsPacket.h index 38bee0c5cc..56aae2b955 100644 --- a/src/mc/network/packet/SetPlayerInventoryOptionsPacket.h +++ b/src/mc/network/packet/SetPlayerInventoryOptionsPacket.h @@ -55,10 +55,10 @@ class SetPlayerInventoryOptionsPacket : public ::Packet { // ?getName@SetPlayerInventoryOptionsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetPlayerInventoryOptionsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetPlayerInventoryOptionsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream&) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetPlayerInventoryOptionsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&); diff --git a/src/mc/network/packet/SetScorePacket.h b/src/mc/network/packet/SetScorePacket.h index 64307d425d..79edade593 100644 --- a/src/mc/network/packet/SetScorePacket.h +++ b/src/mc/network/packet/SetScorePacket.h @@ -32,10 +32,10 @@ class SetScorePacket : public ::Packet { // ?getName@SetScorePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetScorePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetScorePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetScorePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetScoreboardIdentityPacket.h b/src/mc/network/packet/SetScoreboardIdentityPacket.h index c610c9facf..e2b5d38871 100644 --- a/src/mc/network/packet/SetScoreboardIdentityPacket.h +++ b/src/mc/network/packet/SetScoreboardIdentityPacket.h @@ -31,10 +31,10 @@ class SetScoreboardIdentityPacket : public ::Packet { // ?getName@SetScoreboardIdentityPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetScoreboardIdentityPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetScoreboardIdentityPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetScoreboardIdentityPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetSpawnPositionPacket.h b/src/mc/network/packet/SetSpawnPositionPacket.h index 735324eca0..b48cd3cf8a 100644 --- a/src/mc/network/packet/SetSpawnPositionPacket.h +++ b/src/mc/network/packet/SetSpawnPositionPacket.h @@ -35,10 +35,10 @@ class SetSpawnPositionPacket : public ::Packet { // ?getName@SetSpawnPositionPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetSpawnPositionPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetSpawnPositionPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetSpawnPositionPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SetTimePacket.h b/src/mc/network/packet/SetTimePacket.h index 8372f319a8..e2d1debc62 100644 --- a/src/mc/network/packet/SetTimePacket.h +++ b/src/mc/network/packet/SetTimePacket.h @@ -26,10 +26,10 @@ class SetTimePacket : public ::Packet { // vIndex: 2, symbol: ?getName@SetTimePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetTimePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetTimePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: ?_read@SetTimePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@SetTimePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0SetTimePacket@@QEAA@XZ diff --git a/src/mc/network/packet/SetTitlePacket.h b/src/mc/network/packet/SetTitlePacket.h index 908453cd06..4b6bf88a05 100644 --- a/src/mc/network/packet/SetTitlePacket.h +++ b/src/mc/network/packet/SetTitlePacket.h @@ -46,10 +46,10 @@ class SetTitlePacket : public ::Packet { // ?getName@SetTitlePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SetTitlePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SetTitlePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SetTitlePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SettingsCommandPacket.h b/src/mc/network/packet/SettingsCommandPacket.h index 81bf5f5a48..0366f3a9f5 100644 --- a/src/mc/network/packet/SettingsCommandPacket.h +++ b/src/mc/network/packet/SettingsCommandPacket.h @@ -28,10 +28,10 @@ class SettingsCommandPacket : public ::Packet { // ?getName@SettingsCommandPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SettingsCommandPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SettingsCommandPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SettingsCommandPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ShowCreditsPacket.h b/src/mc/network/packet/ShowCreditsPacket.h index 534137c991..931bab3415 100644 --- a/src/mc/network/packet/ShowCreditsPacket.h +++ b/src/mc/network/packet/ShowCreditsPacket.h @@ -36,10 +36,10 @@ class ShowCreditsPacket : public ::Packet { // ?getName@ShowCreditsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ShowCreditsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ShowCreditsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ShowCreditsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ShowProfilePacket.h b/src/mc/network/packet/ShowProfilePacket.h index 054c67e293..3cfd2d3f87 100644 --- a/src/mc/network/packet/ShowProfilePacket.h +++ b/src/mc/network/packet/ShowProfilePacket.h @@ -27,10 +27,10 @@ class ShowProfilePacket : public ::Packet { // ?getName@ShowProfilePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ShowProfilePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ShowProfilePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ShowProfilePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ShowStoreOfferPacket.h b/src/mc/network/packet/ShowStoreOfferPacket.h index b42e8af103..f212ef3c4a 100644 --- a/src/mc/network/packet/ShowStoreOfferPacket.h +++ b/src/mc/network/packet/ShowStoreOfferPacket.h @@ -6,8 +6,14 @@ // auto generated inclusion list #include "mc/deps/core/common/bedrock/Result.h" #include "mc/enums/MinecraftPacketIds.h" +#include "mc/enums/ShowStoreOfferRedirectType.h" #include "mc/network/packet/Packet.h" +// auto generated forward declare list +// clang-format off +namespace mce { class UUID; } +// clang-format on + class ShowStoreOfferPacket : public ::Packet { public: enum class RedirectType : uchar { @@ -24,8 +30,8 @@ class ShowStoreOfferPacket : public ::Packet { public: // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1ShowStoreOfferPacket@@UEAA@XZ - virtual ~ShowStoreOfferPacket() = default; + // vIndex: 0, symbol: ??1ShowStoreOfferPacket@@UEAA@XZ + virtual ~ShowStoreOfferPacket(); // vIndex: 1, symbol: ?getId@ShowStoreOfferPacket@@UEBA?AW4MinecraftPacketIds@@XZ virtual ::MinecraftPacketIds getId() const; @@ -34,15 +40,18 @@ class ShowStoreOfferPacket : public ::Packet { // ?getName@ShowStoreOfferPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ShowStoreOfferPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ShowStoreOfferPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ShowStoreOfferPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0ShowStoreOfferPacket@@QEAA@XZ MCAPI ShowStoreOfferPacket(); + // symbol: ??0ShowStoreOfferPacket@@QEAA@AEBVUUID@mce@@W4ShowStoreOfferRedirectType@@@Z + MCAPI ShowStoreOfferPacket(class mce::UUID const&, ::ShowStoreOfferRedirectType); + // NOLINTEND }; diff --git a/src/mc/network/packet/SimpleEventPacket.h b/src/mc/network/packet/SimpleEventPacket.h index 3bd44c2f7b..63c6216db9 100644 --- a/src/mc/network/packet/SimpleEventPacket.h +++ b/src/mc/network/packet/SimpleEventPacket.h @@ -36,10 +36,10 @@ class SimpleEventPacket : public ::Packet { // ?getName@SimpleEventPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SimpleEventPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SimpleEventPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SimpleEventPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SimulationTypePacket.h b/src/mc/network/packet/SimulationTypePacket.h index c1d064e9cf..43aaf3460e 100644 --- a/src/mc/network/packet/SimulationTypePacket.h +++ b/src/mc/network/packet/SimulationTypePacket.h @@ -28,10 +28,10 @@ class SimulationTypePacket : public ::Packet { // ?getName@SimulationTypePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SimulationTypePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SimulationTypePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SimulationTypePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SpawnExperienceOrbPacket.h b/src/mc/network/packet/SpawnExperienceOrbPacket.h index d72c3a0741..5c414c3db0 100644 --- a/src/mc/network/packet/SpawnExperienceOrbPacket.h +++ b/src/mc/network/packet/SpawnExperienceOrbPacket.h @@ -29,10 +29,10 @@ class SpawnExperienceOrbPacket : public ::Packet { // ?getName@SpawnExperienceOrbPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SpawnExperienceOrbPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SpawnExperienceOrbPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SpawnExperienceOrbPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SpawnParticleEffectPacket.h b/src/mc/network/packet/SpawnParticleEffectPacket.h index 3dcbd7154c..b640801916 100644 --- a/src/mc/network/packet/SpawnParticleEffectPacket.h +++ b/src/mc/network/packet/SpawnParticleEffectPacket.h @@ -34,10 +34,10 @@ class SpawnParticleEffectPacket : public ::Packet { // ?getName@SpawnParticleEffectPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SpawnParticleEffectPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SpawnParticleEffectPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SpawnParticleEffectPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/StartGamePacket.h b/src/mc/network/packet/StartGamePacket.h index 9003d915fa..8f37715941 100644 --- a/src/mc/network/packet/StartGamePacket.h +++ b/src/mc/network/packet/StartGamePacket.h @@ -62,10 +62,10 @@ class StartGamePacket : public ::Packet { // ?getName@StartGamePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@StartGamePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@StartGamePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@StartGamePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/StopSoundPacket.h b/src/mc/network/packet/StopSoundPacket.h index 4935c61c84..a14db9b281 100644 --- a/src/mc/network/packet/StopSoundPacket.h +++ b/src/mc/network/packet/StopSoundPacket.h @@ -28,10 +28,10 @@ class StopSoundPacket : public ::Packet { // ?getName@StopSoundPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@StopSoundPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@StopSoundPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@StopSoundPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/StructureBlockUpdatePacket.h b/src/mc/network/packet/StructureBlockUpdatePacket.h index ff773c8bac..5b11c20b51 100644 --- a/src/mc/network/packet/StructureBlockUpdatePacket.h +++ b/src/mc/network/packet/StructureBlockUpdatePacket.h @@ -31,10 +31,10 @@ class StructureBlockUpdatePacket : public ::Packet { // ?getName@StructureBlockUpdatePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@StructureBlockUpdatePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@StructureBlockUpdatePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@StructureBlockUpdatePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/StructureTemplateDataRequestPacket.h b/src/mc/network/packet/StructureTemplateDataRequestPacket.h index e1eac91f7d..f8ad2299c3 100644 --- a/src/mc/network/packet/StructureTemplateDataRequestPacket.h +++ b/src/mc/network/packet/StructureTemplateDataRequestPacket.h @@ -34,10 +34,10 @@ class StructureTemplateDataRequestPacket : public ::Packet { // ?getName@StructureTemplateDataRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@StructureTemplateDataRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@StructureTemplateDataRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@StructureTemplateDataRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/StructureTemplateDataResponsePacket.h b/src/mc/network/packet/StructureTemplateDataResponsePacket.h index c0231628b4..9f5adac5f9 100644 --- a/src/mc/network/packet/StructureTemplateDataResponsePacket.h +++ b/src/mc/network/packet/StructureTemplateDataResponsePacket.h @@ -32,10 +32,10 @@ class StructureTemplateDataResponsePacket : public ::Packet { // ?getName@StructureTemplateDataResponsePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@StructureTemplateDataResponsePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@StructureTemplateDataResponsePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@StructureTemplateDataResponsePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SubChunkPacket.h b/src/mc/network/packet/SubChunkPacket.h index 7a264de805..f69fbefccd 100644 --- a/src/mc/network/packet/SubChunkPacket.h +++ b/src/mc/network/packet/SubChunkPacket.h @@ -117,10 +117,10 @@ class SubChunkPacket : public ::Packet { // ?getName@SubChunkPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SubChunkPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SubChunkPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SubChunkPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SubChunkRequestPacket.h b/src/mc/network/packet/SubChunkRequestPacket.h index 8dc01b508a..63cc737ee4 100644 --- a/src/mc/network/packet/SubChunkRequestPacket.h +++ b/src/mc/network/packet/SubChunkRequestPacket.h @@ -38,10 +38,10 @@ class SubChunkRequestPacket : public ::Packet { // ?getName@SubChunkRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SubChunkRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SubChunkRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SubChunkRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SubClientLoginPacket.h b/src/mc/network/packet/SubClientLoginPacket.h index cb9a3a9ed3..1097f03388 100644 --- a/src/mc/network/packet/SubClientLoginPacket.h +++ b/src/mc/network/packet/SubClientLoginPacket.h @@ -28,13 +28,13 @@ class SubClientLoginPacket : public ::Packet { // ?getName@SubClientLoginPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SubClientLoginPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SubClientLoginPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 5, symbol: ?disallowBatching@SubClientLoginPacket@@UEBA_NXZ + // vIndex: 6, symbol: ?disallowBatching@SubClientLoginPacket@@UEBA_NXZ virtual bool disallowBatching() const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SubClientLoginPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/SyncActorPropertyPacket.h b/src/mc/network/packet/SyncActorPropertyPacket.h index bb93563d4c..217f8aeb3d 100644 --- a/src/mc/network/packet/SyncActorPropertyPacket.h +++ b/src/mc/network/packet/SyncActorPropertyPacket.h @@ -28,10 +28,10 @@ class SyncActorPropertyPacket : public ::Packet { // ?getName@SyncActorPropertyPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@SyncActorPropertyPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@SyncActorPropertyPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@SyncActorPropertyPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/TakeItemActorPacket.h b/src/mc/network/packet/TakeItemActorPacket.h index 8c9a0dc8d8..6163e8c6f4 100644 --- a/src/mc/network/packet/TakeItemActorPacket.h +++ b/src/mc/network/packet/TakeItemActorPacket.h @@ -29,10 +29,10 @@ class TakeItemActorPacket : public ::Packet { // ?getName@TakeItemActorPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@TakeItemActorPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@TakeItemActorPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@TakeItemActorPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/TextPacket.h b/src/mc/network/packet/TextPacket.h index 1935307bf5..e81eb3ff41 100644 --- a/src/mc/network/packet/TextPacket.h +++ b/src/mc/network/packet/TextPacket.h @@ -38,10 +38,10 @@ class TextPacket : public ::Packet { // vIndex: 2, symbol: ?getName@TextPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@TextPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@TextPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: ?_read@TextPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 8, symbol: ?_read@TextPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); // symbol: ??0TextPacket@@QEAA@XZ diff --git a/src/mc/network/packet/TickSyncPacket.h b/src/mc/network/packet/TickSyncPacket.h index 2ba0a1cd5d..48b62d4da3 100644 --- a/src/mc/network/packet/TickSyncPacket.h +++ b/src/mc/network/packet/TickSyncPacket.h @@ -29,10 +29,10 @@ class TickSyncPacket : public ::Packet { // ?getName@TickSyncPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@TickSyncPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@TickSyncPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@TickSyncPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/TickingAreasLoadStatusPacket.h b/src/mc/network/packet/TickingAreasLoadStatusPacket.h index 5d450495f4..f45ecd63a8 100644 --- a/src/mc/network/packet/TickingAreasLoadStatusPacket.h +++ b/src/mc/network/packet/TickingAreasLoadStatusPacket.h @@ -27,10 +27,10 @@ class TickingAreasLoadStatusPacket : public ::Packet { // ?getName@TickingAreasLoadStatusPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@TickingAreasLoadStatusPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@TickingAreasLoadStatusPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@TickingAreasLoadStatusPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/ToastRequestPacket.h b/src/mc/network/packet/ToastRequestPacket.h index 89867f003c..642c0b41a0 100644 --- a/src/mc/network/packet/ToastRequestPacket.h +++ b/src/mc/network/packet/ToastRequestPacket.h @@ -28,10 +28,10 @@ class ToastRequestPacket : public ::Packet { // ?getName@ToastRequestPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@ToastRequestPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@ToastRequestPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@ToastRequestPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/TransferPacket.h b/src/mc/network/packet/TransferPacket.h index d6e060fc33..c0c8cd1e23 100644 --- a/src/mc/network/packet/TransferPacket.h +++ b/src/mc/network/packet/TransferPacket.h @@ -28,10 +28,10 @@ class TransferPacket : public ::Packet { // ?getName@TransferPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@TransferPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@TransferPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@TransferPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/TrimDataPacket.h b/src/mc/network/packet/TrimDataPacket.h index 8860185aac..f643c4e84d 100644 --- a/src/mc/network/packet/TrimDataPacket.h +++ b/src/mc/network/packet/TrimDataPacket.h @@ -30,10 +30,10 @@ class TrimDataPacket : public ::Packet { // ?getName@TrimDataPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@TrimDataPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@TrimDataPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@TrimDataPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UnlockedRecipesPacket.h b/src/mc/network/packet/UnlockedRecipesPacket.h index 6a9bddbe2c..895f8fd801 100644 --- a/src/mc/network/packet/UnlockedRecipesPacket.h +++ b/src/mc/network/packet/UnlockedRecipesPacket.h @@ -38,10 +38,10 @@ class UnlockedRecipesPacket : public ::Packet { // ?getName@UnlockedRecipesPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UnlockedRecipesPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UnlockedRecipesPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UnlockedRecipesPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateAbilitiesPacket.h b/src/mc/network/packet/UpdateAbilitiesPacket.h index 4fb58f2837..63cc9aa2d6 100644 --- a/src/mc/network/packet/UpdateAbilitiesPacket.h +++ b/src/mc/network/packet/UpdateAbilitiesPacket.h @@ -28,10 +28,10 @@ class UpdateAbilitiesPacket : public ::Packet { // ?getName@UpdateAbilitiesPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateAbilitiesPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateAbilitiesPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateAbilitiesPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateAdventureSettingsPacket.h b/src/mc/network/packet/UpdateAdventureSettingsPacket.h index 81d6f02c71..526227213b 100644 --- a/src/mc/network/packet/UpdateAdventureSettingsPacket.h +++ b/src/mc/network/packet/UpdateAdventureSettingsPacket.h @@ -28,10 +28,10 @@ class UpdateAdventureSettingsPacket : public ::Packet { // ?getName@UpdateAdventureSettingsPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateAdventureSettingsPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateAdventureSettingsPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateAdventureSettingsPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateAttributesPacket.h b/src/mc/network/packet/UpdateAttributesPacket.h index b30bde5163..dd1fdcc780 100644 --- a/src/mc/network/packet/UpdateAttributesPacket.h +++ b/src/mc/network/packet/UpdateAttributesPacket.h @@ -11,37 +11,6 @@ #include "mc/network/packet/Packet.h" class UpdateAttributesPacket : public ::Packet { -public: - // UpdateAttributesPacket inner types define - struct AttributeData { - public: - float mCurrentValue; // this+0x0 - float mMinValue; // this+0x4 - float mMaxValue; // this+0x8 - float mDefaultValue; // this+0xC - HashedString mName; // this+0x10 - std::vector mModifiers; // this+0x40 - - // prevent constructor by default - AttributeData& operator=(AttributeData const&); - AttributeData(AttributeData const&); - AttributeData(); - - public: - // NOLINTBEGIN - // symbol: ??0AttributeData@UpdateAttributesPacket@@QEAA@$$QEAU01@@Z - MCAPI AttributeData(struct AttributeData&&); - - // symbol: - // ?read@AttributeData@UpdateAttributesPacket@@QEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z - MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream& stream); - - // symbol: ??1AttributeData@UpdateAttributesPacket@@QEAA@XZ - MCAPI ~AttributeData(); - - // NOLINTEND - }; - public: ActorRuntimeID mRuntimeId; // this+0x30 std::vector mAttributeData; // this+0x38 @@ -63,10 +32,10 @@ class UpdateAttributesPacket : public ::Packet { // ?getName@UpdateAttributesPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateAttributesPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateAttributesPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateAttributesPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateBlockPacket.h b/src/mc/network/packet/UpdateBlockPacket.h index cc26c5b550..f4cd7f3abd 100644 --- a/src/mc/network/packet/UpdateBlockPacket.h +++ b/src/mc/network/packet/UpdateBlockPacket.h @@ -35,10 +35,10 @@ class UpdateBlockPacket : public ::Packet { // ?getName@UpdateBlockPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateBlockPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateBlockPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateBlockPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateBlockSyncedPacket.h b/src/mc/network/packet/UpdateBlockSyncedPacket.h index 293bf03285..8d59fc758b 100644 --- a/src/mc/network/packet/UpdateBlockSyncedPacket.h +++ b/src/mc/network/packet/UpdateBlockSyncedPacket.h @@ -28,10 +28,10 @@ class UpdateBlockSyncedPacket : public ::UpdateBlockPacket { // ?getName@UpdateBlockSyncedPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateBlockSyncedPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateBlockSyncedPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateBlockSyncedPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateClientInputLocksPacket.h b/src/mc/network/packet/UpdateClientInputLocksPacket.h index 6bb0c3bc56..3f86a1e4db 100644 --- a/src/mc/network/packet/UpdateClientInputLocksPacket.h +++ b/src/mc/network/packet/UpdateClientInputLocksPacket.h @@ -29,10 +29,10 @@ class UpdateClientInputLocksPacket : public ::Packet { // ?getName@UpdateClientInputLocksPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateClientInputLocksPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateClientInputLocksPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateClientInputLocksPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateEquipPacket.h b/src/mc/network/packet/UpdateEquipPacket.h index 58bea05ac7..834d97c4f6 100644 --- a/src/mc/network/packet/UpdateEquipPacket.h +++ b/src/mc/network/packet/UpdateEquipPacket.h @@ -37,10 +37,10 @@ class UpdateEquipPacket : public ::Packet { // ?getName@UpdateEquipPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateEquipPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateEquipPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& bitStream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateEquipPacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdatePlayerGameTypePacket.h b/src/mc/network/packet/UpdatePlayerGameTypePacket.h index 2a8ce9ae06..bb95081e82 100644 --- a/src/mc/network/packet/UpdatePlayerGameTypePacket.h +++ b/src/mc/network/packet/UpdatePlayerGameTypePacket.h @@ -31,10 +31,10 @@ class UpdatePlayerGameTypePacket : public ::Packet { // ?getName@UpdatePlayerGameTypePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdatePlayerGameTypePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdatePlayerGameTypePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdatePlayerGameTypePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateSoftEnumPacket.h b/src/mc/network/packet/UpdateSoftEnumPacket.h index 6cb3404d00..92939a1af3 100644 --- a/src/mc/network/packet/UpdateSoftEnumPacket.h +++ b/src/mc/network/packet/UpdateSoftEnumPacket.h @@ -31,10 +31,10 @@ class UpdateSoftEnumPacket : public ::Packet { // ?getName@UpdateSoftEnumPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateSoftEnumPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateSoftEnumPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateSoftEnumPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateSubChunkBlocksPacket.h b/src/mc/network/packet/UpdateSubChunkBlocksPacket.h index 92bf9ca5d7..ca85cbc62d 100644 --- a/src/mc/network/packet/UpdateSubChunkBlocksPacket.h +++ b/src/mc/network/packet/UpdateSubChunkBlocksPacket.h @@ -87,10 +87,10 @@ class UpdateSubChunkBlocksPacket : public ::Packet { // ?getName@UpdateSubChunkBlocksPacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateSubChunkBlocksPacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateSubChunkBlocksPacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& stream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateSubChunkBlocksPacket@@MEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/network/packet/UpdateTradePacket.h b/src/mc/network/packet/UpdateTradePacket.h index ff3ad8a6d6..9a4dffdf49 100644 --- a/src/mc/network/packet/UpdateTradePacket.h +++ b/src/mc/network/packet/UpdateTradePacket.h @@ -42,10 +42,10 @@ class UpdateTradePacket : public ::Packet { // ?getName@UpdateTradePacket@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getName() const; - // vIndex: 3, symbol: ?write@UpdateTradePacket@@UEBAXAEAVBinaryStream@@@Z + // vIndex: 4, symbol: ?write@UpdateTradePacket@@UEBAXAEAVBinaryStream@@@Z virtual void write(class BinaryStream& bitStream) const; - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?_read@UpdateTradePacket@@EEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z virtual class Bedrock::Result _read(class ReadOnlyBinaryStream& stream); diff --git a/src/mc/options/FeatureToggles.h b/src/mc/options/FeatureToggles.h index cf1a36307a..93aed6f11d 100644 --- a/src/mc/options/FeatureToggles.h +++ b/src/mc/options/FeatureToggles.h @@ -75,9 +75,6 @@ class FeatureToggles : public ::Bedrock::EnableNonOwnerReferences { MCAPI std::function _getDisabledIfOptionExpectationsNotMetSetupCallback(std::vector<::FeatureOptionID>, std::vector<::FeatureOptionID>); - // symbol: ?_getForceEnableCallback@FeatureToggles@@AEAA?AV?$function@$$A6AXAEAVOption@@@Z@std@@XZ - MCAPI std::function _getForceEnableCallback(); - // symbol: // ?_getLockIfInGameOrOptionExpectationsNotMetLockCallback@FeatureToggles@@AEAA?AV?$function@$$A6AXAEA_N@Z@std@@V?$vector@W4FeatureOptionID@@V?$allocator@W4FeatureOptionID@@@std@@@3@0@Z MCAPI std::function diff --git a/src/mc/resources/PackManifest.h b/src/mc/resources/PackManifest.h index d5d09737e8..f2c99d08b5 100644 --- a/src/mc/resources/PackManifest.h +++ b/src/mc/resources/PackManifest.h @@ -122,6 +122,9 @@ class PackManifest { // symbol: ?hasPlugins@PackManifest@@QEBA_NXZ MCAPI bool hasPlugins() const; + // symbol: ?isAddon@PackManifest@@QEBA_NXZ + MCAPI bool isAddon() const; + // symbol: ?isPlatformLocked@PackManifest@@QEBA_NXZ MCAPI bool isPlatformLocked() const; diff --git a/src/mc/resources/ResourcePackStack.h b/src/mc/resources/ResourcePackStack.h index 02f69d3c14..9bdb3983b9 100644 --- a/src/mc/resources/ResourcePackStack.h +++ b/src/mc/resources/ResourcePackStack.h @@ -6,6 +6,7 @@ // auto generated inclusion list #include "mc/deps/core/PathBuffer.h" #include "mc/deps/core/common/bedrock/NonOwnerPointer.h" +#include "mc/resources/PackType.h" class ResourcePackStack { public: @@ -46,6 +47,10 @@ class ResourcePackStack { // ?add@ResourcePackStack@@QEAAXVPackInstance@@AEBV?$not_null@V?$NonOwnerPointer@$$CBVIResourcePackRepository@@@Bedrock@@@gsl@@_N@Z MCAPI void add(class PackInstance, Bedrock::NotNullNonOwnerPtr const&, bool); + // symbol: + // ?getPackTelemetryNamesWithVersion@ResourcePackStack@@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@@W4PackType@@@Z + MCAPI std::vector getPackTelemetryNamesWithVersion(::PackType) const; + // symbol: ?getSplitStacks@ResourcePackStack@@QEBAXAEAV1@0@Z MCAPI void getSplitStacks(class ResourcePackStack& clientStack, class ResourcePackStack& serverStack) const; diff --git a/src/mc/resources/Summer24Update.h b/src/mc/resources/Summer24Update.h index fa6de4833a..3f85fbd6e9 100644 --- a/src/mc/resources/Summer24Update.h +++ b/src/mc/resources/Summer24Update.h @@ -10,6 +10,9 @@ class Experiments; namespace VanillaGameVersions::Summer24Update { // NOLINTBEGIN +// symbol: ?enabled@Summer24Update@VanillaGameVersions@@YA_NAEBVExperiments@@@Z +MCAPI bool enabled(class Experiments const&); + // symbol: ?enabled@Summer24Update@VanillaGameVersions@@YA_NAEBVBaseGameVersion@@AEBVExperiments@@@Z MCAPI bool enabled(class BaseGameVersion const&, class Experiments const&); diff --git a/src/mc/resources/VanillaGameVersions.h b/src/mc/resources/VanillaGameVersions.h index 7ba7922fe7..87d03ca3e8 100644 --- a/src/mc/resources/VanillaGameVersions.h +++ b/src/mc/resources/VanillaGameVersions.h @@ -61,6 +61,9 @@ MCAPI extern class BaseGameVersion const TrailsAndTalesVersion_U5; // symbol: ?TrailsAndTalesVersion_U6@VanillaGameVersions@@3VBaseGameVersion@@B MCAPI extern class BaseGameVersion const TrailsAndTalesVersion_U6; +// symbol: ?TrailsAndTalesVersion_U7@VanillaGameVersions@@3VBaseGameVersion@@B +MCAPI extern class BaseGameVersion const TrailsAndTalesVersion_U7; + // symbol: ?WildUpdateVersion@VanillaGameVersions@@3VBaseGameVersion@@B MCAPI extern class BaseGameVersion const WildUpdateVersion; diff --git a/src/mc/scripting/ScriptFormPromiseTracker.h b/src/mc/scripting/ScriptFormPromiseTracker.h index 5ad1ed57c0..2d5625c2ce 100644 --- a/src/mc/scripting/ScriptFormPromiseTracker.h +++ b/src/mc/scripting/ScriptFormPromiseTracker.h @@ -47,12 +47,12 @@ class ScriptFormPromiseTracker : public Bedrock::EnableNonOwnerReferences { public: // NOLINTBEGIN - // symbol: ?onEvent@ScriptFormPromiseTracker@@UEAA?AW4EventResult@@AEBUPlayerFormCloseEvent@@@Z - MCVAPI ::EventResult onEvent(struct PlayerFormCloseEvent const& formCloseEvent); - // symbol: ?onEvent@ScriptFormPromiseTracker@@UEAA?AW4EventResult@@AEBUPlayerFormResponseEvent@@@Z MCVAPI ::EventResult onEvent(struct PlayerFormResponseEvent const& formResponseEvent); + // symbol: ?onEvent@ScriptFormPromiseTracker@@UEAA?AW4EventResult@@AEBUPlayerFormCloseEvent@@@Z + MCVAPI ::EventResult onEvent(struct PlayerFormCloseEvent const& formCloseEvent); + // symbol: ??0ScriptFormPromiseTracker@@QEAA@XZ MCAPI ScriptFormPromiseTracker(); diff --git a/src/mc/scripting/ScriptResourceStats.h b/src/mc/scripting/ScriptResourceStats.h index d65668d50c..c53b5e7c10 100644 --- a/src/mc/scripting/ScriptResourceStats.h +++ b/src/mc/scripting/ScriptResourceStats.h @@ -17,8 +17,8 @@ struct ScriptResourceStats { public: // NOLINTBEGIN // symbol: - // ?serialize@ScriptResourceStats@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI std::string serialize(struct cereal::ReflectionCtx&) const; + // ?serialize@ScriptResourceStats@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI std::string serialize(struct cereal::ReflectionCtx const&) const; // symbol: ??1ScriptResourceStats@@QEAA@XZ MCAPI ~ScriptResourceStats(); diff --git a/src/mc/scripting/event_handlers/ScriptItemGameplayHandler.h b/src/mc/scripting/event_handlers/ScriptItemGameplayHandler.h index 208b25087e..2d585d444f 100644 --- a/src/mc/scripting/event_handlers/ScriptItemGameplayHandler.h +++ b/src/mc/scripting/event_handlers/ScriptItemGameplayHandler.h @@ -59,14 +59,10 @@ class ScriptItemGameplayHandler { virtual void __unk_vfn_9(); // vIndex: 10, symbol: - // ?handleEvent@ScriptItemGameplayHandler@@UEAA?AU?$GameplayHandlerResult@W4CoordinatorResult@@@@AEAUItemDefinitionEventTriggeredEvent@@@Z - virtual struct GameplayHandlerResult<::CoordinatorResult> handleEvent(struct ItemDefinitionEventTriggeredEvent&); - - // vIndex: 11, symbol: // ?handleEvent@ScriptItemGameplayHandler@@UEAA?AU?$GameplayHandlerResult@W4CoordinatorResult@@@@AEAUItemUseOnEvent@@@Z virtual struct GameplayHandlerResult<::CoordinatorResult> handleEvent(struct ItemUseOnEvent&); - // vIndex: 12, symbol: + // vIndex: 11, symbol: // ?handleEvent@ScriptItemGameplayHandler@@UEAA?AU?$GameplayHandlerResult@W4CoordinatorResult@@@@AEAUItemUseEvent@@@Z virtual struct GameplayHandlerResult<::CoordinatorResult> handleEvent(struct ItemUseEvent&); @@ -74,11 +70,6 @@ class ScriptItemGameplayHandler { // private: // NOLINTBEGIN - // symbol: - // ?_handleItemDefinitionEventTriggered@ScriptItemGameplayHandler@@AEAA_NAEAUItemDefinitionEventTriggeredEvent@@AEBVWeakLifetimeScope@Scripting@@U?$TypedObjectHandle@VIScriptWorldBeforeEvents@ScriptModuleMinecraft@@@4@@Z - MCAPI bool - _handleItemDefinitionEventTriggered(struct ItemDefinitionEventTriggeredEvent&, class Scripting::WeakLifetimeScope const& scope, struct Scripting::TypedObjectHandle); - // symbol: // ?_handleItemUseEvent@ScriptItemGameplayHandler@@AEAA_NAEAUItemUseEvent@@AEBVWeakLifetimeScope@Scripting@@U?$TypedObjectHandle@VIScriptWorldBeforeEvents@ScriptModuleMinecraft@@@4@@Z MCAPI bool diff --git a/src/mc/scripting/modules/minecraft/IScriptWorldAfterEvents.h b/src/mc/scripting/modules/minecraft/IScriptWorldAfterEvents.h index 31ba9a8149..3954b49533 100644 --- a/src/mc/scripting/modules/minecraft/IScriptWorldAfterEvents.h +++ b/src/mc/scripting/modules/minecraft/IScriptWorldAfterEvents.h @@ -22,8 +22,8 @@ namespace ScriptModuleMinecraft { struct ScriptButtonPushAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptChatSendAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptDataDrivenActorTriggerAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptExplosionStartedAfterEvent; } +namespace ScriptModuleMinecraft { struct ScriptGameRuleChangeAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemCompleteUseAfterEvent; } -namespace ScriptModuleMinecraft { struct ScriptItemDefinitionAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemReleaseUseAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemStartUseAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemStartUseOnAfterEvent; } @@ -35,6 +35,7 @@ namespace ScriptModuleMinecraft { struct ScriptLeverActionAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPistonActionAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerBreakBlockAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerDimensionChangeAfterEvent; } +namespace ScriptModuleMinecraft { struct ScriptPlayerGameModeChangeAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithBlockAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithEntityAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerJoinAfterEvent; } @@ -70,211 +71,216 @@ class IScriptWorldAfterEvents { virtual void __unk_vfn_1() = 0; // vIndex: 2, symbol: + // ?onGameRuleChange@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptGameRuleChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z + virtual void onGameRuleChange(class Scripting::StrongTypedObjectHandle< + struct ScriptModuleMinecraft::ScriptGameRuleChangeAfterEvent>&); + + // vIndex: 3, symbol: // ?onWeatherChanged@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptWeatherChangedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onWeatherChanged(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptWeatherChangedAfterEvent>&); - // vIndex: 3, symbol: + // vIndex: 4, symbol: // ?onWorldInitialize@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptWorldInitializeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onWorldInitialize(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptWorldInitializeAfterEvent>&); - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?onPlayerJoin@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerJoinAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerJoin(class Scripting::StrongTypedObjectHandle&); - // vIndex: 5, symbol: + // vIndex: 6, symbol: // ?onPlayerLeave@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerLeaveAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerLeave(class Scripting::StrongTypedObjectHandle&); - // vIndex: 6, symbol: + // vIndex: 7, symbol: // ?onActorAddEffect@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorAddEffectAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorAddEffect(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorAddEffectAfterEvent>&); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?onChat@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptChatSendAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onChat(class Scripting::StrongTypedObjectHandle&); - // vIndex: 8, symbol: + // vIndex: 9, symbol: // ?onActorLoad@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorLoadAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorLoad(class Scripting::StrongTypedObjectHandle&); - // vIndex: 9, symbol: + // vIndex: 10, symbol: // ?onActorSpawn@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorSpawnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorSpawn(class Scripting::StrongTypedObjectHandle&); - // vIndex: 10, symbol: + // vIndex: 11, symbol: // ?onActorRemoved@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEBV?$StrongTypedObjectHandle@VScriptActor@ScriptModuleMinecraft@@@Scripting@@AEAV?$StrongTypedObjectHandle@UScriptActorRemoveAfterEvent@ScriptModuleMinecraft@@@4@@Z virtual void onActorRemoved(class Scripting::StrongTypedObjectHandle const&, class Scripting::StrongTypedObjectHandle&); - // vIndex: 11, symbol: + // vIndex: 12, symbol: // ?onActorHitEntity@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHitEntityAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHitEntity(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorHitEntityAfterEvent>&); - // vIndex: 12, symbol: + // vIndex: 13, symbol: // ?onActorHitBlock@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHitBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHitBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorHitBlockAfterEvent>&); - // vIndex: 13, symbol: + // vIndex: 14, symbol: // ?onServerMessage@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptServerMessageAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onServerMessage(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptServerMessageAfterEvent>&); - // vIndex: 14, symbol: + // vIndex: 15, symbol: // ?onDataDrivenActorEventSend@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptDataDrivenActorTriggerAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onDataDrivenActorEventSend(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptDataDrivenActorTriggerAfterEvent>&); - // vIndex: 15, symbol: + // vIndex: 16, symbol: // ?onActorHurt@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHurtAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHurt(class Scripting::StrongTypedObjectHandle&); - // vIndex: 16, symbol: + // vIndex: 17, symbol: // ?onActorHealthChanged@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHealthChangedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHealthChanged(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorHealthChangedAfterEvent>&); - // vIndex: 17, symbol: + // vIndex: 18, symbol: // ?onActorDie@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorDieAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorDie(class Scripting::StrongTypedObjectHandle&); - // vIndex: 18, symbol: + // vIndex: 19, symbol: // ?onPlayerSpawn@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerSpawnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerSpawn(class Scripting::StrongTypedObjectHandle&); - // vIndex: 19, symbol: + // vIndex: 20, symbol: // ?onPlayerDimensionChange@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerDimensionChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerDimensionChange(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerDimensionChangeAfterEvent>&); - // vIndex: 20, symbol: + // vIndex: 21, symbol: // ?onPlayerInteractWithEntity@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerInteractWithEntityAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerInteractWithEntity(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerInteractWithEntityAfterEvent>&); - // vIndex: 21, symbol: + // vIndex: 22, symbol: // ?onPlayerInteractWithBlock@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerInteractWithBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerInteractWithBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerInteractWithBlockAfterEvent>&); - // vIndex: 22, symbol: + // vIndex: 23, symbol: + // ?onPlayerGameModeChange@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerGameModeChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z + virtual void onPlayerGameModeChange(class Scripting::StrongTypedObjectHandle< + struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeAfterEvent>&); + + // vIndex: 24, symbol: // ?onActivatePiston@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPistonActionAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActivatePiston(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPistonActionAfterEvent>&); - // vIndex: 23, symbol: + // vIndex: 25, symbol: // ?onActivateLever@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptLeverActionAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActivateLever(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptLeverActionAfterEvent>&); - // vIndex: 24, symbol: + // vIndex: 26, symbol: // ?onPushButton@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptButtonPushAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPushButton(class Scripting::StrongTypedObjectHandle&); - // vIndex: 25, symbol: + // vIndex: 27, symbol: // ?onExplosion@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptExplosionStartedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onExplosion(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptExplosionStartedAfterEvent>&); - // vIndex: 26, symbol: + // vIndex: 28, symbol: // ?onExplodeBlock@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptBlockExplodedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onExplodeBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptBlockExplodedAfterEvent>&); - // vIndex: 27, symbol: + // vIndex: 29, symbol: // ?onPlayerPlaceBlock@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerPlaceBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerPlaceBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerPlaceBlockAfterEvent>&); - // vIndex: 28, symbol: + // vIndex: 30, symbol: // ?onPlayerBreakBlock@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerBreakBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerBreakBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerBreakBlockAfterEvent>&); - // vIndex: 29, symbol: + // vIndex: 31, symbol: // ?onPushPressurePlate@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPressurePlatePushAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPushPressurePlate(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPressurePlatePushAfterEvent>&); - // vIndex: 30, symbol: + // vIndex: 32, symbol: // ?onPopPressurePlate@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPressurePlatePopAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPopPressurePlate(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPressurePlatePopAfterEvent>&); - // vIndex: 31, symbol: + // vIndex: 33, symbol: // ?onHitTargetBlock@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptTargetBlockHitAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onHitTargetBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptTargetBlockHitAfterEvent>&); - // vIndex: 32, symbol: + // vIndex: 34, symbol: // ?onTripTripWire@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptTripWireTripAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onTripTripWire(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptTripWireTripAfterEvent>&); - // vIndex: 33, symbol: - // ?onItemDefinitionEventTriggered@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onItemDefinitionEventTriggered(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent>&); - - // vIndex: 34, symbol: + // vIndex: 35, symbol: // ?onItemUse@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemUse(class Scripting::StrongTypedObjectHandle&); - // vIndex: 35, symbol: + // vIndex: 36, symbol: // ?onItemUseOn@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemUseOnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemUseOn(class Scripting::StrongTypedObjectHandle&); - // vIndex: 36, symbol: + // vIndex: 37, symbol: // ?onItemStartUseOn@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStartUseOnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStartUseOn(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemStartUseOnAfterEvent>&); - // vIndex: 37, symbol: + // vIndex: 38, symbol: // ?onItemStopUseOn@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStopUseOnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStopUseOn(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemStopUseOnAfterEvent>&); - // vIndex: 38, symbol: + // vIndex: 39, symbol: // ?onItemStartUse@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStartUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStartUse(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemStartUseAfterEvent>&); - // vIndex: 39, symbol: + // vIndex: 40, symbol: // ?onItemCompleteUse@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemCompleteUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemCompleteUse(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemCompleteUseAfterEvent>&); - // vIndex: 40, symbol: + // vIndex: 41, symbol: // ?onItemReleaseUse@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemReleaseUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemReleaseUse(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemReleaseUseAfterEvent>&); - // vIndex: 41, symbol: + // vIndex: 42, symbol: // ?onItemStopUse@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStopUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStopUse(class Scripting::StrongTypedObjectHandle&); - // vIndex: 42, symbol: + // vIndex: 43, symbol: // ?onProjectileHitEntity@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptProjectileHitEntityAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onProjectileHitEntity(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptProjectileHitEntityAfterEvent>&); - // vIndex: 43, symbol: + // vIndex: 44, symbol: // ?onProjectileHitBlock@IScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptProjectileHitBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onProjectileHitBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptProjectileHitBlockAfterEvent>&); diff --git a/src/mc/scripting/modules/minecraft/IScriptWorldBeforeEvents.h b/src/mc/scripting/modules/minecraft/IScriptWorldBeforeEvents.h index d2fd0a98d6..ff4199f012 100644 --- a/src/mc/scripting/modules/minecraft/IScriptWorldBeforeEvents.h +++ b/src/mc/scripting/modules/minecraft/IScriptWorldBeforeEvents.h @@ -3,24 +3,36 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/enums/GameType.h" #include "mc/external/scripting/StrongTypedObjectHandle.h" +#include "mc/scripting/modules/minecraft/ScriptWeatherType.h" // auto generated forward declare list // clang-format off +class Actor; +class Player; namespace ScriptModuleMinecraft { struct ScriptActorAddEffectBeforeEvent; } -namespace ScriptModuleMinecraft { struct ScriptActorRemoveBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptChatSendBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptDataDrivenActorTriggerBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptExplosionStartedBeforeEvent; } -namespace ScriptModuleMinecraft { struct ScriptItemDefinitionBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptItemUseBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptItemUseOnBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerBreakBlockBeforeEvent; } +namespace ScriptModuleMinecraft { struct ScriptPlayerGameModeChangeBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithBlockBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithEntityBeforeEvent; } -namespace ScriptModuleMinecraft { struct ScriptPlayerLeaveBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerPlaceBlockBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptWeatherChangedBeforeEvent; } +struct ActorAddEffectEvent; +struct ActorDefinitionModifier; +struct BlockTryDestroyByPlayerEvent; +struct BlockTryPlaceByPlayerEvent; +struct ChatEvent; +struct ExplosionStartedEvent; +struct ItemUseEvent; +struct ItemUseOnEvent; +struct PlayerInteractWithBlockBeforeEvent; +struct PlayerInteractWithEntityBeforeEvent; // clang-format on namespace ScriptModuleMinecraft { @@ -38,77 +50,86 @@ class IScriptWorldBeforeEvents { virtual ~IScriptWorldBeforeEvents() = default; // vIndex: 1, symbol: - // ?onBeforeChat@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptChatSendBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforeChat(class Scripting::StrongTypedObjectHandle); + // ?onBeforeChat@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptChatSendBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBUChatEvent@@AEBVPlayer@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeChat(struct ChatEvent const&, class Player const&); // vIndex: 2, symbol: - // ?onBeforeDataDrivenActorEventSend@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptDataDrivenActorTriggerBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforeDataDrivenActorEventSend(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptDataDrivenActorTriggerBeforeEvent>); + // ?onBeforeDataDrivenActorEventSend@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptDataDrivenActorTriggerBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAVActor@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@AEAV?$vector@UActorDefinitionModifier@@V?$allocator@UActorDefinitionModifier@@@std@@@4@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeDataDrivenActorEventSend(class Actor&, std::string const&, std::vector&); // vIndex: 3, symbol: - // ?onBeforeWeatherChangedEvent@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptWeatherChangedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeWeatherChangedEvent(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptWeatherChangedBeforeEvent>); + // ?onBeforeWeatherChangedEvent@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptWeatherChangedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@W4ScriptWeatherType@2@0H@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeWeatherChangedEvent( + ::ScriptModuleMinecraft::ScriptWeatherType, + ::ScriptModuleMinecraft::ScriptWeatherType, + int + ); // vIndex: 4, symbol: - // ?onBeforePlayerInteractWithEntity@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforePlayerInteractWithEntity(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerInteractWithEntityBeforeEvent>); + // ?onBeforePlayerInteractWithEntity@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAVPlayer@@AEAVActor@@AEBUPlayerInteractWithEntityBeforeEvent@@@Z + virtual std::optional> + onBeforePlayerInteractWithEntity(class Player&, class Actor&, struct PlayerInteractWithEntityBeforeEvent const&); // vIndex: 5, symbol: - // ?onBeforePlayerInteractWithBlock@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforePlayerInteractWithBlock(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerInteractWithBlockBeforeEvent>); + // ?onBeforePlayerInteractWithBlock@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAVPlayer@@AEBUPlayerInteractWithBlockBeforeEvent@@@Z + virtual std::optional> + onBeforePlayerInteractWithBlock(class Player&, struct PlayerInteractWithBlockBeforeEvent const&); // vIndex: 6, symbol: - // ?onBeforePlayerLeave@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerLeaveBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforePlayerLeave(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerLeaveBeforeEvent>); + // ?onBeforePlayerGameModeChange@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerGameModeChangeBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@W4GameType@@1@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforePlayerGameModeChange(class Player const&, ::GameType, ::GameType); - // vIndex: 7, symbol: - // ?onBeforeActorRemove@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptActorRemoveBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeActorRemove(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptActorRemoveBeforeEvent>); + // vIndex: 7, symbol: ?onBeforePlayerLeave@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXAEBVPlayer@@@Z + virtual void onBeforePlayerLeave(class Player const&); - // vIndex: 8, symbol: - // ?onBeforeEffectAddedEventSend@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptActorAddEffectBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeEffectAddedEventSend(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptActorAddEffectBeforeEvent>); + // vIndex: 8, symbol: ?onBeforeActorRemove@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXAEBVActor@@@Z + virtual void onBeforeActorRemove(class Actor const&); // vIndex: 9, symbol: - // ?onBeforeExplosion@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptExplosionStartedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeExplosion(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptExplosionStartedBeforeEvent>); + // ?onBeforeEffectAddedEventSend@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptActorAddEffectBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAUActorAddEffectEvent@@AEBVActor@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeEffectAddedEventSend(struct ActorAddEffectEvent&, class Actor const&); // vIndex: 10, symbol: - // ?onBeforePlayerBreakBlock@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerBreakBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforePlayerBreakBlock(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerBreakBlockBeforeEvent>); + // ?onBeforeExplosion@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptExplosionStartedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBUExplosionStartedEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeExplosion(struct ExplosionStartedEvent const&); // vIndex: 11, symbol: - // ?onBeforePlayerPlaceBlock@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerPlaceBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforePlayerPlaceBlock(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerPlaceBlockBeforeEvent>); + // ?onBeforePlayerBreakBlock@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerBreakBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUBlockTryDestroyByPlayerEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforePlayerBreakBlock(class Player const&, struct BlockTryDestroyByPlayerEvent const&); // vIndex: 12, symbol: - // ?onBeforeItemDefinitionEventTriggered@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeItemDefinitionEventTriggered(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemDefinitionBeforeEvent>); + // ?onBeforePlayerPlaceBlock@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerPlaceBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUBlockTryPlaceByPlayerEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforePlayerPlaceBlock(class Player const&, struct BlockTryPlaceByPlayerEvent const&); // vIndex: 13, symbol: - // ?onBeforeItemUse@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemUseBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeItemUse(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemUseBeforeEvent>); + // ?onBeforeItemUse@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptItemUseBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUItemUseEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeItemUse(class Player const&, struct ItemUseEvent const&); // vIndex: 14, symbol: - // ?onBeforeItemUseOn@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeItemUseOn(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemUseOnBeforeEvent>); + // ?onBeforeItemUseOn@IScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUItemUseOnEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeItemUseOn(class Player const&, struct ItemUseOnEvent const&); // NOLINTEND }; diff --git a/src/mc/scripting/modules/minecraft/Releases.h b/src/mc/scripting/modules/minecraft/Releases.h index 0c7af3353e..f470551a20 100644 --- a/src/mc/scripting/modules/minecraft/Releases.h +++ b/src/mc/scripting/modules/minecraft/Releases.h @@ -38,6 +38,9 @@ MCAPI extern struct Scripting::Version const V170; // symbol: ?V180@Releases@ScriptModuleMinecraft@@3UVersion@Scripting@@B MCAPI extern struct Scripting::Version const V180; + +// symbol: ?V190@Releases@ScriptModuleMinecraft@@3UVersion@Scripting@@B +MCAPI extern struct Scripting::Version const V190; // NOLINTEND }; // namespace ScriptModuleMinecraft::Releases diff --git a/src/mc/scripting/modules/minecraft/ScriptActorAddEffectBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptActorAddEffectBeforeEvent.h index 8d4b61c4f0..6a28f88bc7 100644 --- a/src/mc/scripting/modules/minecraft/ScriptActorAddEffectBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptActorAddEffectBeforeEvent.h @@ -31,10 +31,6 @@ struct ScriptActorAddEffectBeforeEvent { // symbol: ?copyTo@ScriptActorAddEffectBeforeEvent@ScriptModuleMinecraft@@QEAAXAEAUActorAddEffectEvent@@@Z MCAPI void copyTo(struct ActorAddEffectEvent&); - // symbol: ??4ScriptActorAddEffectBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptActorAddEffectBeforeEvent& - operator=(struct ScriptModuleMinecraft::ScriptActorAddEffectBeforeEvent&&); - // symbol: ??1ScriptActorAddEffectBeforeEvent@ScriptModuleMinecraft@@QEAA@XZ MCAPI ~ScriptActorAddEffectBeforeEvent(); diff --git a/src/mc/scripting/modules/minecraft/ScriptBlock.h b/src/mc/scripting/modules/minecraft/ScriptBlock.h index 44b5f2909c..d6b0ba4422 100644 --- a/src/mc/scripting/modules/minecraft/ScriptBlock.h +++ b/src/mc/scripting/modules/minecraft/ScriptBlock.h @@ -36,9 +36,6 @@ class ScriptBlock { public: // NOLINTBEGIN - // symbol: ??0ScriptBlock@ScriptModuleMinecraft@@QEAA@$$QEAV01@@Z - MCAPI ScriptBlock(class ScriptModuleMinecraft::ScriptBlock&& rhs); - // symbol: // ??0ScriptBlock@ScriptModuleMinecraft@@QEAA@AEAVBlockSource@@VBlockPos@@AEBVWeakLifetimeScope@Scripting@@@Z MCAPI ScriptBlock(class BlockSource& region, class BlockPos pos, class Scripting::WeakLifetimeScope const& scope); @@ -246,9 +243,6 @@ class ScriptBlock { struct ScriptModuleMinecraft::ScriptLocationOutOfWorldBoundsError> offset(class Vec3 const&) const; - // symbol: ??4ScriptBlock@ScriptModuleMinecraft@@QEAAAEAV01@$$QEAV01@@Z - MCAPI class ScriptModuleMinecraft::ScriptBlock& operator=(class ScriptModuleMinecraft::ScriptBlock&& rhs); - // symbol: // ?setPermutation@ScriptBlock@ScriptModuleMinecraft@@QEAA?AV?$Result@XUScriptLocationInUnloadedChunkError@ScriptModuleMinecraft@@UScriptLocationOutOfWorldBoundsError@2@@Scripting@@AEBVScriptBlockPermutation@2@@Z MCAPI class Scripting::Result< @@ -310,9 +304,6 @@ class ScriptBlock { struct ScriptModuleMinecraft::ScriptLocationOutOfWorldBoundsError> west(int) const; - // symbol: ??1ScriptBlock@ScriptModuleMinecraft@@QEAA@XZ - MCAPI ~ScriptBlock(); - // symbol: // ?bind@ScriptBlock@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptBlock@ScriptModuleMinecraft@@@Scripting@@XZ MCAPI static class Scripting::ClassBindingBuilder bind(); diff --git a/src/mc/scripting/modules/minecraft/ScriptBlockFilter.h b/src/mc/scripting/modules/minecraft/ScriptBlockFilter.h new file mode 100644 index 0000000000..ada4889268 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptBlockFilter.h @@ -0,0 +1,111 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/InterfaceBindingBuilder.h" +#include "mc/external/scripting/Result.h" +#include "mc/external/scripting/StrongTypedObjectHandle.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace ScriptModuleMinecraft { class ScriptBlockPermutation; } +namespace Scripting { struct Error; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptBlockFilter { +public: + // prevent constructor by default + ScriptBlockFilter(); + +public: + // NOLINTBEGIN + // symbol: ??0ScriptBlockFilter@ScriptModuleMinecraft@@QEAA@$$QEAV01@@Z + MCAPI ScriptBlockFilter(class ScriptModuleMinecraft::ScriptBlockFilter&&); + + // symbol: ??0ScriptBlockFilter@ScriptModuleMinecraft@@QEAA@AEBV01@@Z + MCAPI ScriptBlockFilter(class ScriptModuleMinecraft::ScriptBlockFilter const&); + + // symbol: + // ?getExcludePermutations@ScriptBlockFilter@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$optional@V?$vector@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@V?$allocator@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@@std@@@std@@@std@@$$V@Scripting@@XZ + MCAPI class Scripting::Result>>> + getExcludePermutations() const; + + // symbol: + // ?getExcludeTags@ScriptBlockFilter@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$optional@V?$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@@@std@@$$V@Scripting@@XZ + MCAPI class Scripting::Result>> getExcludeTags() const; + + // symbol: + // ?getExcludeTypes@ScriptBlockFilter@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$optional@V?$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@@@std@@$$V@Scripting@@XZ + MCAPI class Scripting::Result>> getExcludeTypes() const; + + // symbol: + // ?getIncludePermutations@ScriptBlockFilter@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$optional@V?$vector@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@V?$allocator@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@@std@@@std@@@std@@$$V@Scripting@@XZ + MCAPI class Scripting::Result>>> + getIncludePermutations() const; + + // symbol: + // ?getIncludeTags@ScriptBlockFilter@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$optional@V?$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@@@std@@$$V@Scripting@@XZ + MCAPI class Scripting::Result>> getIncludeTags() const; + + // symbol: + // ?getIncludeTypes@ScriptBlockFilter@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$optional@V?$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@@@std@@$$V@Scripting@@XZ + MCAPI class Scripting::Result>> getIncludeTypes() const; + + // symbol: ?isValid@ScriptBlockFilter@ScriptModuleMinecraft@@QEBA_NAEAUError@Scripting@@@Z + MCAPI bool isValid(struct Scripting::Error&) const; + + // symbol: ??RScriptBlockFilter@ScriptModuleMinecraft@@QEBA_NAEBVBlock@@@Z + MCAPI bool operator()(class Block const&) const; + + // symbol: ??4ScriptBlockFilter@ScriptModuleMinecraft@@QEAAAEAV01@$$QEAV01@@Z + MCAPI class ScriptModuleMinecraft::ScriptBlockFilter& operator=(class ScriptModuleMinecraft::ScriptBlockFilter&&); + + // symbol: ??4ScriptBlockFilter@ScriptModuleMinecraft@@QEAAAEAV01@AEBV01@@Z + MCAPI class ScriptModuleMinecraft::ScriptBlockFilter& + operator=(class ScriptModuleMinecraft::ScriptBlockFilter const&); + + // symbol: + // ?setExcludePermutations@ScriptBlockFilter@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@AEBV?$optional@V?$vector@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@V?$allocator@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@@std@@@std@@@std@@@Z + MCAPI class Scripting::Result + setExcludePermutations(std::optional>> const&); + + // symbol: + // ?setExcludeTags@ScriptBlockFilter@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@V?$optional@V?$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@@@std@@@Z + MCAPI class Scripting::Result setExcludeTags(std::optional>); + + // symbol: + // ?setExcludeTypes@ScriptBlockFilter@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@V?$optional@V?$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@@@std@@@Z + MCAPI class Scripting::Result setExcludeTypes(std::optional>); + + // symbol: + // ?setIncludePermutations@ScriptBlockFilter@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@AEBV?$optional@V?$vector@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@V?$allocator@V?$StrongTypedObjectHandle@VScriptBlockPermutation@ScriptModuleMinecraft@@@Scripting@@@std@@@std@@@std@@@Z + MCAPI class Scripting::Result + setIncludePermutations(std::optional>> const&); + + // symbol: + // ?setIncludeTags@ScriptBlockFilter@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@V?$optional@V?$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@@@std@@@Z + MCAPI class Scripting::Result setIncludeTags(std::optional>); + + // symbol: + // ?setIncludeTypes@ScriptBlockFilter@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@V?$optional@V?$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@@@std@@@Z + MCAPI class Scripting::Result setIncludeTypes(std::optional>); + + // symbol: ??1ScriptBlockFilter@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ~ScriptBlockFilter(); + + // symbol: + // ?bind@ScriptBlockFilter@ScriptModuleMinecraft@@SA?AV?$InterfaceBindingBuilder@VScriptBlockFilter@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::InterfaceBindingBuilder bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptBlockRaycastOptions.h b/src/mc/scripting/modules/minecraft/ScriptBlockRaycastOptions.h index d86d04fc0e..48fdfe62b3 100644 --- a/src/mc/scripting/modules/minecraft/ScriptBlockRaycastOptions.h +++ b/src/mc/scripting/modules/minecraft/ScriptBlockRaycastOptions.h @@ -11,12 +11,22 @@ namespace ScriptModuleMinecraft { struct ScriptBlockRaycastOptions { public: // prevent constructor by default - ScriptBlockRaycastOptions& operator=(ScriptBlockRaycastOptions const&); ScriptBlockRaycastOptions(ScriptBlockRaycastOptions const&); ScriptBlockRaycastOptions(); public: // NOLINTBEGIN + // symbol: ??4ScriptBlockRaycastOptions@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct ScriptModuleMinecraft::ScriptBlockRaycastOptions& + operator=(struct ScriptModuleMinecraft::ScriptBlockRaycastOptions&&); + + // symbol: ??4ScriptBlockRaycastOptions@ScriptModuleMinecraft@@QEAAAEAU01@AEBU01@@Z + MCAPI struct ScriptModuleMinecraft::ScriptBlockRaycastOptions& + operator=(struct ScriptModuleMinecraft::ScriptBlockRaycastOptions const&); + + // symbol: ??1ScriptBlockRaycastOptions@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ~ScriptBlockRaycastOptions(); + // symbol: // ?bind@ScriptBlockRaycastOptions@ScriptModuleMinecraft@@SA?AV?$InterfaceBindingBuilder@UScriptBlockRaycastOptions@ScriptModuleMinecraft@@@Scripting@@XZ MCAPI static class Scripting::InterfaceBindingBuilder diff --git a/src/mc/scripting/modules/minecraft/ScriptBlockVolumeBase.h b/src/mc/scripting/modules/minecraft/ScriptBlockVolumeBase.h new file mode 100644 index 0000000000..abcf04a0e0 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptBlockVolumeBase.h @@ -0,0 +1,62 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/ClassBindingBuilder.h" +#include "mc/external/scripting/StrongTypedObjectHandle.h" + +// auto generated forward declare list +// clang-format off +class BlockVolumeBase; +class Vec3; +namespace ScriptModuleMinecraft { class ScriptBlockLocationIterator; } +namespace Scripting { class WeakLifetimeScope; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptBlockVolumeBase { +public: + // prevent constructor by default + ScriptBlockVolumeBase& operator=(ScriptBlockVolumeBase const&); + ScriptBlockVolumeBase(ScriptBlockVolumeBase const&); + ScriptBlockVolumeBase(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: ??1ScriptBlockVolumeBase@ScriptModuleMinecraft@@UEAA@XZ + virtual ~ScriptBlockVolumeBase(); + + // vIndex: 1, symbol: + // ?getBlockLocationIterator@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@UEAA?AV?$StrongTypedObjectHandle@VScriptBlockLocationIterator@ScriptModuleMinecraft@@@Scripting@@VWeakLifetimeScope@4@@Z + virtual class Scripting::StrongTypedObjectHandle + getBlockLocationIterator(class Scripting::WeakLifetimeScope) = 0; + + // symbol: + // ??0ScriptBlockVolumeBase@ScriptModuleMinecraft@@QEAA@V?$unique_ptr@VBlockVolumeBase@@U?$default_delete@VBlockVolumeBase@@@std@@@std@@@Z + MCAPI explicit ScriptBlockVolumeBase(std::unique_ptr); + + // symbol: ?getMax@ScriptBlockVolumeBase@ScriptModuleMinecraft@@QEBA?AVVec3@@XZ + MCAPI class Vec3 getMax() const; + + // symbol: ?getMin@ScriptBlockVolumeBase@ScriptModuleMinecraft@@QEBA?AVVec3@@XZ + MCAPI class Vec3 getMin() const; + + // symbol: ?getSpan@ScriptBlockVolumeBase@ScriptModuleMinecraft@@QEBA?AVVec3@@XZ + MCAPI class Vec3 getSpan() const; + + // symbol: ?isInside@ScriptBlockVolumeBase@ScriptModuleMinecraft@@QEBA_NAEBVVec3@@@Z + MCAPI bool isInside(class Vec3 const&) const; + + // symbol: ?translate@ScriptBlockVolumeBase@ScriptModuleMinecraft@@QEAAXAEBVVec3@@@Z + MCAPI void translate(class Vec3 const&); + + // symbol: + // ?bind@ScriptBlockVolumeBase@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptBlockVolumeBase@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ClassBindingBuilder bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptChatSendBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptChatSendBeforeEvent.h index 294757d175..8380789437 100644 --- a/src/mc/scripting/modules/minecraft/ScriptChatSendBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptChatSendBeforeEvent.h @@ -11,7 +11,6 @@ struct ScriptChatSendBeforeEvent { public: // prevent constructor by default ScriptChatSendBeforeEvent& operator=(ScriptChatSendBeforeEvent const&); - ScriptChatSendBeforeEvent(ScriptChatSendBeforeEvent const&); ScriptChatSendBeforeEvent(); public: @@ -19,9 +18,8 @@ struct ScriptChatSendBeforeEvent { // symbol: ??0ScriptChatSendBeforeEvent@ScriptModuleMinecraft@@QEAA@$$QEAU01@@Z MCAPI ScriptChatSendBeforeEvent(struct ScriptModuleMinecraft::ScriptChatSendBeforeEvent&&); - // symbol: ??4ScriptChatSendBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptChatSendBeforeEvent& - operator=(struct ScriptModuleMinecraft::ScriptChatSendBeforeEvent&&); + // symbol: ??0ScriptChatSendBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBU01@@Z + MCAPI ScriptChatSendBeforeEvent(struct ScriptModuleMinecraft::ScriptChatSendBeforeEvent const&); // symbol: // ?bind@ScriptChatSendBeforeEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptChatSendBeforeEvent@ScriptModuleMinecraft@@@Scripting@@XZ diff --git a/src/mc/scripting/modules/minecraft/ScriptCompoundBlockVolumeItem.h b/src/mc/scripting/modules/minecraft/ScriptCompoundBlockVolumeItem.h index 2f3e0de661..6659a60397 100644 --- a/src/mc/scripting/modules/minecraft/ScriptCompoundBlockVolumeItem.h +++ b/src/mc/scripting/modules/minecraft/ScriptCompoundBlockVolumeItem.h @@ -5,24 +5,34 @@ // auto generated inclusion list #include "mc/external/scripting/InterfaceBindingBuilder.h" +// auto generated forward declare list +// clang-format off +class CompoundBlockVolumeItem; +// clang-format on + namespace ScriptModuleMinecraft { class ScriptCompoundBlockVolumeItem { public: // prevent constructor by default - ScriptCompoundBlockVolumeItem(ScriptCompoundBlockVolumeItem const&); ScriptCompoundBlockVolumeItem(); public: // NOLINTBEGIN - // symbol: ??4ScriptCompoundBlockVolumeItem@ScriptModuleMinecraft@@QEAAAEAV01@$$QEAV01@@Z - MCAPI class ScriptModuleMinecraft::ScriptCompoundBlockVolumeItem& - operator=(class ScriptModuleMinecraft::ScriptCompoundBlockVolumeItem&&); + // symbol: ??0ScriptCompoundBlockVolumeItem@ScriptModuleMinecraft@@QEAA@AEBV01@@Z + MCAPI ScriptCompoundBlockVolumeItem(class ScriptModuleMinecraft::ScriptCompoundBlockVolumeItem const&); // symbol: ??4ScriptCompoundBlockVolumeItem@ScriptModuleMinecraft@@QEAAAEAV01@AEBV01@@Z MCAPI class ScriptModuleMinecraft::ScriptCompoundBlockVolumeItem& operator=(class ScriptModuleMinecraft::ScriptCompoundBlockVolumeItem const&); + // symbol: + // ?toCompoundBlockVolumeItem@ScriptCompoundBlockVolumeItem@ScriptModuleMinecraft@@QEBA?AVCompoundBlockVolumeItem@@XZ + MCAPI class CompoundBlockVolumeItem toCompoundBlockVolumeItem() const; + + // symbol: ??1ScriptCompoundBlockVolumeItem@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ~ScriptCompoundBlockVolumeItem(); + // symbol: // ?bindInterface@ScriptCompoundBlockVolumeItem@ScriptModuleMinecraft@@SA?AV?$InterfaceBindingBuilder@VScriptCompoundBlockVolumeItem@ScriptModuleMinecraft@@@Scripting@@XZ MCAPI static class Scripting::InterfaceBindingBuilder diff --git a/src/mc/scripting/modules/minecraft/ScriptDebug.h b/src/mc/scripting/modules/minecraft/ScriptDebug.h new file mode 100644 index 0000000000..fdb8f5b2cc --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptDebug.h @@ -0,0 +1,31 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/Result.h" + +// auto generated forward declare list +// clang-format off +namespace Scripting { class DependencyLocator; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptDebug { +public: + // prevent constructor by default + ScriptDebug& operator=(ScriptDebug const&); + ScriptDebug(ScriptDebug const&); + ScriptDebug(); + +public: + // NOLINTBEGIN + // symbol: + // ?disableWatchdog@ScriptDebug@ScriptModuleMinecraft@@SA?AV?$Result@X$$V@Scripting@@AEAVDependencyLocator@4@_N@Z + MCAPI static class Scripting::Result disableWatchdog(class Scripting::DependencyLocator&, bool); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptDimension.h b/src/mc/scripting/modules/minecraft/ScriptDimension.h index 89a6a21f6e..37a4c77d2e 100644 --- a/src/mc/scripting/modules/minecraft/ScriptDimension.h +++ b/src/mc/scripting/modules/minecraft/ScriptDimension.h @@ -41,6 +41,7 @@ namespace ScriptModuleMinecraft { struct ScriptEntityRaycastOptions; } namespace ScriptModuleMinecraft { struct ScriptExplosionOptions; } namespace ScriptModuleMinecraft { struct ScriptLocationInUnloadedChunkError; } namespace ScriptModuleMinecraft { struct ScriptLocationOutOfWorldBoundsError; } +namespace ScriptModuleMinecraft { struct ScriptWorldSoundOptions; } namespace Scripting { class DependencyLocator; } namespace Scripting { class ScriptObjectFactory; } namespace Scripting { class WeakLifetimeScope; } @@ -107,8 +108,8 @@ class ScriptDimension { getBlock(class Scripting::WeakLifetimeScope scope, class Vec3 const& position) const; // symbol: - // ?getBlockFromRay@ScriptDimension@ScriptModuleMinecraft@@QEBA?AV?$optional@VScriptBlockRaycastHit@ScriptModuleMinecraft@@@std@@VWeakLifetimeScope@Scripting@@AEBVVec3@@1AEBV?$optional@UScriptBlockRaycastOptions@ScriptModuleMinecraft@@@4@@Z - MCAPI std::optional getBlockFromRay( + // ?getBlockFromRay@ScriptDimension@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$optional@VScriptBlockRaycastHit@ScriptModuleMinecraft@@@std@@$$V@Scripting@@VWeakLifetimeScope@4@AEBVVec3@@1AEBV?$optional@UScriptBlockRaycastOptions@ScriptModuleMinecraft@@@std@@@Z + MCAPI class Scripting::Result> getBlockFromRay( class Scripting::WeakLifetimeScope scope, class Vec3 const& pos, class Vec3 const& vector, @@ -202,6 +203,11 @@ class ScriptDimension { // symbol: ??4ScriptDimension@ScriptModuleMinecraft@@QEAAAEAV01@$$QEAV01@@Z MCAPI class ScriptModuleMinecraft::ScriptDimension& operator=(class ScriptModuleMinecraft::ScriptDimension&& rhs); + // symbol: + // ?playSound@ScriptDimension@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVVec3@@V?$optional@UScriptWorldSoundOptions@ScriptModuleMinecraft@@@6@@Z + MCAPI class Scripting::Result + playSound(std::string const&, class Vec3 const&, std::optional); + // symbol: // ?runCommand@ScriptDimension@ScriptModuleMinecraft@@QEAA?AV?$Result@V?$StrongTypedObjectHandle@UScriptCommandResult@ScriptModuleMinecraft@@@Scripting@@UScriptCommandError@ScriptModuleMinecraft@@@Scripting@@AEAVDependencyLocator@4@AEBUContextConfig@4@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI class Scripting::Result< diff --git a/src/mc/scripting/modules/minecraft/ScriptGameRuleChangeAfterEvent.h b/src/mc/scripting/modules/minecraft/ScriptGameRuleChangeAfterEvent.h new file mode 100644 index 0000000000..6157f1760a --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptGameRuleChangeAfterEvent.h @@ -0,0 +1,28 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/ClassBindingBuilderReadOnly.h" + +namespace ScriptModuleMinecraft { + +struct ScriptGameRuleChangeAfterEvent { +public: + // prevent constructor by default + ScriptGameRuleChangeAfterEvent& operator=(ScriptGameRuleChangeAfterEvent const&); + ScriptGameRuleChangeAfterEvent(ScriptGameRuleChangeAfterEvent const&); + ScriptGameRuleChangeAfterEvent(); + +public: + // NOLINTBEGIN + // symbol: + // ?bind@ScriptGameRuleChangeAfterEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilderReadOnly@UScriptGameRuleChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ClassBindingBuilderReadOnly< + struct ScriptModuleMinecraft::ScriptGameRuleChangeAfterEvent> + bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptGameRules.h b/src/mc/scripting/modules/minecraft/ScriptGameRules.h new file mode 100644 index 0000000000..81d2a23e70 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptGameRules.h @@ -0,0 +1,31 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Level; +namespace Scripting { class ModuleBindingBuilder; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptGameRules { +public: + // prevent constructor by default + ScriptGameRules& operator=(ScriptGameRules const&); + ScriptGameRules(ScriptGameRules const&); + ScriptGameRules(); + +public: + // NOLINTBEGIN + // symbol: ??0ScriptGameRules@ScriptModuleMinecraft@@QEAA@V?$not_null@PEAVLevel@@@gsl@@@Z + MCAPI explicit ScriptGameRules(gsl::not_null); + + // symbol: ?bind@ScriptGameRules@ScriptModuleMinecraft@@SAXAEAVModuleBindingBuilder@Scripting@@AEBVLevel@@@Z + MCAPI static void bind(class Scripting::ModuleBindingBuilder&, class Level const&); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptGameRulesFactory.h b/src/mc/scripting/modules/minecraft/ScriptGameRulesFactory.h new file mode 100644 index 0000000000..6a8a4e7922 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptGameRulesFactory.h @@ -0,0 +1,34 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/StrongTypedObjectHandle.h" + +// auto generated forward declare list +// clang-format off +class Level; +namespace ScriptModuleMinecraft { class ScriptGameRules; } +namespace Scripting { class WeakLifetimeScope; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptGameRulesFactory { +public: + // prevent constructor by default + ScriptGameRulesFactory& operator=(ScriptGameRulesFactory const&); + ScriptGameRulesFactory(ScriptGameRulesFactory const&); + ScriptGameRulesFactory(); + +public: + // NOLINTBEGIN + // symbol: + // ?getHandle@ScriptGameRulesFactory@ScriptModuleMinecraft@@SA?AV?$StrongTypedObjectHandle@VScriptGameRules@ScriptModuleMinecraft@@@Scripting@@AEAVWeakLifetimeScope@4@AEAVLevel@@@Z + MCAPI static class Scripting::StrongTypedObjectHandle + getHandle(class Scripting::WeakLifetimeScope&, class Level&); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptInvalidStructureError.h b/src/mc/scripting/modules/minecraft/ScriptInvalidStructureError.h new file mode 100644 index 0000000000..f2d53ab611 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptInvalidStructureError.h @@ -0,0 +1,31 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/ErrorBindingBuilder.h" + +namespace ScriptModuleMinecraft { + +struct ScriptInvalidStructureError { +public: + // prevent constructor by default + ScriptInvalidStructureError& operator=(ScriptInvalidStructureError const&); + ScriptInvalidStructureError(ScriptInvalidStructureError const&); + +public: + // NOLINTBEGIN + // symbol: ??0ScriptInvalidStructureError@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ScriptInvalidStructureError(); + + // symbol: ??1ScriptInvalidStructureError@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ~ScriptInvalidStructureError(); + + // symbol: + // ?bind@ScriptInvalidStructureError@ScriptModuleMinecraft@@SA?AV?$ErrorBindingBuilder@UScriptInvalidStructureError@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ErrorBindingBuilder bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptItemCooldownComponent.h b/src/mc/scripting/modules/minecraft/ScriptItemCooldownComponent.h index 1953843316..69c9877020 100644 --- a/src/mc/scripting/modules/minecraft/ScriptItemCooldownComponent.h +++ b/src/mc/scripting/modules/minecraft/ScriptItemCooldownComponent.h @@ -37,6 +37,14 @@ class ScriptItemCooldownComponent : public ::ScriptModuleMinecraft::ScriptItemCo // symbol: ?getCooldownTicks@ScriptItemCooldownComponent@ScriptModuleMinecraft@@QEAA?AV?$Result@H$$V@Scripting@@XZ MCAPI class Scripting::Result getCooldownTicks(); + // symbol: + // ?getCooldownTicksRemaining@ScriptItemCooldownComponent@ScriptModuleMinecraft@@QEAA?AV?$Result@H$$V@Scripting@@AEAVScriptPlayer@2@@Z + MCAPI class Scripting::Result getCooldownTicksRemaining(class ScriptModuleMinecraft::ScriptPlayer&); + + // symbol: + // ?isCooldownCategory@ScriptItemCooldownComponent@ScriptModuleMinecraft@@QEAA?AV?$Result@_N$$V@Scripting@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI class Scripting::Result isCooldownCategory(std::string const&); + // symbol: // ?startCooldown@ScriptItemCooldownComponent@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@AEAVScriptPlayer@2@@Z MCAPI class Scripting::Result startCooldown(class ScriptModuleMinecraft::ScriptPlayer&); diff --git a/src/mc/scripting/modules/minecraft/ScriptItemDefinitionAfterEvent.h b/src/mc/scripting/modules/minecraft/ScriptItemDefinitionAfterEvent.h deleted file mode 100644 index d027d6c08f..0000000000 --- a/src/mc/scripting/modules/minecraft/ScriptItemDefinitionAfterEvent.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" - -// auto generated forward declare list -// clang-format off -class Player; -namespace ScriptModuleMinecraft { class ScriptItemStack; } -namespace Scripting { class WeakLifetimeScope; } -struct ItemDefinitionEventTriggeredEvent; -// clang-format on - -namespace ScriptModuleMinecraft { - -struct ScriptItemDefinitionAfterEvent { -public: - // prevent constructor by default - ScriptItemDefinitionAfterEvent(); - -public: - // NOLINTBEGIN - // symbol: ??0ScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@QEAA@$$QEAU01@@Z - MCAPI ScriptItemDefinitionAfterEvent(struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent&&); - - // symbol: ??0ScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@QEAA@AEBU01@@Z - MCAPI ScriptItemDefinitionAfterEvent(struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent const&); - - // symbol: - // ??0ScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@AEBVPlayer@@AEBUItemDefinitionEventTriggeredEvent@@AEBVWeakLifetimeScope@3@@Z - MCAPI - ScriptItemDefinitionAfterEvent(class Scripting::StrongTypedObjectHandle, class Player const&, struct ItemDefinitionEventTriggeredEvent const&, class Scripting::WeakLifetimeScope const&); - - // symbol: ??4ScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent& - operator=(struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent&&); - - // symbol: ??4ScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@QEAAAEAU01@AEBU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent& - operator=(struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent const&); - - // symbol: ??1ScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@QEAA@XZ - MCAPI ~ScriptItemDefinitionAfterEvent(); - - // symbol: - // ?bind@ScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@@Scripting@@XZ - MCAPI static class Scripting::ClassBindingBuilder - bind(); - - // NOLINTEND -}; - -}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptItemDefinitionBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptItemDefinitionBeforeEvent.h deleted file mode 100644 index e7675efef3..0000000000 --- a/src/mc/scripting/modules/minecraft/ScriptItemDefinitionBeforeEvent.h +++ /dev/null @@ -1,55 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" - -// auto generated forward declare list -// clang-format off -class Player; -namespace ScriptModuleMinecraft { class ScriptItemStack; } -namespace Scripting { class WeakLifetimeScope; } -struct ItemDefinitionEventTriggeredEvent; -// clang-format on - -namespace ScriptModuleMinecraft { - -struct ScriptItemDefinitionBeforeEvent { -public: - // prevent constructor by default - ScriptItemDefinitionBeforeEvent& operator=(ScriptItemDefinitionBeforeEvent const&); - ScriptItemDefinitionBeforeEvent(); - -public: - // NOLINTBEGIN - // symbol: ??0ScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@QEAA@$$QEAU01@@Z - MCAPI ScriptItemDefinitionBeforeEvent(struct ScriptModuleMinecraft::ScriptItemDefinitionBeforeEvent&&); - - // symbol: ??0ScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBU01@@Z - MCAPI ScriptItemDefinitionBeforeEvent(struct ScriptModuleMinecraft::ScriptItemDefinitionBeforeEvent const&); - - // symbol: - // ??0ScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@AEAUItemDefinitionEventTriggeredEvent@@@Z - MCAPI - ScriptItemDefinitionBeforeEvent(class Scripting::StrongTypedObjectHandle, struct ItemDefinitionEventTriggeredEvent&); - - // symbol: - // ??0ScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@AEBVPlayer@@AEAUItemDefinitionEventTriggeredEvent@@AEBVWeakLifetimeScope@3@@Z - MCAPI - ScriptItemDefinitionBeforeEvent(class Scripting::StrongTypedObjectHandle, class Player const&, struct ItemDefinitionEventTriggeredEvent&, class Scripting::WeakLifetimeScope const&); - - // symbol: ??4ScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptItemDefinitionBeforeEvent& - operator=(struct ScriptModuleMinecraft::ScriptItemDefinitionBeforeEvent&&); - - // symbol: - // ?bind@ScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@@Scripting@@XZ - MCAPI static class Scripting::ClassBindingBuilder - bind(); - - // NOLINTEND -}; - -}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptItemEventListener.h b/src/mc/scripting/modules/minecraft/ScriptItemEventListener.h index 251f4532da..00c2547a00 100644 --- a/src/mc/scripting/modules/minecraft/ScriptItemEventListener.h +++ b/src/mc/scripting/modules/minecraft/ScriptItemEventListener.h @@ -15,7 +15,6 @@ class Player; namespace ScriptModuleMinecraft { class IScriptWorldAfterEvents; } namespace Scripting { class WeakLifetimeScope; } struct ItemCompleteUseEvent; -struct ItemDefinitionEventTriggeredEvent; struct ItemNotificationEvent; struct ItemReleaseUseEvent; struct ItemStartUseEvent; @@ -130,13 +129,6 @@ class ScriptItemEventListener { // ?onEvent@?$EventListenerDispatcher@VItemEventListener@@@@MEAA?AW4EventResult@@AEBUItemNotificationEvent@@@Z virtual ::EventResult onEvent(struct ItemNotificationEvent const& event); - // vIndex: 25, symbol: __unk_vfn_25 - virtual void __unk_vfn_25(); - - // vIndex: 26, symbol: - // ?onEvent@ScriptItemEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUItemDefinitionEventTriggeredEvent@@@Z - virtual ::EventResult onEvent(struct ItemDefinitionEventTriggeredEvent const&); - // symbol: // ??0ScriptItemEventListener@ScriptModuleMinecraft@@QEAA@AEBVWeakLifetimeScope@Scripting@@U?$TypedObjectHandle@VIScriptWorldAfterEvents@ScriptModuleMinecraft@@@3@@Z MCAPI ScriptItemEventListener( diff --git a/src/mc/scripting/modules/minecraft/ScriptItemStack.h b/src/mc/scripting/modules/minecraft/ScriptItemStack.h index e19363f0e7..e1042b6a07 100644 --- a/src/mc/scripting/modules/minecraft/ScriptItemStack.h +++ b/src/mc/scripting/modules/minecraft/ScriptItemStack.h @@ -11,7 +11,6 @@ // clang-format off class ItemInstance; class ItemStackBase; -class Level; class Vec3; namespace ScriptModuleMinecraft { class ScriptItemComponent; } namespace ScriptModuleMinecraft { class ScriptItemType; } @@ -121,6 +120,12 @@ class ScriptItemStack { // symbol: ?isStackableWith@ScriptItemStack@ScriptModuleMinecraft@@QEBA_NAEBV12@@Z MCAPI bool isStackableWith(class ScriptModuleMinecraft::ScriptItemStack const& other) const; + // symbol: + // ?matches@ScriptItemStack@ScriptModuleMinecraft@@QEBA_NV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$optional@V?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$variant@HV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$variant@HV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@2@@std@@@2@@std@@@4@@Z + MCAPI bool + matches(std::string, std::optional>>) + const; + // symbol: ??4ScriptItemStack@ScriptModuleMinecraft@@QEAAAEAV01@$$QEAV01@@Z MCAPI class ScriptModuleMinecraft::ScriptItemStack& operator=(class ScriptModuleMinecraft::ScriptItemStack&&); @@ -163,9 +168,9 @@ class ScriptItemStack { MCAPI ~ScriptItemStack(); // symbol: - // ?bind@ScriptItemStack@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@PEAVLevel@@AEBUVersion@4@@Z + // ?bind@ScriptItemStack@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@AEBUVersion@4@@Z MCAPI static class Scripting::ClassBindingBuilder - bind(class Level*, struct Scripting::Version const&); + bind(struct Scripting::Version const&); // symbol: // ?createHandle@ScriptItemStack@ScriptModuleMinecraft@@SA?AV?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@VWeakLifetimeScope@4@AEBVItemStackBase@@@Z diff --git a/src/mc/scripting/modules/minecraft/ScriptItemUseBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptItemUseBeforeEvent.h index cd7d3ab866..815a179689 100644 --- a/src/mc/scripting/modules/minecraft/ScriptItemUseBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptItemUseBeforeEvent.h @@ -4,12 +4,10 @@ // auto generated inclusion list #include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" // auto generated forward declare list // clang-format off class Player; -namespace ScriptModuleMinecraft { class ScriptItemStack; } namespace Scripting { class WeakLifetimeScope; } struct ItemUseEvent; // clang-format on @@ -26,13 +24,9 @@ struct ScriptItemUseBeforeEvent { public: // NOLINTBEGIN // symbol: - // ??0ScriptItemUseBeforeEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@AEBVPlayer@@AEAUItemUseEvent@@AEBVWeakLifetimeScope@3@@Z + // ??0ScriptItemUseBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBVPlayer@@AEBUItemUseEvent@@AEBVWeakLifetimeScope@Scripting@@@Z MCAPI - ScriptItemUseBeforeEvent(class Scripting::StrongTypedObjectHandle, class Player const&, struct ItemUseEvent&, class Scripting::WeakLifetimeScope const&); - - // symbol: ??4ScriptItemUseBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptItemUseBeforeEvent& - operator=(struct ScriptModuleMinecraft::ScriptItemUseBeforeEvent&&); + ScriptItemUseBeforeEvent(class Player const&, struct ItemUseEvent const&, class Scripting::WeakLifetimeScope const&); // symbol: // ?bind@ScriptItemUseBeforeEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptItemUseBeforeEvent@ScriptModuleMinecraft@@@Scripting@@XZ diff --git a/src/mc/scripting/modules/minecraft/ScriptItemUseOnAfterEvent.h b/src/mc/scripting/modules/minecraft/ScriptItemUseOnAfterEvent.h index 0824af45f3..fc4640d733 100644 --- a/src/mc/scripting/modules/minecraft/ScriptItemUseOnAfterEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptItemUseOnAfterEvent.h @@ -29,9 +29,9 @@ struct ScriptItemUseOnAfterEvent { MCAPI ScriptItemUseOnAfterEvent(struct ScriptModuleMinecraft::ScriptItemUseOnAfterEvent const&); // symbol: - // ??0ScriptItemUseOnAfterEvent@ScriptModuleMinecraft@@QEAA@AEBUItemUseOnEvent@@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@PEAVPlayer@@AEBVWeakLifetimeScope@4@@Z + // ??0ScriptItemUseOnAfterEvent@ScriptModuleMinecraft@@QEAA@AEBUItemUseOnEvent@@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@AEBVPlayer@@AEBVWeakLifetimeScope@4@@Z MCAPI - ScriptItemUseOnAfterEvent(struct ItemUseOnEvent const&, class Scripting::StrongTypedObjectHandle, class Player*, class Scripting::WeakLifetimeScope const&); + ScriptItemUseOnAfterEvent(struct ItemUseOnEvent const&, class Scripting::StrongTypedObjectHandle, class Player const&, class Scripting::WeakLifetimeScope const&); // symbol: // ?getBlockLocation_V010@ScriptItemUseOnAfterEvent@ScriptModuleMinecraft@@QEBA?AV?$Result@VBlockPos@@$$V@Scripting@@XZ diff --git a/src/mc/scripting/modules/minecraft/ScriptItemUseOnBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptItemUseOnBeforeEvent.h index c2fea8c284..f8fc443678 100644 --- a/src/mc/scripting/modules/minecraft/ScriptItemUseOnBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptItemUseOnBeforeEvent.h @@ -4,12 +4,10 @@ // auto generated inclusion list #include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" // auto generated forward declare list // clang-format off class Player; -namespace ScriptModuleMinecraft { class ScriptItemStack; } namespace Scripting { class WeakLifetimeScope; } struct ItemUseOnEvent; // clang-format on @@ -20,6 +18,7 @@ struct ScriptItemUseOnBeforeEvent { public: // prevent constructor by default ScriptItemUseOnBeforeEvent& operator=(ScriptItemUseOnBeforeEvent const&); + ScriptItemUseOnBeforeEvent(ScriptItemUseOnBeforeEvent const&); ScriptItemUseOnBeforeEvent(); public: @@ -27,13 +26,10 @@ struct ScriptItemUseOnBeforeEvent { // symbol: ??0ScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@QEAA@$$QEAU01@@Z MCAPI ScriptItemUseOnBeforeEvent(struct ScriptModuleMinecraft::ScriptItemUseOnBeforeEvent&&); - // symbol: ??0ScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBU01@@Z - MCAPI ScriptItemUseOnBeforeEvent(struct ScriptModuleMinecraft::ScriptItemUseOnBeforeEvent const&); - // symbol: - // ??0ScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@QEAA@AEAUItemUseOnEvent@@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@PEAVPlayer@@AEBVWeakLifetimeScope@4@@Z + // ??0ScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBUItemUseOnEvent@@AEBVPlayer@@AEBVWeakLifetimeScope@Scripting@@@Z MCAPI - ScriptItemUseOnBeforeEvent(struct ItemUseOnEvent&, class Scripting::StrongTypedObjectHandle, class Player*, class Scripting::WeakLifetimeScope const&); + ScriptItemUseOnBeforeEvent(struct ItemUseOnEvent const&, class Player const&, class Scripting::WeakLifetimeScope const&); // symbol: ??4ScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z MCAPI struct ScriptModuleMinecraft::ScriptItemUseOnBeforeEvent& diff --git a/src/mc/scripting/modules/minecraft/ScriptItems.h b/src/mc/scripting/modules/minecraft/ScriptItems.h index 3f9335dc0d..dc724e1801 100644 --- a/src/mc/scripting/modules/minecraft/ScriptItems.h +++ b/src/mc/scripting/modules/minecraft/ScriptItems.h @@ -39,6 +39,10 @@ class ScriptItems { MCAPI std::optional> getBetaItem(class Scripting::WeakLifetimeScope&, std::string const&); + // symbol: + // ?_getItemCooldownCategories@ScriptItems@ScriptModuleMinecraft@@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@@VItemRegistryRef@@@Z + MCAPI static std::vector _getItemCooldownCategories(class ItemRegistryRef); + // symbol: // ?_getPropertyToItemNameMap@ScriptItems@ScriptModuleMinecraft@@SA?AV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$tuple@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$tuple@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@2@@std@@@2@@std@@VItemRegistryRef@@@Z MCAPI static std::unordered_map> diff --git a/src/mc/scripting/modules/minecraft/ScriptLevelEventListener.h b/src/mc/scripting/modules/minecraft/ScriptLevelEventListener.h index a53314605c..b00b105e60 100644 --- a/src/mc/scripting/modules/minecraft/ScriptLevelEventListener.h +++ b/src/mc/scripting/modules/minecraft/ScriptLevelEventListener.h @@ -13,6 +13,7 @@ class Level; class Player; namespace ScriptModuleMinecraft { class IScriptWorldAfterEvents; } namespace Scripting { class WeakLifetimeScope; } +struct LevelGameRuleChangeEvent; struct LevelNotificationEvent; struct LevelStartLeaveGameEvent; struct ScriptingInitializeEvent; @@ -55,8 +56,8 @@ class ScriptLevelEventListener { virtual ::EventResult onLevelTickStart(class Level&); // vIndex: 7, symbol: - // ?onLevelWeatherChange@ScriptLevelEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N1@Z - virtual ::EventResult onLevelWeatherChange(std::string const& dimension, bool raining, bool lightning); + // ?onLevelWeatherChange@ScriptLevelEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N111@Z + virtual ::EventResult onLevelWeatherChange(std::string const&, bool, bool, bool, bool); // vIndex: 8, symbol: // ?onEvent@?$EventListenerDispatcher@VLevelEventListener@@@@MEAA?AW4EventResult@@AEBULevelNotificationEvent@@@Z @@ -70,6 +71,10 @@ class ScriptLevelEventListener { virtual ::EventResult onEvent(struct LevelStartLeaveGameEvent const&); // vIndex: 11, symbol: + // ?onEvent@ScriptLevelEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBULevelGameRuleChangeEvent@@@Z + virtual ::EventResult onEvent(struct LevelGameRuleChangeEvent const&); + + // vIndex: 12, symbol: // ?onEvent@ScriptLevelEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUScriptingInitializeEvent@@@Z virtual ::EventResult onEvent(struct ScriptingInitializeEvent const&); diff --git a/src/mc/scripting/modules/minecraft/ScriptMinecraftBlockProperties.h b/src/mc/scripting/modules/minecraft/ScriptMinecraftBlockProperties.h deleted file mode 100644 index 6cfdfbd92e..0000000000 --- a/src/mc/scripting/modules/minecraft/ScriptMinecraftBlockProperties.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/external/scripting/ClassBindingBuilder.h" - -namespace ScriptModuleMinecraft { - -class ScriptMinecraftBlockProperties { -public: - // prevent constructor by default - ScriptMinecraftBlockProperties& operator=(ScriptMinecraftBlockProperties const&); - ScriptMinecraftBlockProperties(ScriptMinecraftBlockProperties const&); - ScriptMinecraftBlockProperties(); - -public: - // NOLINTBEGIN - // symbol: - // ?bind@ScriptMinecraftBlockProperties@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptMinecraftBlockProperties@ScriptModuleMinecraft@@@Scripting@@XZ - MCAPI static class Scripting::ClassBindingBuilder - bind(); - - // NOLINTEND -}; - -}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptModuleMinecraft.h b/src/mc/scripting/modules/minecraft/ScriptModuleMinecraft.h index e046280801..bd8bb04d9c 100644 --- a/src/mc/scripting/modules/minecraft/ScriptModuleMinecraft.h +++ b/src/mc/scripting/modules/minecraft/ScriptModuleMinecraft.h @@ -10,11 +10,17 @@ #include "mc/entity/utilities/ActorDamageCause.h" #include "mc/entity/utilities/ActorInitializationMethod.h" #include "mc/entity/utilities/ActorSelectorType.h" +#include "mc/enums/AnimationMode.h" #include "mc/enums/CauldronLiquidType.h" #include "mc/enums/CurrentCmdVersion.h" #include "mc/enums/DynamicPropertyDefinePropertyError.h" #include "mc/enums/EasingType.h" +#include "mc/enums/GameType.h" +#include "mc/enums/HudElement.h" +#include "mc/enums/HudVisibility.h" +#include "mc/enums/Mirror.h" #include "mc/enums/PistonState.h" +#include "mc/enums/Rotation.h" #include "mc/enums/SignTextSide.h" #include "mc/enums/WatchdogTerminateReason.h" #include "mc/external/scripting/ClassBindingBuilder.h" @@ -51,6 +57,7 @@ #include "mc/world/level/block/utils/CompoundBlockVolumeAction.h" #include "mc/world/level/block/utils/CompoundBlockVolumePositionRelativity.h" #include "mc/world/level/block/utils/SimpleBlockVolume.h" +#include "mc/world/level/levelgen/structure/StructureRedstoneSaveMode.h" // auto generated forward declare list // clang-format off @@ -75,6 +82,7 @@ namespace ScriptModuleMinecraft { class ScriptBiomeType; } namespace ScriptModuleMinecraft { class ScriptBiomeTypes; } namespace ScriptModuleMinecraft { class ScriptBlock; } namespace ScriptModuleMinecraft { class ScriptBlockAreaSize; } +namespace ScriptModuleMinecraft { class ScriptBlockFilter; } namespace ScriptModuleMinecraft { class ScriptBlockInventoryComponent; } namespace ScriptModuleMinecraft { class ScriptBlockInventoryComponentContainer; } namespace ScriptModuleMinecraft { class ScriptBlockLavaContainerComponent; } @@ -91,6 +99,7 @@ namespace ScriptModuleMinecraft { class ScriptBlockStateType; } namespace ScriptModuleMinecraft { class ScriptBlockStates; } namespace ScriptModuleMinecraft { class ScriptBlockType; } namespace ScriptModuleMinecraft { class ScriptBlockTypes; } +namespace ScriptModuleMinecraft { class ScriptBlockVolumeBase; } namespace ScriptModuleMinecraft { class ScriptBlockWaterContainerComponent; } namespace ScriptModuleMinecraft { class ScriptBoolBlockProperty; } namespace ScriptModuleMinecraft { class ScriptBoundingBoxUtils; } @@ -110,6 +119,7 @@ namespace ScriptModuleMinecraft { class ScriptEffectType; } namespace ScriptModuleMinecraft { class ScriptEntityRaycastHit; } namespace ScriptModuleMinecraft { class ScriptEquippableComponent; } namespace ScriptModuleMinecraft { class ScriptFoodComponent; } +namespace ScriptModuleMinecraft { class ScriptGameRules; } namespace ScriptModuleMinecraft { class ScriptHealableComponent; } namespace ScriptModuleMinecraft { class ScriptHealthComponent; } namespace ScriptModuleMinecraft { class ScriptIntBlockProperty; } @@ -125,7 +135,6 @@ namespace ScriptModuleMinecraft { class ScriptItemType; } namespace ScriptModuleMinecraft { class ScriptLavaMovementComponent; } namespace ScriptModuleMinecraft { class ScriptLeashableComponent; } namespace ScriptModuleMinecraft { class ScriptLiquidContainer; } -namespace ScriptModuleMinecraft { class ScriptMinecraftBlockProperties; } namespace ScriptModuleMinecraft { class ScriptMobEffectInstance; } namespace ScriptModuleMinecraft { class ScriptMolangVariableMap; } namespace ScriptModuleMinecraft { class ScriptMountTamingComponent; } @@ -161,14 +170,17 @@ namespace ScriptModuleMinecraft { class ScriptScoreboardIdentity; } namespace ScriptModuleMinecraft { class ScriptScoreboardObjective; } namespace ScriptModuleMinecraft { class ScriptScoreboardObjectiveDisplayOptions; } namespace ScriptModuleMinecraft { class ScriptScoreboardScoreInfo; } -namespace ScriptModuleMinecraft { class ScriptSimpleBlockVolumeUtils; } +namespace ScriptModuleMinecraft { class ScriptSimpleBlockVolume; } namespace ScriptModuleMinecraft { class ScriptStrengthComponent; } namespace ScriptModuleMinecraft { class ScriptStringBlockProperty; } +namespace ScriptModuleMinecraft { class ScriptStructureManager; } +namespace ScriptModuleMinecraft { class ScriptStructureTemplate; } namespace ScriptModuleMinecraft { class ScriptSystem; } namespace ScriptModuleMinecraft { class ScriptSystemAfterEvents; } namespace ScriptModuleMinecraft { class ScriptSystemBeforeEvents; } namespace ScriptModuleMinecraft { class ScriptTameableComponent; } namespace ScriptModuleMinecraft { class ScriptTickSignal; } +namespace ScriptModuleMinecraft { class ScriptTypeFamilyComponent; } namespace ScriptModuleMinecraft { class ScriptUnderwaterMovementComponent; } namespace ScriptModuleMinecraft { class ScriptV010Events; } namespace ScriptModuleMinecraft { class ScriptVector; } @@ -226,10 +238,10 @@ namespace ScriptModuleMinecraft { struct ScriptEventMessageFilterOptions; } namespace ScriptModuleMinecraft { struct ScriptExplosionOptions; } namespace ScriptModuleMinecraft { struct ScriptExplosionStartedAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptExplosionStartedBeforeEvent; } +namespace ScriptModuleMinecraft { struct ScriptGameRuleChangeAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptInvalidContainerSlotError; } +namespace ScriptModuleMinecraft { struct ScriptInvalidStructureError; } namespace ScriptModuleMinecraft { struct ScriptItemCompleteUseAfterEvent; } -namespace ScriptModuleMinecraft { struct ScriptItemDefinitionAfterEvent; } -namespace ScriptModuleMinecraft { struct ScriptItemDefinitionBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptItemEnchantmentInstance; } namespace ScriptModuleMinecraft { struct ScriptItemEnchantmentLevelOutOfBoundsError; } namespace ScriptModuleMinecraft { struct ScriptItemEnchantmentType; } @@ -254,6 +266,8 @@ namespace ScriptModuleMinecraft { struct ScriptPlayAnimationOptions; } namespace ScriptModuleMinecraft { struct ScriptPlayerBreakBlockAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerBreakBlockBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerDimensionChangeAfterEvent; } +namespace ScriptModuleMinecraft { struct ScriptPlayerGameModeChangeAfterEvent; } +namespace ScriptModuleMinecraft { struct ScriptPlayerGameModeChangeBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithBlockAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithBlockBeforeEvent; } @@ -279,6 +293,9 @@ namespace ScriptModuleMinecraft { struct ScriptScoreTargetSelectorOption; } namespace ScriptModuleMinecraft { struct ScriptScreenDisplay; } namespace ScriptModuleMinecraft { struct ScriptServerMessageAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptSoundOptions; } +namespace ScriptModuleMinecraft { struct ScriptStructureCreateOptions; } +namespace ScriptModuleMinecraft { struct ScriptStructurePlaceOptions; } +namespace ScriptModuleMinecraft { struct ScriptStructureReadOptions; } namespace ScriptModuleMinecraft { struct ScriptTargetBlockHitAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptTeleportOptions; } namespace ScriptModuleMinecraft { struct ScriptTickEvent; } @@ -334,6 +351,12 @@ bindFacingEnumV010(); // ?bindFacingEnumV1@ScriptModuleMinecraft@@YA?AV?$EnumBindingBuilder@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4ScriptFacing@ScriptModuleMinecraft@@@Scripting@@XZ MCAPI class Scripting::EnumBindingBuilder bindFacingEnumV1(); +// symbol: ?bindHudElements@ScriptModuleMinecraft@@YAXAEAVModuleBindingBuilder@Scripting@@@Z +MCAPI void bindHudElements(class Scripting::ModuleBindingBuilder&); + +// symbol: ?bindHudVisibility@ScriptModuleMinecraft@@YAXAEAVModuleBindingBuilder@Scripting@@@Z +MCAPI void bindHudVisibility(class Scripting::ModuleBindingBuilder&); + // symbol: // ?bindItemLockMode@ScriptModuleMinecraft@@YA?AV?$EnumBindingBuilder@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4ItemLockMode@@@Scripting@@XZ MCAPI class Scripting::EnumBindingBuilder bindItemLockMode(); @@ -361,10 +384,10 @@ MCAPI class Scripting:: // ?getScriptScoreboardParticipantName@ScriptModuleMinecraft@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$variant@V?$StrongTypedObjectHandle@VScriptScoreboardIdentity@ScriptModuleMinecraft@@@Scripting@@V?$StrongTypedObjectHandle@VScriptActor@ScriptModuleMinecraft@@@2@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@3@@Z MCAPI std::string getScriptScoreboardParticipantName(std::variant< - class Scripting::StrongTypedObjectHandle< - class ScriptModuleMinecraft::ScriptScoreboardIdentity>, - class Scripting::StrongTypedObjectHandle, - std::string> const&); + class Scripting::StrongTypedObjectHandle< + class ScriptModuleMinecraft::ScriptScoreboardIdentity>, + class Scripting::StrongTypedObjectHandle, + std::string> const&); // NOLINTEND }; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptModuleMinecraftDebugUtilities.h b/src/mc/scripting/modules/minecraft/ScriptModuleMinecraftDebugUtilities.h new file mode 100644 index 0000000000..4e6834faed --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptModuleMinecraftDebugUtilities.h @@ -0,0 +1,10 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace Scripting { struct Version; } +// clang-format on + +namespace ScriptModuleMinecraftDebugUtilities {}; diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayer.h b/src/mc/scripting/modules/minecraft/ScriptPlayer.h index 3e9a681576..21cc799853 100644 --- a/src/mc/scripting/modules/minecraft/ScriptPlayer.h +++ b/src/mc/scripting/modules/minecraft/ScriptPlayer.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/enums/GameType.h" #include "mc/external/scripting/ClassBindingBuilder.h" #include "mc/external/scripting/Result.h" #include "mc/external/scripting/StrongTypedObjectHandle.h" @@ -90,6 +91,9 @@ class ScriptPlayer : public ::ScriptModuleMinecraft::ScriptActor { MCAPI class Scripting::Result> getCamera(); + // symbol: ?getGameMode@ScriptPlayer@ScriptModuleMinecraft@@QEBA?AV?$Result@W4GameType@@$$V@Scripting@@XZ + MCAPI class Scripting::Result<::GameType> getGameMode() const; + // symbol: // ?getItemCooldownLeft@ScriptPlayer@ScriptModuleMinecraft@@QEBA?AV?$Result@H$$V@Scripting@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI class Scripting::Result getItemCooldownLeft(std::string const& type) const; @@ -176,6 +180,10 @@ class ScriptPlayer : public ::ScriptModuleMinecraft::ScriptActor { std::vector>> const& var ) const; + // symbol: + // ?setGameMode@ScriptPlayer@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@V?$optional@W4GameType@@@std@@@Z + MCAPI class Scripting::Result setGameMode(std::optional<::GameType>); + // symbol: ?setOp@ScriptPlayer@ScriptModuleMinecraft@@QEBA?AV?$Result@X$$V@Scripting@@_N@Z MCAPI class Scripting::Result setOp(bool) const; diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayerBreakBlockBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptPlayerBreakBlockBeforeEvent.h index 2123efe38e..78634819f6 100644 --- a/src/mc/scripting/modules/minecraft/ScriptPlayerBreakBlockBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptPlayerBreakBlockBeforeEvent.h @@ -4,14 +4,13 @@ // auto generated inclusion list #include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" // auto generated forward declare list // clang-format off class BlockPos; class Dimension; class ItemStackBase; -namespace ScriptModuleMinecraft { class ScriptPlayer; } +class Player; namespace Scripting { class WeakLifetimeScope; } // clang-format on @@ -32,9 +31,9 @@ struct ScriptPlayerBreakBlockBeforeEvent { MCAPI ScriptPlayerBreakBlockBeforeEvent(struct ScriptModuleMinecraft::ScriptPlayerBreakBlockBeforeEvent const&); // symbol: - // ??0ScriptPlayerBreakBlockBeforeEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptPlayer@ScriptModuleMinecraft@@@Scripting@@AEAVDimension@@AEBVBlockPos@@AEBVItemStackBase@@AEBVWeakLifetimeScope@3@@Z + // ??0ScriptPlayerBreakBlockBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBVPlayer@@AEAVDimension@@AEBVBlockPos@@AEBVItemStackBase@@AEBVWeakLifetimeScope@Scripting@@@Z MCAPI - ScriptPlayerBreakBlockBeforeEvent(class Scripting::StrongTypedObjectHandle, class Dimension&, class BlockPos const&, class ItemStackBase const&, class Scripting::WeakLifetimeScope const&); + ScriptPlayerBreakBlockBeforeEvent(class Player const&, class Dimension&, class BlockPos const&, class ItemStackBase const&, class Scripting::WeakLifetimeScope const&); // symbol: ??4ScriptPlayerBreakBlockBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z MCAPI struct ScriptModuleMinecraft::ScriptPlayerBreakBlockBeforeEvent& diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayerEventListener.h b/src/mc/scripting/modules/minecraft/ScriptPlayerEventListener.h index 54da7c4e56..30b14f2bef 100644 --- a/src/mc/scripting/modules/minecraft/ScriptPlayerEventListener.h +++ b/src/mc/scripting/modules/minecraft/ScriptPlayerEventListener.h @@ -11,9 +11,10 @@ namespace ScriptModuleMinecraft { class IScriptWorldAfterEvents; } namespace Scripting { class WeakLifetimeScope; } struct PlayerDimensionChangeAfterEvent; +struct PlayerGameModeChangeEvent; struct PlayerInitialSpawnEvent; -struct PlayerInteractWithBlockEvent; -struct PlayerInteractWithEntityEvent; +struct PlayerInteractWithBlockAfterEvent; +struct PlayerInteractWithEntityAfterEvent; struct PlayerNotificationEvent; struct PlayerRespawnEvent; // clang-format on @@ -153,17 +154,16 @@ class ScriptPlayerEventListener { virtual void __unk_vfn_40(); // vIndex: 41, symbol: - // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerInteractWithEntityEvent@@@Z - virtual ::EventResult onEvent(struct PlayerInteractWithEntityEvent const&); + // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerGameModeChangeEvent@@@Z + virtual ::EventResult onEvent(struct PlayerGameModeChangeEvent const&); // vIndex: 42, symbol: - // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerInteractWithBlockEvent@@@Z - virtual ::EventResult onEvent(struct PlayerInteractWithBlockEvent const&); - - // vIndex: 43, symbol: // ?onEvent@?$EventListenerDispatcher@VPlayerEventListener@@@@MEAA?AW4EventResult@@AEBUPlayerNotificationEvent@@@Z virtual ::EventResult onEvent(struct PlayerNotificationEvent const& event); + // vIndex: 43, symbol: __unk_vfn_43 + virtual void __unk_vfn_43(); + // vIndex: 44, symbol: __unk_vfn_44 virtual void __unk_vfn_44(); @@ -173,25 +173,26 @@ class ScriptPlayerEventListener { // vIndex: 46, symbol: __unk_vfn_46 virtual void __unk_vfn_46(); - // vIndex: 47, symbol: + // vIndex: 47, symbol: __unk_vfn_47 + virtual void __unk_vfn_47(); + + // vIndex: 48, symbol: // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerDimensionChangeAfterEvent@@@Z virtual ::EventResult onEvent(struct PlayerDimensionChangeAfterEvent const&); - // vIndex: 48, symbol: __unk_vfn_48 - virtual void __unk_vfn_48(); + // vIndex: 49, symbol: + // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerInteractWithEntityAfterEvent@@@Z + virtual ::EventResult onEvent(struct PlayerInteractWithEntityAfterEvent const&); - // vIndex: 49, symbol: __unk_vfn_49 - virtual void __unk_vfn_49(); - - // vIndex: 50, symbol: __unk_vfn_50 - virtual void __unk_vfn_50(); + // vIndex: 50, symbol: + // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerInteractWithBlockAfterEvent@@@Z + virtual ::EventResult onEvent(struct PlayerInteractWithBlockAfterEvent const&); // vIndex: 51, symbol: __unk_vfn_51 virtual void __unk_vfn_51(); - // vIndex: 52, symbol: - // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerRespawnEvent@@@Z - virtual ::EventResult onEvent(struct PlayerRespawnEvent const&); + // vIndex: 52, symbol: __unk_vfn_52 + virtual void __unk_vfn_52(); // vIndex: 53, symbol: __unk_vfn_53 virtual void __unk_vfn_53(); @@ -200,6 +201,16 @@ class ScriptPlayerEventListener { virtual void __unk_vfn_54(); // vIndex: 55, symbol: + // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerRespawnEvent@@@Z + virtual ::EventResult onEvent(struct PlayerRespawnEvent const&); + + // vIndex: 56, symbol: __unk_vfn_56 + virtual void __unk_vfn_56(); + + // vIndex: 57, symbol: __unk_vfn_57 + virtual void __unk_vfn_57(); + + // vIndex: 58, symbol: // ?onEvent@ScriptPlayerEventListener@ScriptModuleMinecraft@@UEAA?AW4EventResult@@AEBUPlayerInitialSpawnEvent@@@Z virtual ::EventResult onEvent(struct PlayerInitialSpawnEvent const&); diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayerGameModeChangeAfterEvent.h b/src/mc/scripting/modules/minecraft/ScriptPlayerGameModeChangeAfterEvent.h new file mode 100644 index 0000000000..dba5f052f2 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptPlayerGameModeChangeAfterEvent.h @@ -0,0 +1,35 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/ClassBindingBuilder.h" + +namespace ScriptModuleMinecraft { + +struct ScriptPlayerGameModeChangeAfterEvent { +public: + // prevent constructor by default + ScriptPlayerGameModeChangeAfterEvent(ScriptPlayerGameModeChangeAfterEvent const&); + ScriptPlayerGameModeChangeAfterEvent(); + +public: + // NOLINTBEGIN + // symbol: ??4ScriptPlayerGameModeChangeAfterEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeAfterEvent& + operator=(struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeAfterEvent&&); + + // symbol: ??4ScriptPlayerGameModeChangeAfterEvent@ScriptModuleMinecraft@@QEAAAEAU01@AEBU01@@Z + MCAPI struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeAfterEvent& + operator=(struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeAfterEvent const&); + + // symbol: + // ?bind@ScriptPlayerGameModeChangeAfterEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptPlayerGameModeChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ClassBindingBuilder< + struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeAfterEvent> + bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayerGameModeChangeBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptPlayerGameModeChangeBeforeEvent.h new file mode 100644 index 0000000000..ddd8523da3 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptPlayerGameModeChangeBeforeEvent.h @@ -0,0 +1,40 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/enums/GameType.h" +#include "mc/external/scripting/ClassBindingBuilder.h" + +// auto generated forward declare list +// clang-format off +class Player; +namespace Scripting { class WeakLifetimeScope; } +// clang-format on + +namespace ScriptModuleMinecraft { + +struct ScriptPlayerGameModeChangeBeforeEvent { +public: + // prevent constructor by default + ScriptPlayerGameModeChangeBeforeEvent& operator=(ScriptPlayerGameModeChangeBeforeEvent const&); + ScriptPlayerGameModeChangeBeforeEvent(ScriptPlayerGameModeChangeBeforeEvent const&); + ScriptPlayerGameModeChangeBeforeEvent(); + +public: + // NOLINTBEGIN + // symbol: + // ??0ScriptPlayerGameModeChangeBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBVPlayer@@W4GameType@@1AEBVWeakLifetimeScope@Scripting@@@Z + MCAPI + ScriptPlayerGameModeChangeBeforeEvent(class Player const&, ::GameType, ::GameType, class Scripting::WeakLifetimeScope const&); + + // symbol: + // ?bind@ScriptPlayerGameModeChangeBeforeEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptPlayerGameModeChangeBeforeEvent@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ClassBindingBuilder< + struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeBeforeEvent> + bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithBlockBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithBlockBeforeEvent.h index 839834334f..12a8f95c01 100644 --- a/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithBlockBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithBlockBeforeEvent.h @@ -4,15 +4,12 @@ // auto generated inclusion list #include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" -#include "mc/scripting/modules/minecraft/ScriptFacing.h" // auto generated forward declare list // clang-format off -class Vec3; -namespace ScriptModuleMinecraft { class ScriptBlock; } -namespace ScriptModuleMinecraft { class ScriptItemStack; } -namespace ScriptModuleMinecraft { class ScriptPlayer; } +class Player; +namespace Scripting { class WeakLifetimeScope; } +struct PlayerInteractWithBlockBeforeEvent; // clang-format on namespace ScriptModuleMinecraft { @@ -21,6 +18,7 @@ struct ScriptPlayerInteractWithBlockBeforeEvent { public: // prevent constructor by default ScriptPlayerInteractWithBlockBeforeEvent& operator=(ScriptPlayerInteractWithBlockBeforeEvent const&); + ScriptPlayerInteractWithBlockBeforeEvent(ScriptPlayerInteractWithBlockBeforeEvent const&); ScriptPlayerInteractWithBlockBeforeEvent(); public: @@ -29,23 +27,10 @@ struct ScriptPlayerInteractWithBlockBeforeEvent { MCAPI ScriptPlayerInteractWithBlockBeforeEvent(struct ScriptModuleMinecraft::ScriptPlayerInteractWithBlockBeforeEvent&&); - // symbol: ??0ScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBU01@@Z - MCAPI ScriptPlayerInteractWithBlockBeforeEvent(struct ScriptModuleMinecraft:: - ScriptPlayerInteractWithBlockBeforeEvent const&); - // symbol: - // ??0ScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptPlayer@ScriptModuleMinecraft@@@Scripting@@V?$optional@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@@std@@V?$StrongTypedObjectHandle@VScriptBlock@ScriptModuleMinecraft@@@3@W4ScriptFacing@1@VVec3@@@Z - MCAPI ScriptPlayerInteractWithBlockBeforeEvent( - class Scripting::StrongTypedObjectHandle, - std::optional>, - class Scripting::StrongTypedObjectHandle, - ::ScriptModuleMinecraft::ScriptFacing, - class Vec3 - ); - - // symbol: ??4ScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptPlayerInteractWithBlockBeforeEvent& - operator=(struct ScriptModuleMinecraft::ScriptPlayerInteractWithBlockBeforeEvent&&); + // ??0ScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@QEAA@AEAVPlayer@@AEBUPlayerInteractWithBlockBeforeEvent@@AEAVWeakLifetimeScope@Scripting@@@Z + MCAPI + ScriptPlayerInteractWithBlockBeforeEvent(class Player&, struct PlayerInteractWithBlockBeforeEvent const&, class Scripting::WeakLifetimeScope&); // symbol: // ?bind@ScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@XZ diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithEntityBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithEntityBeforeEvent.h index e18ca37f79..9768da5891 100644 --- a/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithEntityBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptPlayerInteractWithEntityBeforeEvent.h @@ -4,13 +4,13 @@ // auto generated inclusion list #include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" // auto generated forward declare list // clang-format off -namespace ScriptModuleMinecraft { class ScriptActor; } -namespace ScriptModuleMinecraft { class ScriptItemStack; } -namespace ScriptModuleMinecraft { class ScriptPlayer; } +class Actor; +class Player; +namespace Scripting { class WeakLifetimeScope; } +struct PlayerInteractWithEntityBeforeEvent; // clang-format on namespace ScriptModuleMinecraft { @@ -28,13 +28,9 @@ struct ScriptPlayerInteractWithEntityBeforeEvent { ScriptPlayerInteractWithEntityBeforeEvent const&); // symbol: - // ??0ScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptPlayer@ScriptModuleMinecraft@@@Scripting@@V?$optional@V?$StrongTypedObjectHandle@VScriptItemStack@ScriptModuleMinecraft@@@Scripting@@@std@@V?$StrongTypedObjectHandle@VScriptActor@ScriptModuleMinecraft@@@3@@Z + // ??0ScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@QEAA@AEAVPlayer@@AEAVActor@@AEBUPlayerInteractWithEntityBeforeEvent@@AEAVWeakLifetimeScope@Scripting@@@Z MCAPI - ScriptPlayerInteractWithEntityBeforeEvent(class Scripting::StrongTypedObjectHandle, std::optional>, class Scripting::StrongTypedObjectHandle); - - // symbol: ??4ScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct ScriptModuleMinecraft::ScriptPlayerInteractWithEntityBeforeEvent& - operator=(struct ScriptModuleMinecraft::ScriptPlayerInteractWithEntityBeforeEvent&&); + ScriptPlayerInteractWithEntityBeforeEvent(class Player&, class Actor&, struct PlayerInteractWithEntityBeforeEvent const&, class Scripting::WeakLifetimeScope&); // symbol: // ?bind@ScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@UScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@@Scripting@@XZ diff --git a/src/mc/scripting/modules/minecraft/ScriptPlayerPlaceBlockBeforeEvent.h b/src/mc/scripting/modules/minecraft/ScriptPlayerPlaceBlockBeforeEvent.h index bf20e6eba2..2ea8531fb1 100644 --- a/src/mc/scripting/modules/minecraft/ScriptPlayerPlaceBlockBeforeEvent.h +++ b/src/mc/scripting/modules/minecraft/ScriptPlayerPlaceBlockBeforeEvent.h @@ -4,15 +4,14 @@ // auto generated inclusion list #include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/StrongTypedObjectHandle.h" // auto generated forward declare list // clang-format off class Block; class BlockPos; class Dimension; +class Player; class Vec3; -namespace ScriptModuleMinecraft { class ScriptPlayer; } namespace Scripting { class WeakLifetimeScope; } // clang-format on @@ -30,9 +29,9 @@ struct ScriptPlayerPlaceBlockBeforeEvent { MCAPI ScriptPlayerPlaceBlockBeforeEvent(struct ScriptModuleMinecraft::ScriptPlayerPlaceBlockBeforeEvent const&); // symbol: - // ??0ScriptPlayerPlaceBlockBeforeEvent@ScriptModuleMinecraft@@QEAA@V?$StrongTypedObjectHandle@VScriptPlayer@ScriptModuleMinecraft@@@Scripting@@AEAVDimension@@AEBVBlockPos@@EAEBVVec3@@AEBVBlock@@AEBVWeakLifetimeScope@3@@Z + // ??0ScriptPlayerPlaceBlockBeforeEvent@ScriptModuleMinecraft@@QEAA@AEBVPlayer@@AEAVDimension@@AEBVBlockPos@@EAEBVVec3@@AEBVBlock@@AEBVWeakLifetimeScope@Scripting@@@Z MCAPI - ScriptPlayerPlaceBlockBeforeEvent(class Scripting::StrongTypedObjectHandle, class Dimension&, class BlockPos const&, uchar, class Vec3 const&, class Block const&, class Scripting::WeakLifetimeScope const&); + ScriptPlayerPlaceBlockBeforeEvent(class Player const&, class Dimension&, class BlockPos const&, uchar, class Vec3 const&, class Block const&, class Scripting::WeakLifetimeScope const&); // symbol: ??4ScriptPlayerPlaceBlockBeforeEvent@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z MCAPI struct ScriptModuleMinecraft::ScriptPlayerPlaceBlockBeforeEvent& diff --git a/src/mc/scripting/modules/minecraft/ScriptScoreboard.h b/src/mc/scripting/modules/minecraft/ScriptScoreboard.h index ed4cc35a36..54654da815 100644 --- a/src/mc/scripting/modules/minecraft/ScriptScoreboard.h +++ b/src/mc/scripting/modules/minecraft/ScriptScoreboard.h @@ -107,11 +107,11 @@ class ScriptScoreboard { // ?tryGetScoreboardParticipantScoreboardId@ScriptScoreboard@ScriptModuleMinecraft@@QEBA?AV?$optional@UScoreboardId@@@std@@AEBV?$variant@V?$StrongTypedObjectHandle@VScriptScoreboardIdentity@ScriptModuleMinecraft@@@Scripting@@V?$StrongTypedObjectHandle@VScriptActor@ScriptModuleMinecraft@@@2@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@4@@Z MCAPI std::optional tryGetScoreboardParticipantScoreboardId(std::variant< - class Scripting::StrongTypedObjectHandle< - class ScriptModuleMinecraft::ScriptScoreboardIdentity>, - class Scripting::StrongTypedObjectHandle< - class ScriptModuleMinecraft::ScriptActor>, - std::string> const&) const; + class Scripting::StrongTypedObjectHandle< + class ScriptModuleMinecraft::ScriptScoreboardIdentity>, + class Scripting::StrongTypedObjectHandle< + class ScriptModuleMinecraft::ScriptActor>, + std::string> const&) const; // symbol: // ?bind@ScriptScoreboard@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptScoreboard@ScriptModuleMinecraft@@@Scripting@@XZ diff --git a/src/mc/scripting/modules/minecraft/ScriptScreenDisplay.h b/src/mc/scripting/modules/minecraft/ScriptScreenDisplay.h index a77719b336..a0dc66ffc6 100644 --- a/src/mc/scripting/modules/minecraft/ScriptScreenDisplay.h +++ b/src/mc/scripting/modules/minecraft/ScriptScreenDisplay.h @@ -3,6 +3,8 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/enums/HudElement.h" +#include "mc/enums/HudVisibility.h" #include "mc/external/scripting/ClassBindingBuilder.h" #include "mc/external/scripting/Result.h" @@ -24,6 +26,21 @@ struct ScriptScreenDisplay { public: // NOLINTBEGIN + // symbol: + // ?getHiddenHudElements@ScriptScreenDisplay@ScriptModuleMinecraft@@QEAA?AV?$Result@V?$vector@W4HudElement@@V?$allocator@W4HudElement@@@std@@@std@@$$V@Scripting@@XZ + MCAPI class Scripting::Result> getHiddenHudElements(); + + // symbol: + // ?hideAllExcept@ScriptScreenDisplay@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@V?$optional@V?$vector@W4HudElement@@V?$allocator@W4HudElement@@@std@@@std@@@std@@@Z + MCAPI class Scripting::Result hideAllExcept(std::optional>); + + // symbol: + // ?isForcedHidden@ScriptScreenDisplay@ScriptModuleMinecraft@@QEAA?AV?$Result@_N$$V@Scripting@@W4HudElement@@@Z + MCAPI class Scripting::Result isForcedHidden(::HudElement); + + // symbol: ?resetHudElements@ScriptScreenDisplay@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@XZ + MCAPI class Scripting::Result resetHudElements(); + // symbol: // ?setActionBar@ScriptScreenDisplay@ScriptModuleMinecraft@@QEBA?AV?$Result@X$$V@Scripting@@AEBV?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UScriptRawMessageInterface@ScriptModuleMinecraft@@V?$vector@V?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UScriptRawMessageInterface@ScriptModuleMinecraft@@@std@@V?$allocator@V?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UScriptRawMessageInterface@ScriptModuleMinecraft@@@std@@@2@@2@@std@@@Z MCAPI class Scripting::Result @@ -33,6 +50,10 @@ struct ScriptScreenDisplay { std::vector< std::variant>> const&) const; + // symbol: + // ?setHudVisibility@ScriptScreenDisplay@ScriptModuleMinecraft@@QEAA?AV?$Result@X$$V@Scripting@@W4HudVisibility@@V?$optional@V?$vector@W4HudElement@@V?$allocator@W4HudElement@@@std@@@std@@@std@@@Z + MCAPI class Scripting::Result setHudVisibility(::HudVisibility, std::optional>); + // symbol: // ?setTitle@ScriptScreenDisplay@ScriptModuleMinecraft@@QEBA?AV?$Result@X$$V@Scripting@@AEBV?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UScriptRawMessageInterface@ScriptModuleMinecraft@@V?$vector@V?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UScriptRawMessageInterface@ScriptModuleMinecraft@@@std@@V?$allocator@V?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UScriptRawMessageInterface@ScriptModuleMinecraft@@@std@@@2@@2@@std@@V?$optional@UScriptTitleDisplayOptions@ScriptModuleMinecraft@@@6@@Z MCAPI class Scripting::Result diff --git a/src/mc/scripting/modules/minecraft/ScriptSimpleBlockVolume.h b/src/mc/scripting/modules/minecraft/ScriptSimpleBlockVolume.h index 3893a0e329..42c37c4814 100644 --- a/src/mc/scripting/modules/minecraft/ScriptSimpleBlockVolume.h +++ b/src/mc/scripting/modules/minecraft/ScriptSimpleBlockVolume.h @@ -3,27 +3,78 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/external/scripting/InterfaceBindingBuilder.h" +#include "mc/external/scripting/ClassBindingBuilder.h" +#include "mc/external/scripting/EnumBindingBuilder.h" +#include "mc/external/scripting/StrongTypedObjectHandle.h" +#include "mc/scripting/modules/minecraft/ScriptBlockVolumeBase.h" +#include "mc/world/level/block/utils/SimpleBlockVolume.h" // auto generated forward declare list // clang-format off -class SimpleBlockVolume; +class Vec3; +namespace ScriptModuleMinecraft { class ScriptBlockLocationIterator; } +namespace ScriptModuleMinecraft { class ScriptBlockVolumeBase; } +namespace Scripting { class WeakLifetimeScope; } // clang-format on namespace ScriptModuleMinecraft { -class ScriptSimpleBlockVolume { -public: - // prevent constructor by default - ScriptSimpleBlockVolume& operator=(ScriptSimpleBlockVolume const&); - ScriptSimpleBlockVolume(ScriptSimpleBlockVolume const&); - ScriptSimpleBlockVolume(); - +class ScriptSimpleBlockVolume : public ::ScriptModuleMinecraft::ScriptBlockVolumeBase { public: // NOLINTBEGIN + // vIndex: 0, symbol: ??1ScriptSimpleBlockVolume@ScriptModuleMinecraft@@UEAA@XZ + virtual ~ScriptSimpleBlockVolume(); + + // vIndex: 1, symbol: + // ?getBlockLocationIterator@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@UEAA?AV?$StrongTypedObjectHandle@VScriptBlockLocationIterator@ScriptModuleMinecraft@@@Scripting@@VWeakLifetimeScope@4@@Z + virtual class Scripting::StrongTypedObjectHandle + getBlockLocationIterator(class Scripting::WeakLifetimeScope); + + // symbol: ??0ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ScriptSimpleBlockVolume(); + + // symbol: ??0ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAA@AEBV01@@Z + MCAPI ScriptSimpleBlockVolume(class ScriptModuleMinecraft::ScriptSimpleBlockVolume const&); + + // symbol: ??0ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAA@AEBVVec3@@0@Z + MCAPI ScriptSimpleBlockVolume(class Vec3 const&, class Vec3 const&); + + // symbol: ?doesLocationTouchFaces@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAA_NAEBVVec3@@@Z + MCAPI bool doesLocationTouchFaces(class Vec3 const&); + + // symbol: ?doesVolumeTouchFaces@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAA_NAEBV12@@Z + MCAPI bool doesVolumeTouchFaces(class ScriptModuleMinecraft::ScriptSimpleBlockVolume const&); + + // symbol: ?getFrom@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEBA?AVVec3@@XZ + MCAPI class Vec3 getFrom() const; + + // symbol: ?getTo@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEBA?AVVec3@@XZ + MCAPI class Vec3 getTo() const; + + // symbol: + // ?intersects@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAA?AW4IntersectionResult@SimpleBlockVolume@@AEBV12@@Z + MCAPI ::SimpleBlockVolume::IntersectionResult + intersects(class ScriptModuleMinecraft::ScriptSimpleBlockVolume const&); + + // symbol: ??4ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAAAEAV01@AEBV01@@Z + MCAPI class ScriptModuleMinecraft::ScriptSimpleBlockVolume& + operator=(class ScriptModuleMinecraft::ScriptSimpleBlockVolume const&); + + // symbol: ?setFrom@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAAXAEBVVec3@@@Z + MCAPI void setFrom(class Vec3 const&); + + // symbol: ?setTo@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@QEAAXAEBVVec3@@@Z + MCAPI void setTo(class Vec3 const&); + + // symbol: + // ?bind@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptSimpleBlockVolume@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ClassBindingBuilder bind(); + // symbol: - // ?bind@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@SA?AV?$InterfaceBindingBuilder@VSimpleBlockVolume@@@Scripting@@XZ - MCAPI static class Scripting::InterfaceBindingBuilder bind(); + // ?bindEnums@ScriptSimpleBlockVolume@ScriptModuleMinecraft@@SA?AV?$EnumBindingBuilder@W4IntersectionResult@SimpleBlockVolume@@W412@@Scripting@@XZ + MCAPI static class Scripting:: + EnumBindingBuilder<::SimpleBlockVolume::IntersectionResult, ::SimpleBlockVolume::IntersectionResult> + bindEnums(); // NOLINTEND }; diff --git a/src/mc/scripting/modules/minecraft/ScriptSimpleBlockVolumeUtils.h b/src/mc/scripting/modules/minecraft/ScriptSimpleBlockVolumeUtils.h deleted file mode 100644 index f5b32a3855..0000000000 --- a/src/mc/scripting/modules/minecraft/ScriptSimpleBlockVolumeUtils.h +++ /dev/null @@ -1,67 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/external/scripting/ClassBindingBuilder.h" -#include "mc/external/scripting/EnumBindingBuilder.h" -#include "mc/world/level/block/utils/SimpleBlockVolume.h" - -// auto generated forward declare list -// clang-format off -class SimpleBlockVolume; -class Vec3; -// clang-format on - -namespace ScriptModuleMinecraft { - -class ScriptSimpleBlockVolumeUtils { -public: - // prevent constructor by default - ScriptSimpleBlockVolumeUtils& operator=(ScriptSimpleBlockVolumeUtils const&); - ScriptSimpleBlockVolumeUtils(ScriptSimpleBlockVolumeUtils const&); - ScriptSimpleBlockVolumeUtils(); - -public: - // NOLINTBEGIN - // symbol: - // ?bind@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@@Scripting@@XZ - MCAPI static class Scripting::ClassBindingBuilder bind(); - - // symbol: - // ?bindEnums@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA?AV?$EnumBindingBuilder@W4IntersectionResult@SimpleBlockVolume@@W412@@Scripting@@XZ - MCAPI static class Scripting:: - EnumBindingBuilder<::SimpleBlockVolume::IntersectionResult, ::SimpleBlockVolume::IntersectionResult> - bindEnums(); - - // symbol: - // ?doesLocationTouchFaces@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA_NAEBVSimpleBlockVolume@@AEBVVec3@@@Z - MCAPI static bool doesLocationTouchFaces(class SimpleBlockVolume const&, class Vec3 const& pos); - - // symbol: ?doesVolumeTouchFaces@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA_NAEBVSimpleBlockVolume@@0@Z - MCAPI static bool doesVolumeTouchFaces(class SimpleBlockVolume const&, class SimpleBlockVolume const& other); - - // symbol: ?getMax@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA?AVVec3@@AEBVSimpleBlockVolume@@@Z - MCAPI static class Vec3 getMax(class SimpleBlockVolume const&); - - // symbol: ?getMin@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA?AVVec3@@AEBVSimpleBlockVolume@@@Z - MCAPI static class Vec3 getMin(class SimpleBlockVolume const&); - - // symbol: ?getSpan@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA?AVVec3@@AEBVSimpleBlockVolume@@@Z - MCAPI static class Vec3 getSpan(class SimpleBlockVolume const&); - - // symbol: - // ?intersects@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA?AW4IntersectionResult@SimpleBlockVolume@@AEBV4@0@Z - MCAPI static ::SimpleBlockVolume::IntersectionResult - intersects(class SimpleBlockVolume const&, class SimpleBlockVolume const& other); - - // symbol: ?isInside@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA_NAEBVSimpleBlockVolume@@AEBVVec3@@@Z - MCAPI static bool isInside(class SimpleBlockVolume const&, class Vec3 const& pos); - - // symbol: ?translate@ScriptSimpleBlockVolumeUtils@ScriptModuleMinecraft@@SA?AVSimpleBlockVolume@@AEBV3@AEBVVec3@@@Z - MCAPI static class SimpleBlockVolume translate(class SimpleBlockVolume const&, class Vec3 const& delta); - - // NOLINTEND -}; - -}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptSimulatedPlayer.h b/src/mc/scripting/modules/minecraft/ScriptSimulatedPlayer.h index f5a874945b..f986ba726d 100644 --- a/src/mc/scripting/modules/minecraft/ScriptSimulatedPlayer.h +++ b/src/mc/scripting/modules/minecraft/ScriptSimulatedPlayer.h @@ -3,7 +3,6 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/enums/GameType.h" #include "mc/external/scripting/ClassBindingBuilder.h" #include "mc/external/scripting/Result.h" #include "mc/external/scripting/StrongTypedObjectHandle.h" @@ -174,9 +173,6 @@ class ScriptSimulatedPlayer : public ::ScriptModuleMinecraft::ScriptPlayer { // symbol: ?setBodyRotation@ScriptSimulatedPlayer@ScriptModuleGameTest@@QEBA?AV?$Result@X$$V@Scripting@@M@Z MCAPI class Scripting::Result setBodyRotation(float) const; - // symbol: ?setGameMode@ScriptSimulatedPlayer@ScriptModuleGameTest@@QEAA?AV?$Result@X$$V@Scripting@@W4GameType@@@Z - MCAPI class Scripting::Result setGameMode(::GameType gameType); - // symbol: // ?setItem@ScriptSimulatedPlayer@ScriptModuleGameTest@@QEBA?AV?$Result@_N$$V@Scripting@@AEBVScriptItemStack@ScriptModuleMinecraft@@H_N@Z MCAPI class Scripting::Result diff --git a/src/mc/scripting/modules/minecraft/ScriptStructureCreateOptions.h b/src/mc/scripting/modules/minecraft/ScriptStructureCreateOptions.h new file mode 100644 index 0000000000..64e082d9f7 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptStructureCreateOptions.h @@ -0,0 +1,27 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/InterfaceBindingBuilder.h" + +namespace ScriptModuleMinecraft { + +struct ScriptStructureCreateOptions { +public: + // prevent constructor by default + ScriptStructureCreateOptions& operator=(ScriptStructureCreateOptions const&); + ScriptStructureCreateOptions(ScriptStructureCreateOptions const&); + ScriptStructureCreateOptions(); + +public: + // NOLINTBEGIN + // symbol: + // ?bind@ScriptStructureCreateOptions@ScriptModuleMinecraft@@SA?AV?$InterfaceBindingBuilder@UScriptStructureCreateOptions@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::InterfaceBindingBuilder + bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptStructureManager.h b/src/mc/scripting/modules/minecraft/ScriptStructureManager.h new file mode 100644 index 0000000000..b8eefdb37d --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptStructureManager.h @@ -0,0 +1,121 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/ClassBindingBuilder.h" +#include "mc/external/scripting/Result.h" +#include "mc/external/scripting/StrongTypedObjectHandle.h" +#include "mc/world/level/levelgen/structure/StructureRedstoneSaveMode.h" + +// auto generated forward declare list +// clang-format off +class ServerLevel; +class StructureTemplate; +class Vec3; +namespace ScriptModuleMinecraft { class ScriptDimension; } +namespace ScriptModuleMinecraft { class ScriptSimpleBlockVolume; } +namespace ScriptModuleMinecraft { class ScriptStructureTemplate; } +namespace ScriptModuleMinecraft { struct ScriptInvalidStructureError; } +namespace ScriptModuleMinecraft { struct ScriptStructureCreateOptions; } +namespace ScriptModuleMinecraft { struct ScriptStructurePlaceOptions; } +namespace Scripting { class WeakLifetimeScope; } +namespace Scripting { struct ArgumentOutOfBoundsError; } +namespace Scripting { struct EngineError; } +namespace Scripting { struct InvalidArgumentError; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptStructureManager { +public: + // prevent constructor by default + ScriptStructureManager& operator=(ScriptStructureManager const&); + ScriptStructureManager(); + +public: + // NOLINTBEGIN + // symbol: ??0ScriptStructureManager@ScriptModuleMinecraft@@QEAA@$$QEAV01@@Z + MCAPI ScriptStructureManager(class ScriptModuleMinecraft::ScriptStructureManager&&); + + // symbol: ??0ScriptStructureManager@ScriptModuleMinecraft@@QEAA@AEBV01@@Z + MCAPI ScriptStructureManager(class ScriptModuleMinecraft::ScriptStructureManager const&); + + // symbol: + // ??0ScriptStructureManager@ScriptModuleMinecraft@@QEAA@AEBVWeakLifetimeScope@Scripting@@V?$not_null@PEAVServerLevel@@@gsl@@@Z + MCAPI ScriptStructureManager(class Scripting::WeakLifetimeScope const&, gsl::not_null); + + // symbol: + // ?createEmptyStructure@ScriptStructureManager@ScriptModuleMinecraft@@QEAA?AV?$Result@V?$StrongTypedObjectHandle@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@UInvalidArgumentError@2@UEngineError@2@@Scripting@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVVec3@@W4StructureRedstoneSaveMode@@@Z + MCAPI class Scripting::Result< + class Scripting::StrongTypedObjectHandle, + struct Scripting::InvalidArgumentError, + struct Scripting::EngineError> + createEmptyStructure(std::string const&, class Vec3 const&, ::StructureRedstoneSaveMode); + + // symbol: + // ?createStructureFromWorld@ScriptStructureManager@ScriptModuleMinecraft@@QEAA?AV?$Result@V?$StrongTypedObjectHandle@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@UInvalidArgumentError@2@@Scripting@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$StrongTypedObjectHandle@VScriptDimension@ScriptModuleMinecraft@@@4@AEBVScriptSimpleBlockVolume@2@AEBV?$optional@UScriptStructureCreateOptions@ScriptModuleMinecraft@@@6@@Z + MCAPI class Scripting::Result< + class Scripting::StrongTypedObjectHandle, + struct Scripting::InvalidArgumentError> + createStructureFromWorld(std::string const&, class Scripting::StrongTypedObjectHandle const&, class ScriptModuleMinecraft::ScriptSimpleBlockVolume const&, std::optional const&); + + // symbol: + // ?deleteStructure@ScriptStructureManager@ScriptModuleMinecraft@@QEAA?AV?$Result@_NUInvalidArgumentError@Scripting@@@Scripting@@AEBV?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$StrongTypedObjectHandle@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@@std@@@Z + MCAPI class Scripting::Result + deleteStructure(std::variant< + std::string, + class Scripting::StrongTypedObjectHandle< + class ScriptModuleMinecraft::ScriptStructureTemplate>> const&); + + // symbol: + // ?getOrCreateScriptStructure@ScriptStructureManager@ScriptModuleMinecraft@@QEAA?AV?$StrongTypedObjectHandle@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@AEAVStructureTemplate@@@Z + MCAPI class Scripting::StrongTypedObjectHandle + getOrCreateScriptStructure(class StructureTemplate&); + + // symbol: + // ?getStructure@ScriptStructureManager@ScriptModuleMinecraft@@QEAA?AV?$optional@V?$StrongTypedObjectHandle@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@@Z + MCAPI std::optional> + getStructure(std::string const&); + + // symbol: ??4ScriptStructureManager@ScriptModuleMinecraft@@QEAAAEAV01@$$QEAV01@@Z + MCAPI class ScriptModuleMinecraft::ScriptStructureManager& + operator=(class ScriptModuleMinecraft::ScriptStructureManager&&); + + // symbol: + // ?placeStructure@ScriptStructureManager@ScriptModuleMinecraft@@QEAA?AV?$Result@XUScriptInvalidStructureError@ScriptModuleMinecraft@@UInvalidArgumentError@Scripting@@UArgumentOutOfBoundsError@4@@Scripting@@AEAV?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$StrongTypedObjectHandle@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@@std@@AEBV?$StrongTypedObjectHandle@VScriptDimension@ScriptModuleMinecraft@@@4@AEBVVec3@@AEBV?$optional@UScriptStructurePlaceOptions@ScriptModuleMinecraft@@@6@@Z + MCAPI class Scripting:: + Result< + void, + struct ScriptModuleMinecraft::ScriptInvalidStructureError, + struct Scripting::InvalidArgumentError, + struct Scripting::ArgumentOutOfBoundsError> + placeStructure(std::variant>&, class Scripting::StrongTypedObjectHandle const&, class Vec3 const&, std::optional const&); + + // symbol: + // ?bind@ScriptStructureManager@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptStructureManager@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ClassBindingBuilder bind(); + + // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: ?_ensureStructureLoaded@ScriptStructureManager@ScriptModuleMinecraft@@AEBA_NAEAVStructureTemplate@@@Z + MCAPI bool _ensureStructureLoaded(class StructureTemplate&) const; + + // symbol: + // ?_getStructure@ScriptStructureManager@ScriptModuleMinecraft@@AEBAPEBVStructureTemplate@@AEBV?$variant@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$StrongTypedObjectHandle@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@@std@@@Z + MCAPI class StructureTemplate const* + _getStructure(std::variant< + std::string, + class Scripting::StrongTypedObjectHandle< + class ScriptModuleMinecraft::ScriptStructureTemplate>> const&) const; + + // symbol: + // ?_validateIdentifier@ScriptStructureManager@ScriptModuleMinecraft@@AEBA?AV?$optional@UInvalidArgumentError@Scripting@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@@Z + MCAPI std::optional _validateIdentifier(std::string const&) const; + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptStructurePlaceOptions.h b/src/mc/scripting/modules/minecraft/ScriptStructurePlaceOptions.h new file mode 100644 index 0000000000..fe170323e0 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptStructurePlaceOptions.h @@ -0,0 +1,42 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/InterfaceBindingBuilder.h" + +namespace ScriptModuleMinecraft { + +struct ScriptStructurePlaceOptions { +public: + // prevent constructor by default + ScriptStructurePlaceOptions(); + +public: + // NOLINTBEGIN + // symbol: ??0ScriptStructurePlaceOptions@ScriptModuleMinecraft@@QEAA@$$QEAU01@@Z + MCAPI ScriptStructurePlaceOptions(struct ScriptModuleMinecraft::ScriptStructurePlaceOptions&&); + + // symbol: ??0ScriptStructurePlaceOptions@ScriptModuleMinecraft@@QEAA@AEBU01@@Z + MCAPI ScriptStructurePlaceOptions(struct ScriptModuleMinecraft::ScriptStructurePlaceOptions const&); + + // symbol: ??4ScriptStructurePlaceOptions@ScriptModuleMinecraft@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct ScriptModuleMinecraft::ScriptStructurePlaceOptions& + operator=(struct ScriptModuleMinecraft::ScriptStructurePlaceOptions&&); + + // symbol: ??4ScriptStructurePlaceOptions@ScriptModuleMinecraft@@QEAAAEAU01@AEBU01@@Z + MCAPI struct ScriptModuleMinecraft::ScriptStructurePlaceOptions& + operator=(struct ScriptModuleMinecraft::ScriptStructurePlaceOptions const&); + + // symbol: ??1ScriptStructurePlaceOptions@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ~ScriptStructurePlaceOptions(); + + // symbol: + // ?bind@ScriptStructurePlaceOptions@ScriptModuleMinecraft@@SA?AV?$InterfaceBindingBuilder@UScriptStructurePlaceOptions@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::InterfaceBindingBuilder + bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptStructureReadOptions.h b/src/mc/scripting/modules/minecraft/ScriptStructureReadOptions.h new file mode 100644 index 0000000000..286988c003 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptStructureReadOptions.h @@ -0,0 +1,27 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/InterfaceBindingBuilder.h" + +namespace ScriptModuleMinecraft { + +struct ScriptStructureReadOptions { +public: + // prevent constructor by default + ScriptStructureReadOptions& operator=(ScriptStructureReadOptions const&); + ScriptStructureReadOptions(ScriptStructureReadOptions const&); + ScriptStructureReadOptions(); + +public: + // NOLINTBEGIN + // symbol: + // ?bind@ScriptStructureReadOptions@ScriptModuleMinecraft@@SA?AV?$InterfaceBindingBuilder@UScriptStructureReadOptions@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::InterfaceBindingBuilder + bind(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptStructureTemplate.h b/src/mc/scripting/modules/minecraft/ScriptStructureTemplate.h new file mode 100644 index 0000000000..3e715ab305 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptStructureTemplate.h @@ -0,0 +1,72 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" +#include "mc/enums/AnimationMode.h" +#include "mc/enums/Mirror.h" +#include "mc/enums/Rotation.h" +#include "mc/external/scripting/ClassBindingBuilder.h" +#include "mc/external/scripting/EnumBindingBuilder.h" +#include "mc/world/level/levelgen/structure/StructureRedstoneSaveMode.h" + +// auto generated forward declare list +// clang-format off +class StructureManager; +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptStructureTemplate { +public: + // prevent constructor by default + ScriptStructureTemplate& operator=(ScriptStructureTemplate const&); + ScriptStructureTemplate(ScriptStructureTemplate const&); + ScriptStructureTemplate(); + +public: + // NOLINTBEGIN + // symbol: ??0ScriptStructureTemplate@ScriptModuleMinecraft@@QEAA@$$QEAV01@@Z + MCAPI ScriptStructureTemplate(class ScriptModuleMinecraft::ScriptStructureTemplate&&); + + // symbol: + // ??0ScriptStructureTemplate@ScriptModuleMinecraft@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$not_null@V?$NonOwnerPointer@VStructureManager@@@Bedrock@@@gsl@@@Z + MCAPI ScriptStructureTemplate(std::string const&, Bedrock::NotNullNonOwnerPtr); + + // symbol: + // ?getId@ScriptStructureTemplate@ScriptModuleMinecraft@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string const& getId() const; + + // symbol: ??4ScriptStructureTemplate@ScriptModuleMinecraft@@QEAAAEAV01@$$QEAV01@@Z + MCAPI class ScriptModuleMinecraft::ScriptStructureTemplate& + operator=(class ScriptModuleMinecraft::ScriptStructureTemplate&&); + + // symbol: ??1ScriptStructureTemplate@ScriptModuleMinecraft@@QEAA@XZ + MCAPI ~ScriptStructureTemplate(); + + // symbol: + // ?bind@ScriptStructureTemplate@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptStructureTemplate@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI static class Scripting::ClassBindingBuilder bind(); + + // symbol: + // ?bindAnimationModeEnum@ScriptStructureTemplate@ScriptModuleMinecraft@@SA?AV?$EnumBindingBuilder@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4AnimationMode@@@Scripting@@XZ + MCAPI static class Scripting::EnumBindingBuilder bindAnimationModeEnum(); + + // symbol: + // ?bindMirrorEnum@ScriptStructureTemplate@ScriptModuleMinecraft@@SA?AV?$EnumBindingBuilder@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Mirror@@@Scripting@@XZ + MCAPI static class Scripting::EnumBindingBuilder bindMirrorEnum(); + + // symbol: + // ?bindRotationEnum@ScriptStructureTemplate@ScriptModuleMinecraft@@SA?AV?$EnumBindingBuilder@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Rotation@@@Scripting@@XZ + MCAPI static class Scripting::EnumBindingBuilder bindRotationEnum(); + + // symbol: + // ?bindStructureSaveModeEnum@ScriptStructureTemplate@ScriptModuleMinecraft@@SA?AV?$EnumBindingBuilder@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4StructureRedstoneSaveMode@@@Scripting@@XZ + MCAPI static class Scripting::EnumBindingBuilder + bindStructureSaveModeEnum(); + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptTypeFamilyComponent.h b/src/mc/scripting/modules/minecraft/ScriptTypeFamilyComponent.h new file mode 100644 index 0000000000..70d1e0a317 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptTypeFamilyComponent.h @@ -0,0 +1,49 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/ClassBindingBuilder.h" +#include "mc/external/scripting/Result.h" +#include "mc/scripting/modules/minecraft/ScriptActorComponent.h" + +// auto generated forward declare list +// clang-format off +namespace ScriptModuleMinecraft { class ScriptActorComponent; } +namespace ScriptModuleMinecraft { class ScriptComponentTypeEnumBuilder; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptTypeFamilyComponent : public ::ScriptModuleMinecraft::ScriptActorComponent { +public: + // prevent constructor by default + ScriptTypeFamilyComponent& operator=(ScriptTypeFamilyComponent const&); + ScriptTypeFamilyComponent(ScriptTypeFamilyComponent const&); + ScriptTypeFamilyComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ScriptTypeFamilyComponent@ScriptModuleMinecraft@@UEAA@XZ + virtual ~ScriptTypeFamilyComponent() = default; + + // symbol: + // ?getTypeFamilies@ScriptTypeFamilyComponent@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$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@@$$V@Scripting@@XZ + MCAPI class Scripting::Result> getTypeFamilies() const; + + // symbol: + // ?hasTypeFamily@ScriptTypeFamilyComponent@ScriptModuleMinecraft@@QEBA?AV?$Result@_N$$V@Scripting@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI class Scripting::Result hasTypeFamily(std::string const&) const; + + // symbol: + // ?bind@ScriptTypeFamilyComponent@ScriptModuleMinecraft@@SA?AV?$ClassBindingBuilder@VScriptTypeFamilyComponent@ScriptModuleMinecraft@@@Scripting@@AEAVScriptComponentTypeEnumBuilder@2@@Z + MCAPI static class Scripting::ClassBindingBuilder + bind(class ScriptModuleMinecraft::ScriptComponentTypeEnumBuilder&); + + // symbol: ?ComponentId@ScriptTypeFamilyComponent@ScriptModuleMinecraft@@2PEBDEB + MCAPI static char const* ComponentId; + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptTypeFamilyComponentFactory.h b/src/mc/scripting/modules/minecraft/ScriptTypeFamilyComponentFactory.h new file mode 100644 index 0000000000..69a0b4b0b9 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/ScriptTypeFamilyComponentFactory.h @@ -0,0 +1,42 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/scripting/StrongTypedObjectHandle.h" +#include "mc/scripting/modules/minecraft/IComponentFactory.h" + +// auto generated forward declare list +// clang-format off +class WeakEntityRef; +namespace ScriptModuleMinecraft { class IComponentFactory; } +namespace ScriptModuleMinecraft { class ScriptActorComponent; } +namespace Scripting { class WeakLifetimeScope; } +// clang-format on + +namespace ScriptModuleMinecraft { + +class ScriptTypeFamilyComponentFactory : public ::ScriptModuleMinecraft::IComponentFactory { +public: + // prevent constructor by default + ScriptTypeFamilyComponentFactory& operator=(ScriptTypeFamilyComponentFactory const&); + ScriptTypeFamilyComponentFactory(ScriptTypeFamilyComponentFactory const&); + ScriptTypeFamilyComponentFactory(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ScriptTypeFamilyComponentFactory@ScriptModuleMinecraft@@UEAA@XZ + virtual ~ScriptTypeFamilyComponentFactory() = default; + + // vIndex: 1, symbol: + // ?createComponent@ScriptTypeFamilyComponentFactory@ScriptModuleMinecraft@@UEAA?AV?$StrongTypedObjectHandle@VScriptActorComponent@ScriptModuleMinecraft@@@Scripting@@VWeakEntityRef@@AEBVWeakLifetimeScope@4@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + virtual class Scripting::StrongTypedObjectHandle + createComponent(class WeakEntityRef, class Scripting::WeakLifetimeScope const&, std::string const&); + + // vIndex: 2, symbol: ?hasComponent@ScriptTypeFamilyComponentFactory@ScriptModuleMinecraft@@UEBA_NVWeakEntityRef@@@Z + virtual bool hasComponent(class WeakEntityRef) const; + + // NOLINTEND +}; + +}; // namespace ScriptModuleMinecraft diff --git a/src/mc/scripting/modules/minecraft/ScriptV010Events.h b/src/mc/scripting/modules/minecraft/ScriptV010Events.h index 491e4bef6a..4d14759098 100644 --- a/src/mc/scripting/modules/minecraft/ScriptV010Events.h +++ b/src/mc/scripting/modules/minecraft/ScriptV010Events.h @@ -9,6 +9,7 @@ // auto generated forward declare list // clang-format off class Level; +class Player; namespace ScriptModuleMinecraft { class ScriptActor; } namespace ScriptModuleMinecraft { struct ScriptActorCreateEvent; } namespace ScriptModuleMinecraft { struct ScriptActorHitBlockAfterEvent; } @@ -31,6 +32,9 @@ namespace ScriptModuleMinecraft { struct ScriptWeatherChangedAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptWorldInitializeAfterEvent; } namespace Scripting { class ModuleBindingBuilder; } namespace Scripting { class WeakLifetimeScope; } +struct ChatEvent; +struct ItemUseEvent; +struct ItemUseOnEvent; // clang-format on namespace ScriptModuleMinecraft { @@ -69,22 +73,22 @@ class ScriptV010Events { onActorRemoved(class Scripting::StrongTypedObjectHandle const&, class Scripting::StrongTypedObjectHandle&); // symbol: - // ?onBeforeChat@ScriptV010Events@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptChatSendBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - MCVAPI void - onBeforeChat(class Scripting::StrongTypedObjectHandle - beforeChatEvent); + // ?onBeforeChat@ScriptV010Events@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptChatSendBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBUChatEvent@@AEBVPlayer@@@Z + MCVAPI + std::optional> + onBeforeChat(struct ChatEvent const&, class Player const&); // symbol: - // ?onBeforeItemUse@ScriptV010Events@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemUseBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - MCVAPI void onBeforeItemUse( - class Scripting::StrongTypedObjectHandle itemEvent - ); + // ?onBeforeItemUse@ScriptV010Events@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptItemUseBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUItemUseEvent@@@Z + MCVAPI + std::optional> + onBeforeItemUse(class Player const&, struct ItemUseEvent const&); // symbol: - // ?onBeforeItemUseOn@ScriptV010Events@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - MCVAPI void onBeforeItemUseOn( - class Scripting::StrongTypedObjectHandle itemEvent - ); + // ?onBeforeItemUseOn@ScriptV010Events@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUItemUseOnEvent@@@Z + MCVAPI std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeItemUseOn(class Player const&, struct ItemUseOnEvent const&); // symbol: // ?onDataDrivenActorEventSend@ScriptV010Events@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptDataDrivenActorTriggerAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z diff --git a/src/mc/scripting/modules/minecraft/ScriptWorld.h b/src/mc/scripting/modules/minecraft/ScriptWorld.h index a297247f59..fb523da0ad 100644 --- a/src/mc/scripting/modules/minecraft/ScriptWorld.h +++ b/src/mc/scripting/modules/minecraft/ScriptWorld.h @@ -14,9 +14,11 @@ class ServerLevel; class Vec3; namespace ScriptModuleMinecraft { class ScriptActor; } namespace ScriptModuleMinecraft { class ScriptDimension; } +namespace ScriptModuleMinecraft { class ScriptGameRules; } namespace ScriptModuleMinecraft { class ScriptPlayer; } namespace ScriptModuleMinecraft { class ScriptPlayerIterator; } namespace ScriptModuleMinecraft { class ScriptScoreboard; } +namespace ScriptModuleMinecraft { class ScriptStructureManager; } namespace ScriptModuleMinecraft { class ScriptWorldAfterEvents; } namespace ScriptModuleMinecraft { class ScriptWorldBeforeEvents; } namespace ScriptModuleMinecraft { struct ScriptActorQueryOptions; } @@ -41,6 +43,9 @@ class ScriptWorld { public: // NOLINTBEGIN + // symbol: ??0ScriptWorld@ScriptModuleMinecraft@@QEAA@$$QEAV01@@Z + MCAPI ScriptWorld(class ScriptModuleMinecraft::ScriptWorld&&); + // symbol: // ??0ScriptWorld@ScriptModuleMinecraft@@QEAA@AEBVWeakLifetimeScope@Scripting@@V?$not_null@PEAVServerLevel@@@gsl@@@Z MCAPI ScriptWorld(class Scripting::WeakLifetimeScope const& scope, gsl::not_null level); @@ -103,6 +108,10 @@ class ScriptWorld { std::optional>> getEntity(std::string const& id) const; + // symbol: + // ?getGameRules@ScriptWorld@ScriptModuleMinecraft@@QEAA?AV?$StrongTypedObjectHandle@VScriptGameRules@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI class Scripting::StrongTypedObjectHandle getGameRules(); + // symbol: // ?getPlayers@ScriptWorld@ScriptModuleMinecraft@@QEBA?AV?$Result@V?$vector@V?$StrongTypedObjectHandle@VScriptPlayer@ScriptModuleMinecraft@@@Scripting@@V?$allocator@V?$StrongTypedObjectHandle@VScriptPlayer@ScriptModuleMinecraft@@@Scripting@@@std@@@std@@$$V@Scripting@@V?$optional@UScriptActorQueryOptions@ScriptModuleMinecraft@@@std@@@Z MCAPI class Scripting::Result< @@ -119,6 +128,11 @@ class ScriptWorld { // ?getScoreboard@ScriptWorld@ScriptModuleMinecraft@@QEAA?AV?$StrongTypedObjectHandle@VScriptScoreboard@ScriptModuleMinecraft@@@Scripting@@XZ MCAPI class Scripting::StrongTypedObjectHandle getScoreboard(); + // symbol: + // ?getStructureManager@ScriptWorld@ScriptModuleMinecraft@@QEBA?AV?$StrongTypedObjectHandle@VScriptStructureManager@ScriptModuleMinecraft@@@Scripting@@XZ + MCAPI class Scripting::StrongTypedObjectHandle + getStructureManager() const; + // symbol: ?getTimeOfDay@ScriptWorld@ScriptModuleMinecraft@@QEBAHXZ MCAPI int getTimeOfDay() const; diff --git a/src/mc/scripting/modules/minecraft/ScriptWorldAfterEvents.h b/src/mc/scripting/modules/minecraft/ScriptWorldAfterEvents.h index bbb0564ee1..22db149764 100644 --- a/src/mc/scripting/modules/minecraft/ScriptWorldAfterEvents.h +++ b/src/mc/scripting/modules/minecraft/ScriptWorldAfterEvents.h @@ -25,8 +25,8 @@ namespace ScriptModuleMinecraft { struct ScriptButtonPushAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptChatSendAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptDataDrivenActorTriggerAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptExplosionStartedAfterEvent; } +namespace ScriptModuleMinecraft { struct ScriptGameRuleChangeAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemCompleteUseAfterEvent; } -namespace ScriptModuleMinecraft { struct ScriptItemDefinitionAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemReleaseUseAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemStartUseAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptItemStartUseOnAfterEvent; } @@ -38,6 +38,7 @@ namespace ScriptModuleMinecraft { struct ScriptLeverActionAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPistonActionAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerBreakBlockAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerDimensionChangeAfterEvent; } +namespace ScriptModuleMinecraft { struct ScriptPlayerGameModeChangeAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithBlockAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithEntityAfterEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerJoinAfterEvent; } @@ -142,211 +143,216 @@ class ScriptWorldAfterEvents { virtual class Level& getLevel() const; // vIndex: 2, symbol: + // ?onGameRuleChange@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptGameRuleChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z + virtual void onGameRuleChange(class Scripting::StrongTypedObjectHandle< + struct ScriptModuleMinecraft::ScriptGameRuleChangeAfterEvent>&); + + // vIndex: 3, symbol: // ?onWeatherChanged@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptWeatherChangedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onWeatherChanged(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptWeatherChangedAfterEvent>&); - // vIndex: 3, symbol: + // vIndex: 4, symbol: // ?onWorldInitialize@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptWorldInitializeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onWorldInitialize(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptWorldInitializeAfterEvent>&); - // vIndex: 4, symbol: + // vIndex: 5, symbol: // ?onPlayerJoin@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerJoinAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerJoin(class Scripting::StrongTypedObjectHandle&); - // vIndex: 5, symbol: + // vIndex: 6, symbol: // ?onPlayerLeave@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerLeaveAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerLeave(class Scripting::StrongTypedObjectHandle&); - // vIndex: 6, symbol: + // vIndex: 7, symbol: // ?onActorAddEffect@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorAddEffectAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorAddEffect(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorAddEffectAfterEvent>&); - // vIndex: 7, symbol: + // vIndex: 8, symbol: // ?onChat@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptChatSendAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onChat(class Scripting::StrongTypedObjectHandle&); - // vIndex: 8, symbol: + // vIndex: 9, symbol: // ?onActorLoad@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorLoadAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorLoad(class Scripting::StrongTypedObjectHandle&); - // vIndex: 9, symbol: + // vIndex: 10, symbol: // ?onActorSpawn@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorSpawnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorSpawn(class Scripting::StrongTypedObjectHandle&); - // vIndex: 10, symbol: + // vIndex: 11, symbol: // ?onActorRemoved@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEBV?$StrongTypedObjectHandle@VScriptActor@ScriptModuleMinecraft@@@Scripting@@AEAV?$StrongTypedObjectHandle@UScriptActorRemoveAfterEvent@ScriptModuleMinecraft@@@4@@Z virtual void onActorRemoved(class Scripting::StrongTypedObjectHandle const&, class Scripting::StrongTypedObjectHandle&); - // vIndex: 11, symbol: + // vIndex: 12, symbol: // ?onActorHitEntity@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHitEntityAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHitEntity(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorHitEntityAfterEvent>&); - // vIndex: 12, symbol: + // vIndex: 13, symbol: // ?onActorHitBlock@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHitBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHitBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorHitBlockAfterEvent>&); - // vIndex: 13, symbol: + // vIndex: 14, symbol: // ?onServerMessage@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptServerMessageAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onServerMessage(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptServerMessageAfterEvent>&); - // vIndex: 14, symbol: + // vIndex: 15, symbol: // ?onDataDrivenActorEventSend@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptDataDrivenActorTriggerAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onDataDrivenActorEventSend(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptDataDrivenActorTriggerAfterEvent>&); - // vIndex: 15, symbol: + // vIndex: 16, symbol: // ?onActorHurt@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHurtAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHurt(class Scripting::StrongTypedObjectHandle&); - // vIndex: 16, symbol: + // vIndex: 17, symbol: // ?onActorHealthChanged@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorHealthChangedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorHealthChanged(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptActorHealthChangedAfterEvent>&); - // vIndex: 17, symbol: + // vIndex: 18, symbol: // ?onActorDie@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptActorDieAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActorDie(class Scripting::StrongTypedObjectHandle&); - // vIndex: 18, symbol: + // vIndex: 19, symbol: // ?onPlayerSpawn@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerSpawnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerSpawn(class Scripting::StrongTypedObjectHandle&); - // vIndex: 19, symbol: + // vIndex: 20, symbol: // ?onPlayerDimensionChange@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerDimensionChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerDimensionChange(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerDimensionChangeAfterEvent>&); - // vIndex: 20, symbol: + // vIndex: 21, symbol: // ?onPlayerInteractWithEntity@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerInteractWithEntityAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerInteractWithEntity(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerInteractWithEntityAfterEvent>&); - // vIndex: 21, symbol: + // vIndex: 22, symbol: // ?onPlayerInteractWithBlock@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerInteractWithBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerInteractWithBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerInteractWithBlockAfterEvent>&); - // vIndex: 22, symbol: + // vIndex: 23, symbol: + // ?onPlayerGameModeChange@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerGameModeChangeAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z + virtual void onPlayerGameModeChange(class Scripting::StrongTypedObjectHandle< + struct ScriptModuleMinecraft::ScriptPlayerGameModeChangeAfterEvent>&); + + // vIndex: 24, symbol: // ?onActivatePiston@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPistonActionAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActivatePiston(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPistonActionAfterEvent>&); - // vIndex: 23, symbol: + // vIndex: 25, symbol: // ?onActivateLever@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptLeverActionAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onActivateLever(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptLeverActionAfterEvent>&); - // vIndex: 24, symbol: + // vIndex: 26, symbol: // ?onPushButton@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptButtonPushAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPushButton(class Scripting::StrongTypedObjectHandle&); - // vIndex: 25, symbol: + // vIndex: 27, symbol: // ?onExplosion@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptExplosionStartedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onExplosion(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptExplosionStartedAfterEvent>&); - // vIndex: 26, symbol: + // vIndex: 28, symbol: // ?onExplodeBlock@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptBlockExplodedAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onExplodeBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptBlockExplodedAfterEvent>&); - // vIndex: 27, symbol: + // vIndex: 29, symbol: // ?onPlayerPlaceBlock@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerPlaceBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerPlaceBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerPlaceBlockAfterEvent>&); - // vIndex: 28, symbol: + // vIndex: 30, symbol: // ?onPlayerBreakBlock@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPlayerBreakBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPlayerBreakBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPlayerBreakBlockAfterEvent>&); - // vIndex: 29, symbol: + // vIndex: 31, symbol: // ?onPushPressurePlate@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPressurePlatePushAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPushPressurePlate(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPressurePlatePushAfterEvent>&); - // vIndex: 30, symbol: + // vIndex: 32, symbol: // ?onPopPressurePlate@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptPressurePlatePopAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onPopPressurePlate(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptPressurePlatePopAfterEvent>&); - // vIndex: 31, symbol: + // vIndex: 33, symbol: // ?onHitTargetBlock@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptTargetBlockHitAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onHitTargetBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptTargetBlockHitAfterEvent>&); - // vIndex: 32, symbol: + // vIndex: 34, symbol: // ?onTripTripWire@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptTripWireTripAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onTripTripWire(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptTripWireTripAfterEvent>&); - // vIndex: 33, symbol: - // ?onItemDefinitionEventTriggered@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemDefinitionAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onItemDefinitionEventTriggered(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemDefinitionAfterEvent>&); - - // vIndex: 34, symbol: + // vIndex: 35, symbol: // ?onItemUse@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemUse(class Scripting::StrongTypedObjectHandle&); - // vIndex: 35, symbol: + // vIndex: 36, symbol: // ?onItemUseOn@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemUseOnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemUseOn(class Scripting::StrongTypedObjectHandle&); - // vIndex: 36, symbol: + // vIndex: 37, symbol: // ?onItemStartUseOn@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStartUseOnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStartUseOn(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemStartUseOnAfterEvent>&); - // vIndex: 37, symbol: + // vIndex: 38, symbol: // ?onItemStopUseOn@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStopUseOnAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStopUseOn(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemStopUseOnAfterEvent>&); - // vIndex: 38, symbol: + // vIndex: 39, symbol: // ?onItemStartUse@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStartUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStartUse(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemStartUseAfterEvent>&); - // vIndex: 39, symbol: + // vIndex: 40, symbol: // ?onItemCompleteUse@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemCompleteUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemCompleteUse(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemCompleteUseAfterEvent>&); - // vIndex: 40, symbol: + // vIndex: 41, symbol: // ?onItemReleaseUse@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemReleaseUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemReleaseUse(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptItemReleaseUseAfterEvent>&); - // vIndex: 41, symbol: + // vIndex: 42, symbol: // ?onItemStopUse@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptItemStopUseAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onItemStopUse(class Scripting::StrongTypedObjectHandle&); - // vIndex: 42, symbol: + // vIndex: 43, symbol: // ?onProjectileHitEntity@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptProjectileHitEntityAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onProjectileHitEntity(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptProjectileHitEntityAfterEvent>&); - // vIndex: 43, symbol: + // vIndex: 44, symbol: // ?onProjectileHitBlock@ScriptWorldAfterEvents@ScriptModuleMinecraft@@UEAAXAEAV?$StrongTypedObjectHandle@UScriptProjectileHitBlockAfterEvent@ScriptModuleMinecraft@@@Scripting@@@Z virtual void onProjectileHitBlock(class Scripting::StrongTypedObjectHandle< struct ScriptModuleMinecraft::ScriptProjectileHitBlockAfterEvent>&); diff --git a/src/mc/scripting/modules/minecraft/ScriptWorldBeforeEvents.h b/src/mc/scripting/modules/minecraft/ScriptWorldBeforeEvents.h index 4e24dd0a68..c4813b35ef 100644 --- a/src/mc/scripting/modules/minecraft/ScriptWorldBeforeEvents.h +++ b/src/mc/scripting/modules/minecraft/ScriptWorldBeforeEvents.h @@ -3,27 +3,39 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/enums/GameType.h" #include "mc/external/scripting/StrongTypedObjectHandle.h" +#include "mc/scripting/modules/minecraft/ScriptWeatherType.h" // auto generated forward declare list // clang-format off +class Actor; class Level; +class Player; namespace ScriptModuleMinecraft { struct ScriptActorAddEffectBeforeEvent; } -namespace ScriptModuleMinecraft { struct ScriptActorRemoveBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptChatSendBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptDataDrivenActorTriggerBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptExplosionStartedBeforeEvent; } -namespace ScriptModuleMinecraft { struct ScriptItemDefinitionBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptItemUseBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptItemUseOnBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerBreakBlockBeforeEvent; } +namespace ScriptModuleMinecraft { struct ScriptPlayerGameModeChangeBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithBlockBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerInteractWithEntityBeforeEvent; } -namespace ScriptModuleMinecraft { struct ScriptPlayerLeaveBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptPlayerPlaceBlockBeforeEvent; } namespace ScriptModuleMinecraft { struct ScriptWeatherChangedBeforeEvent; } namespace Scripting { class ModuleBindingBuilder; } namespace Scripting { class WeakLifetimeScope; } +struct ActorAddEffectEvent; +struct ActorDefinitionModifier; +struct BlockTryDestroyByPlayerEvent; +struct BlockTryPlaceByPlayerEvent; +struct ChatEvent; +struct ExplosionStartedEvent; +struct ItemUseEvent; +struct ItemUseOnEvent; +struct PlayerInteractWithBlockBeforeEvent; +struct PlayerInteractWithEntityBeforeEvent; // clang-format on namespace ScriptModuleMinecraft { @@ -41,77 +53,86 @@ class ScriptWorldBeforeEvents { virtual ~ScriptWorldBeforeEvents(); // vIndex: 1, symbol: - // ?onBeforeChat@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptChatSendBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforeChat(class Scripting::StrongTypedObjectHandle); + // ?onBeforeChat@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptChatSendBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBUChatEvent@@AEBVPlayer@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeChat(struct ChatEvent const&, class Player const&); // vIndex: 2, symbol: - // ?onBeforeDataDrivenActorEventSend@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptDataDrivenActorTriggerBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforeDataDrivenActorEventSend(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptDataDrivenActorTriggerBeforeEvent>); + // ?onBeforeDataDrivenActorEventSend@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptDataDrivenActorTriggerBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAVActor@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@AEAV?$vector@UActorDefinitionModifier@@V?$allocator@UActorDefinitionModifier@@@std@@@4@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeDataDrivenActorEventSend(class Actor&, std::string const&, std::vector&); // vIndex: 3, symbol: - // ?onBeforeWeatherChangedEvent@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptWeatherChangedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeWeatherChangedEvent(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptWeatherChangedBeforeEvent>); + // ?onBeforeWeatherChangedEvent@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptWeatherChangedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@W4ScriptWeatherType@2@0H@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeWeatherChangedEvent( + ::ScriptModuleMinecraft::ScriptWeatherType, + ::ScriptModuleMinecraft::ScriptWeatherType, + int + ); // vIndex: 4, symbol: - // ?onBeforePlayerInteractWithEntity@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforePlayerInteractWithEntity(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerInteractWithEntityBeforeEvent>); + // ?onBeforePlayerInteractWithEntity@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerInteractWithEntityBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAVPlayer@@AEAVActor@@AEBUPlayerInteractWithEntityBeforeEvent@@@Z + virtual std::optional> + onBeforePlayerInteractWithEntity(class Player&, class Actor&, struct PlayerInteractWithEntityBeforeEvent const&); // vIndex: 5, symbol: - // ?onBeforePlayerInteractWithBlock@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void - onBeforePlayerInteractWithBlock(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerInteractWithBlockBeforeEvent>); + // ?onBeforePlayerInteractWithBlock@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerInteractWithBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAVPlayer@@AEBUPlayerInteractWithBlockBeforeEvent@@@Z + virtual std::optional> + onBeforePlayerInteractWithBlock(class Player&, struct PlayerInteractWithBlockBeforeEvent const&); // vIndex: 6, symbol: - // ?onBeforePlayerLeave@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerLeaveBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforePlayerLeave(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerLeaveBeforeEvent>); + // ?onBeforePlayerGameModeChange@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerGameModeChangeBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@W4GameType@@1@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforePlayerGameModeChange(class Player const&, ::GameType, ::GameType); - // vIndex: 7, symbol: - // ?onBeforeActorRemove@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptActorRemoveBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeActorRemove(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptActorRemoveBeforeEvent>); + // vIndex: 7, symbol: ?onBeforePlayerLeave@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXAEBVPlayer@@@Z + virtual void onBeforePlayerLeave(class Player const&); - // vIndex: 8, symbol: - // ?onBeforeEffectAddedEventSend@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptActorAddEffectBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeEffectAddedEventSend(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptActorAddEffectBeforeEvent>); + // vIndex: 8, symbol: ?onBeforeActorRemove@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXAEBVActor@@@Z + virtual void onBeforeActorRemove(class Actor const&); // vIndex: 9, symbol: - // ?onBeforeExplosion@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptExplosionStartedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeExplosion(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptExplosionStartedBeforeEvent>); + // ?onBeforeEffectAddedEventSend@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptActorAddEffectBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEAUActorAddEffectEvent@@AEBVActor@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeEffectAddedEventSend(struct ActorAddEffectEvent&, class Actor const&); // vIndex: 10, symbol: - // ?onBeforePlayerBreakBlock@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerBreakBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforePlayerBreakBlock(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerBreakBlockBeforeEvent>); + // ?onBeforeExplosion@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptExplosionStartedBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBUExplosionStartedEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeExplosion(struct ExplosionStartedEvent const&); // vIndex: 11, symbol: - // ?onBeforePlayerPlaceBlock@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptPlayerPlaceBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforePlayerPlaceBlock(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptPlayerPlaceBlockBeforeEvent>); + // ?onBeforePlayerBreakBlock@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerBreakBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUBlockTryDestroyByPlayerEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforePlayerBreakBlock(class Player const&, struct BlockTryDestroyByPlayerEvent const&); // vIndex: 12, symbol: - // ?onBeforeItemDefinitionEventTriggered@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemDefinitionBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeItemDefinitionEventTriggered(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemDefinitionBeforeEvent>); + // ?onBeforePlayerPlaceBlock@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptPlayerPlaceBlockBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUBlockTryPlaceByPlayerEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforePlayerPlaceBlock(class Player const&, struct BlockTryPlaceByPlayerEvent const&); // vIndex: 13, symbol: - // ?onBeforeItemUse@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemUseBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeItemUse(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemUseBeforeEvent>); + // ?onBeforeItemUse@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptItemUseBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUItemUseEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeItemUse(class Player const&, struct ItemUseEvent const&); // vIndex: 14, symbol: - // ?onBeforeItemUseOn@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAAXV?$StrongTypedObjectHandle@UScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@Z - virtual void onBeforeItemUseOn(class Scripting::StrongTypedObjectHandle< - struct ScriptModuleMinecraft::ScriptItemUseOnBeforeEvent>); + // ?onBeforeItemUseOn@ScriptWorldBeforeEvents@ScriptModuleMinecraft@@UEAA?AV?$optional@V?$StrongTypedObjectHandle@UScriptItemUseOnBeforeEvent@ScriptModuleMinecraft@@@Scripting@@@std@@AEBVPlayer@@AEBUItemUseOnEvent@@@Z + virtual std::optional< + class Scripting::StrongTypedObjectHandle> + onBeforeItemUseOn(class Player const&, struct ItemUseOnEvent const&); // symbol: ??0ScriptWorldBeforeEvents@ScriptModuleMinecraft@@QEAA@$$QEAV01@@Z MCAPI ScriptWorldBeforeEvents(class ScriptModuleMinecraft::ScriptWorldBeforeEvents&&); diff --git a/src/mc/scripting/modules/minecraft/debug/Betas.h b/src/mc/scripting/modules/minecraft/debug/Betas.h new file mode 100644 index 0000000000..69d78c0de4 --- /dev/null +++ b/src/mc/scripting/modules/minecraft/debug/Betas.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace Scripting { struct Version; } +// clang-format on + +namespace ScriptModuleMinecraftDebugUtilities::Betas { +// NOLINTBEGIN +// symbol: ?CURRENT@Betas@ScriptModuleMinecraftDebugUtilities@@3UVersion@Scripting@@B +MCAPI extern struct Scripting::Version const CURRENT; +// NOLINTEND + +}; // namespace ScriptModuleMinecraftDebugUtilities::Betas diff --git a/src/mc/server/DenyList.h b/src/mc/server/DenyList.h index c72dc417a1..5d84a5b2e6 100644 --- a/src/mc/server/DenyList.h +++ b/src/mc/server/DenyList.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace mce { class UUID; } +// clang-format on + class DenyList { public: // DenyList inner types declare @@ -16,11 +21,17 @@ class DenyList { public: // prevent constructor by default Entry& operator=(Entry const&); - Entry(Entry const&); Entry(); public: // NOLINTBEGIN + // symbol: ??0Entry@DenyList@@QEAA@AEBU01@@Z + MCAPI Entry(struct DenyList::Entry const&); + + // symbol: + // ??0Entry@DenyList@@QEAA@AEBVUUID@mce@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI Entry(class mce::UUID const& uuid, std::string const& xuid); + // symbol: ??1Entry@DenyList@@QEAA@XZ MCAPI ~Entry(); @@ -54,4 +65,14 @@ class DenyList { MCAPI ~DenyList(); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: + // ?isBlocked@DenyList@@AEBA_NAEBUEntry@1@AEAV?$_Vector_const_iterator@V?$_Vector_val@U?$_Simple_types@UEntry@DenyList@@@std@@@std@@@std@@@Z + MCAPI bool + isBlocked(struct DenyList::Entry const&, std::_Vector_const_iterator>>&) + const; + + // NOLINTEND }; diff --git a/src/mc/server/ServerInstance.h b/src/mc/server/ServerInstance.h index 5fae73f051..83c8a30289 100644 --- a/src/mc/server/ServerInstance.h +++ b/src/mc/server/ServerInstance.h @@ -14,6 +14,7 @@ namespace Core { class FilePathManager; } namespace Core { class FileStorageArea; } namespace Editor { class IEditorManager; } namespace Scripting { class ScriptEngine; } +namespace cereal { struct ReflectionCtx; } namespace mce { class UUID; } // clang-format on @@ -103,10 +104,13 @@ class ServerInstance { // symbol: ?getServerItemRegistry@ServerInstance@@QEBA?AVItemRegistryRef@@XZ MCAPI class ItemRegistryRef getServerItemRegistry() const; + // symbol: ?getServerTextSettings@ServerInstance@@QEBA?AV?$NonOwnerPointer@VServerTextSettings@@@Bedrock@@XZ + MCAPI class Bedrock::NonOwnerPointer getServerTextSettings() const; + // symbol: - // ?initializeServer@ServerInstance@@QEAA_NAEAVIMinecraftApp@@AEAVAllowList@@PEAVPermissionsFile@@AEBV?$not_null@V?$NonOwnerPointer@VFilePathManager@Core@@@Bedrock@@@gsl@@V?$duration@_JU?$ratio@$00$00@std@@@chrono@std@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@9@55VLevelSettings@@H_NUConnectionDefinition@@7AEBV?$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@@9@5AEBVUUID@mce@@AEAVIMinecraftEventing@@AEBV?$not_null@V?$NonOwnerPointer@VIResourcePackRepository@@@Bedrock@@@6@AEBV?$not_null@V?$NonOwnerPointer@$$CBVIContentTierManager@@@Bedrock@@@6@AEAVResourcePackManager@@V?$function@$$A6A?AV?$OwnerPtr@VLevelStorage@@@@AEAVScheduler@@@Z@9@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@9@PEAVLevelData@@55555V?$unique_ptr@VEducationOptions@@U?$default_delete@VEducationOptions@@@std@@@9@PEAVResourcePackManager@@V?$function@$$A6AXXZ@9@V?$function@$$A6AXXZ@9@PEAVServerMetrics@@PEAVDebugEndPoint@@7V?$shared_ptr@VFileStorageArea@Core@@@9@AEBUNetworkSettingOptions@@777V?$optional@UPlayerMovementSettings@@@9@V?$optional@UScriptSettings@@@9@AEBVExperiments@@7MV?$optional@_N@9@W4ForceBlockNetworkIdsAreHashes@@AEBUNetworkPermissions@@V?$not_null@V?$NonOwnerPointer@VNetworkSessionOwner@@@Bedrock@@@6@V?$NonOwnerPointer@VCDNConfig@@@Bedrock@@@Z + // ?initializeServer@ServerInstance@@QEAA_NAEAVIMinecraftApp@@AEAVAllowList@@PEAVPermissionsFile@@AEBV?$not_null@V?$NonOwnerPointer@VFilePathManager@Core@@@Bedrock@@@gsl@@V?$duration@_JU?$ratio@$00$00@std@@@chrono@std@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@9@55VLevelSettings@@H_NUConnectionDefinition@@7AEBV?$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@@9@5AEBVUUID@mce@@AEAVIMinecraftEventing@@AEBV?$not_null@V?$NonOwnerPointer@VIResourcePackRepository@@@Bedrock@@@6@AEBV?$not_null@V?$NonOwnerPointer@$$CBVIContentTierManager@@@Bedrock@@@6@AEAVResourcePackManager@@V?$function@$$A6A?AV?$OwnerPtr@VLevelStorage@@@@AEAVScheduler@@@Z@9@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@9@PEAVLevelData@@55555V?$unique_ptr@VEducationOptions@@U?$default_delete@VEducationOptions@@@std@@@9@PEAVResourcePackManager@@V?$function@$$A6AXXZ@9@V?$function@$$A6AXXZ@9@PEAVServerMetrics@@PEAVDebugEndPoint@@7V?$shared_ptr@VFileStorageArea@Core@@@9@AEBUNetworkSettingOptions@@777V?$optional@UPlayerMovementSettings@@@9@V?$optional@UScriptSettings@@@9@AEBVExperiments@@7MV?$optional@_N@9@W4ForceBlockNetworkIdsAreHashes@@AEBUNetworkPermissions@@V?$not_null@V?$NonOwnerPointer@VNetworkSessionOwner@@@Bedrock@@@6@V?$NonOwnerPointer@VCDNConfig@@@Bedrock@@AEAUReflectionCtx@cereal@@V?$NonOwnerPointer@VServerTextSettings@@@Bedrock@@@Z MCAPI bool - initializeServer(class IMinecraftApp&, class AllowList&, class PermissionsFile*, Bedrock::NotNullNonOwnerPtr const&, std::chrono::seconds, std::string, std::string, std::string, class LevelSettings, int, bool, struct ConnectionDefinition, bool, std::vector const&, std::string, class mce::UUID const&, class IMinecraftEventing&, Bedrock::NotNullNonOwnerPtr const&, Bedrock::NotNullNonOwnerPtr const&, class ResourcePackManager&, std::function(class Scheduler&)>, std::string const&, class LevelData*, std::string, std::string, std::string, std::string, std::string, std::unique_ptr, class ResourcePackManager*, std::function, std::function, class ServerMetrics*, class DebugEndPoint*, bool, std::shared_ptr, struct NetworkSettingOptions const&, bool, bool, bool, std::optional, std::optional, class Experiments const&, bool, float, std::optional, ::ForceBlockNetworkIdsAreHashes, struct NetworkPermissions const&, Bedrock::NotNullNonOwnerPtr, class Bedrock::NonOwnerPointer); + initializeServer(class IMinecraftApp&, class AllowList&, class PermissionsFile*, Bedrock::NotNullNonOwnerPtr const&, std::chrono::seconds, std::string, std::string, std::string, class LevelSettings, int, bool, struct ConnectionDefinition, bool, std::vector const&, std::string, class mce::UUID const&, class IMinecraftEventing&, Bedrock::NotNullNonOwnerPtr const&, Bedrock::NotNullNonOwnerPtr const&, class ResourcePackManager&, std::function(class Scheduler&)>, std::string const&, class LevelData*, std::string, std::string, std::string, std::string, std::string, std::unique_ptr, class ResourcePackManager*, std::function, std::function, class ServerMetrics*, class DebugEndPoint*, bool, std::shared_ptr, struct NetworkSettingOptions const&, bool, bool, bool, std::optional, std::optional, class Experiments const&, bool, float, std::optional, ::ForceBlockNetworkIdsAreHashes, struct NetworkPermissions const&, Bedrock::NotNullNonOwnerPtr, class Bedrock::NonOwnerPointer, struct cereal::ReflectionCtx&, class Bedrock::NonOwnerPointer); // symbol: ?isRealmsStoriesEnabled@ServerInstance@@QEBA_NXZ MCAPI bool isRealmsStoriesEnabled() const; @@ -126,6 +130,9 @@ class ServerInstance { // symbol: ?startServerThread@ServerInstance@@QEAAXXZ MCAPI void startServerThread(); + // symbol: ?forceOffClientChunkGeneration@ServerInstance@@SA_NAEAVLevelData@@@Z + MCAPI static bool forceOffClientChunkGeneration(class LevelData&); + // symbol: // ?SERVER_MAX_DELAY_BEFORE_SLOWDOWN@ServerInstance@@2V?$duration@_JU?$ratio@$00$0DLJKMKAA@@std@@@chrono@std@@B MCAPI static std::chrono::nanoseconds const SERVER_MAX_DELAY_BEFORE_SLOWDOWN; diff --git a/src/mc/server/ServerLevel.h b/src/mc/server/ServerLevel.h index dc2cc34c41..5a3956f199 100644 --- a/src/mc/server/ServerLevel.h +++ b/src/mc/server/ServerLevel.h @@ -92,9 +92,6 @@ class ServerLevel : public ::Level { // symbol: ?loadFunctionManager@ServerLevel@@UEAAXXZ MCVAPI void loadFunctionManager(); - // symbol: ?onChunkLoaded@ServerLevel@@UEAAXAEAVChunkSource@@AEAVLevelChunk@@@Z - MCVAPI void onChunkLoaded(class ChunkSource& source, class LevelChunk& lc); - // symbol: ?registerEventCoordinators@ServerLevel@@UEAAXXZ MCVAPI void registerEventCoordinators(); diff --git a/src/mc/server/ServerPlayer.h b/src/mc/server/ServerPlayer.h index d9ee3774db..2f5556a46e 100644 --- a/src/mc/server/ServerPlayer.h +++ b/src/mc/server/ServerPlayer.h @@ -56,123 +56,111 @@ class ServerPlayer : public ::Player { // vIndex: 10, symbol: ??1ServerPlayer@@UEAA@XZ virtual ~ServerPlayer(); - // vIndex: 29, symbol: ?normalTick@ServerPlayer@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@ServerPlayer@@UEAAXXZ virtual void normalTick(); - // vIndex: 62, symbol: ?isValidTarget@ServerPlayer@@UEBA_NPEAVActor@@@Z + // vIndex: 61, symbol: ?isValidTarget@ServerPlayer@@UEBA_NPEAVActor@@@Z virtual bool isValidTarget(class Actor* attacker) const; - // vIndex: 80, symbol: ?handleEntityEvent@ServerPlayer@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@ServerPlayer@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 84, symbol: ?setArmor@ServerPlayer@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z + // vIndex: 83, symbol: ?setArmor@ServerPlayer@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z virtual void setArmor(::ArmorSlot armorSlot, class ItemStack const& item); - // vIndex: 91, symbol: ?setOffhandSlot@ServerPlayer@@UEAAXAEBVItemStack@@@Z + // vIndex: 90, symbol: ?setOffhandSlot@ServerPlayer@@UEAAXAEBVItemStack@@@Z virtual void setOffhandSlot(class ItemStack const& item); - // vIndex: 95, symbol: ?load@ServerPlayer@@UEAA_NAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 94, symbol: ?load@ServerPlayer@@UEAA_NAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual bool load(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper = ::ll::defaultDataLoadHelper); - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@ServerPlayer@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@ServerPlayer@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 104, symbol: ?changeDimension@ServerPlayer@@UEAAXV?$AutomaticID@VDimension@@H@@@Z + // vIndex: 101, symbol: ?changeDimension@ServerPlayer@@UEAAXV?$AutomaticID@VDimension@@H@@@Z virtual void changeDimension(DimensionType toId); - // vIndex: 106, symbol: ?getControllingPlayer@ServerPlayer@@UEBA?AUActorUniqueID@@XZ + // vIndex: 103, symbol: ?getControllingPlayer@ServerPlayer@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getControllingPlayer() const; - // vIndex: 107, symbol: ?checkFallDamage@ServerPlayer@@UEAAXM_N0@Z - virtual void checkFallDamage(float, bool, bool); - - // vIndex: 123, symbol: ?onEffectAdded@ServerPlayer@@MEAAXAEAVMobEffectInstance@@@Z - virtual void onEffectAdded(class MobEffectInstance& effect); - - // vIndex: 124, symbol: ?onEffectUpdated@ServerPlayer@@MEAAXAEAVMobEffectInstance@@@Z - virtual void onEffectUpdated(class MobEffectInstance& effect); - - // vIndex: 125, symbol: ?onEffectRemoved@ServerPlayer@@MEAAXAEAVMobEffectInstance@@@Z - virtual void onEffectRemoved(class MobEffectInstance& effect); - - // vIndex: 143, symbol: ?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@ServerPlayer@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 163, symbol: ?knockback@ServerPlayer@@UEAAXPEAVActor@@HMMMMM@Z + // vIndex: 157, symbol: ?knockback@ServerPlayer@@UEAAXPEAVActor@@HMMMMM@Z virtual void knockback(class Actor* source, int dmg, float xd, float zd, float, float, float heightCap); - // vIndex: 171, symbol: ?aiStep@ServerPlayer@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@ServerPlayer@@UEAAXXZ virtual void aiStep(); - // vIndex: 182, symbol: ?hurtArmorSlots@ServerPlayer@@UEAAXAEBVActorDamageSource@@HV?$bitset@$03@std@@@Z + // vIndex: 176, symbol: ?hurtArmorSlots@ServerPlayer@@UEAAXAEBVActorDamageSource@@HV?$bitset@$03@std@@@Z virtual void hurtArmorSlots(class ActorDamageSource const& source, int dmg, std::bitset<4> hurtSlots); - // vIndex: 183, symbol: ?setDamagedArmor@ServerPlayer@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z + // vIndex: 177, symbol: ?setDamagedArmor@ServerPlayer@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z virtual void setDamagedArmor(::ArmorSlot slot, class ItemStack const& item); - // vIndex: 184, symbol: ?sendArmorDamage@ServerPlayer@@UEAAXV?$bitset@$03@std@@@Z + // vIndex: 178, symbol: ?sendArmorDamage@ServerPlayer@@UEAAXV?$bitset@$03@std@@@Z virtual void sendArmorDamage(std::bitset<4> damagedSlots); - // vIndex: 185, symbol: ?sendArmor@ServerPlayer@@UEAAXV?$bitset@$03@std@@@Z + // vIndex: 179, symbol: ?sendArmor@ServerPlayer@@UEAAXV?$bitset@$03@std@@@Z virtual void sendArmor(std::bitset<4> armorSlots); - // vIndex: 190, symbol: ?clearVanishEnchantedItemsOnDeath@ServerPlayer@@UEAAXXZ + // vIndex: 184, symbol: ?clearVanishEnchantedItemsOnDeath@ServerPlayer@@UEAAXXZ virtual void clearVanishEnchantedItemsOnDeath(); - // vIndex: 191, symbol: ?sendInventory@ServerPlayer@@UEAAX_N@Z + // vIndex: 185, symbol: ?sendInventory@ServerPlayer@@UEAAX_N@Z virtual void sendInventory(bool shouldSelectSlot); - // vIndex: 204, symbol: ?prepareRegion@ServerPlayer@@UEAAXAEAVChunkSource@@@Z + // vIndex: 197, symbol: ?prepareRegion@ServerPlayer@@UEAAXAEAVChunkSource@@@Z virtual void prepareRegion(class ChunkSource& mainChunkSource); - // vIndex: 205, symbol: ?destroyRegion@ServerPlayer@@UEAAXXZ + // vIndex: 198, symbol: ?destroyRegion@ServerPlayer@@UEAAXXZ virtual void destroyRegion(); - // vIndex: 208, symbol: ?changeDimensionWithCredits@ServerPlayer@@UEAAXV?$AutomaticID@VDimension@@H@@@Z + // vIndex: 201, symbol: ?changeDimensionWithCredits@ServerPlayer@@UEAAXV?$AutomaticID@VDimension@@H@@@Z virtual void changeDimensionWithCredits(DimensionType dimension); - // vIndex: 209, symbol: ?tickWorld@ServerPlayer@@UEAAXAEBUTick@@@Z + // vIndex: 202, symbol: ?tickWorld@ServerPlayer@@UEAAXAEBUTick@@@Z virtual void tickWorld(struct Tick const& currentTick); - // vIndex: 210, symbol: ?frameUpdate@ServerPlayer@@UEAAXAEAVFrameUpdateContextBase@@@Z + // vIndex: 203, symbol: ?frameUpdate@ServerPlayer@@UEAAXAEAVFrameUpdateContextBase@@@Z virtual void frameUpdate(class FrameUpdateContextBase&); - // vIndex: 212, symbol: ?moveView@ServerPlayer@@UEAAXXZ + // vIndex: 205, symbol: ?moveView@ServerPlayer@@UEAAXXZ virtual void moveView(); - // vIndex: 213, symbol: ?moveSpawnView@ServerPlayer@@UEAAXAEBVVec3@@V?$AutomaticID@VDimension@@H@@@Z + // vIndex: 206, symbol: ?moveSpawnView@ServerPlayer@@UEAAXAEBVVec3@@V?$AutomaticID@VDimension@@H@@@Z virtual void moveSpawnView(class Vec3 const& spawnPosition, DimensionType dimension); - // vIndex: 214, symbol: ?checkMovementStats@ServerPlayer@@UEAAXAEBVVec3@@@Z + // vIndex: 207, symbol: ?checkMovementStats@ServerPlayer@@UEAAXAEBVVec3@@@Z virtual void checkMovementStats(class Vec3 const& d); - // vIndex: 215, symbol: ?getCurrentStructureFeature@ServerPlayer@@UEBA?AW4StructureFeatureType@@XZ + // vIndex: 208, symbol: ?getCurrentStructureFeature@ServerPlayer@@UEBA?AW4StructureFeatureType@@XZ virtual ::StructureFeatureType getCurrentStructureFeature() const; - // vIndex: 217, symbol: ?respawn@ServerPlayer@@UEAAXXZ + // vIndex: 210, symbol: ?respawn@ServerPlayer@@UEAAXXZ virtual void respawn(); - // vIndex: 220, symbol: ?openPortfolio@ServerPlayer@@UEAAXXZ + // vIndex: 213, symbol: ?openPortfolio@ServerPlayer@@UEAAXXZ virtual void openPortfolio(); - // vIndex: 221, symbol: ?openBook@ServerPlayer@@UEAAXH_NHPEAVBlockActor@@@Z + // vIndex: 214, symbol: ?openBook@ServerPlayer@@UEAAXH_NHPEAVBlockActor@@@Z virtual void openBook(int, bool, int, class BlockActor*); - // vIndex: 222, symbol: ?openTrading@ServerPlayer@@UEAAXAEBUActorUniqueID@@_N@Z + // vIndex: 215, symbol: ?openTrading@ServerPlayer@@UEAAXAEBUActorUniqueID@@_N@Z virtual void openTrading(struct ActorUniqueID const& uniqueID, bool useNewScreen); - // vIndex: 224, symbol: ?openNpcInteractScreen@ServerPlayer@@UEAAXV?$shared_ptr@UINpcDialogueData@@@std@@@Z + // vIndex: 217, symbol: ?openNpcInteractScreen@ServerPlayer@@UEAAXV?$shared_ptr@UINpcDialogueData@@@std@@@Z virtual void openNpcInteractScreen(std::shared_ptr npc); - // vIndex: 225, symbol: ?openInventory@ServerPlayer@@UEAAXXZ + // vIndex: 218, symbol: ?openInventory@ServerPlayer@@UEAAXXZ virtual void openInventory(); - // vIndex: 228, symbol: + // vIndex: 221, symbol: // ?displayTextObjectMessage@ServerPlayer@@UEAAXAEBVTextObjectRoot@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@1@Z virtual void displayTextObjectMessage(class TextObjectRoot const& textObject, std::string const&, std::string const&); - // vIndex: 229, symbol: + // vIndex: 222, symbol: // ?displayTextObjectWhisperMessage@ServerPlayer@@UEAAXAEBVResolvedTextObject@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@1@Z virtual void displayTextObjectWhisperMessage( class ResolvedTextObject const& textObject, @@ -180,12 +168,12 @@ class ServerPlayer : public ::Player { std::string const& platformId ); - // vIndex: 230, symbol: + // vIndex: 223, symbol: // ?displayTextObjectWhisperMessage@ServerPlayer@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z virtual void displayTextObjectWhisperMessage(std::string const& message, std::string const& xuid, std::string const& platformId); - // vIndex: 231, symbol: + // vIndex: 224, symbol: // ?displayWhisperMessage@ServerPlayer@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000@Z virtual void displayWhisperMessage( std::string const& author, @@ -194,25 +182,25 @@ class ServerPlayer : public ::Player { std::string const& platformId ); - // vIndex: 233, symbol: ?stopSleepInBed@ServerPlayer@@UEAAX_N0@Z + // vIndex: 226, symbol: ?stopSleepInBed@ServerPlayer@@UEAAX_N0@Z virtual void stopSleepInBed(bool forcefulWakeUp, bool updateLevelList); - // vIndex: 235, symbol: ?openSign@ServerPlayer@@UEAAXAEBVBlockPos@@_N@Z + // vIndex: 228, symbol: ?openSign@ServerPlayer@@UEAAXAEBVBlockPos@@_N@Z virtual void openSign(class BlockPos const& position, bool); - // vIndex: 237, symbol: ?isLoading@ServerPlayer@@UEBA_NXZ + // vIndex: 230, symbol: ?isLoading@ServerPlayer@@UEBA_NXZ virtual bool isLoading() const; - // vIndex: 238, symbol: ?isPlayerInitialized@ServerPlayer@@UEBA_NXZ + // vIndex: 231, symbol: ?isPlayerInitialized@ServerPlayer@@UEBA_NXZ virtual bool isPlayerInitialized() const; - // vIndex: 240, symbol: ?setPlayerGameType@ServerPlayer@@UEAAXW4GameType@@@Z + // vIndex: 233, symbol: ?setPlayerGameType@ServerPlayer@@UEAAXW4GameType@@@Z virtual void setPlayerGameType(::GameType gameType); - // vIndex: 247, symbol: ?setContainerData@ServerPlayer@@UEAAXAEAVIContainerManager@@HH@Z + // vIndex: 240, symbol: ?setContainerData@ServerPlayer@@UEAAXAEAVIContainerManager@@HH@Z virtual void setContainerData(class IContainerManager& menu, int id, int value); - // vIndex: 248, symbol: ?slotChanged@ServerPlayer@@UEAAXAEAVIContainerManager@@AEAVContainer@@HAEBVItemStack@@2_N@Z + // vIndex: 241, symbol: ?slotChanged@ServerPlayer@@UEAAXAEAVIContainerManager@@AEAVContainer@@HAEBVItemStack@@2_N@Z virtual void slotChanged( class IContainerManager& menu, class Container& container, @@ -222,47 +210,47 @@ class ServerPlayer : public ::Player { bool isResultSlot ); - // vIndex: 249, symbol: ?refreshContainer@ServerPlayer@@UEAAXAEAVIContainerManager@@@Z + // vIndex: 242, symbol: ?refreshContainer@ServerPlayer@@UEAAXAEAVIContainerManager@@@Z virtual void refreshContainer(class IContainerManager& menu); - // vIndex: 251, symbol: ?isActorRelevant@ServerPlayer@@UEAA_NAEBVActor@@@Z + // vIndex: 244, symbol: ?isActorRelevant@ServerPlayer@@UEAA_NAEBVActor@@@Z virtual bool isActorRelevant(class Actor const& actor); - // vIndex: 252, symbol: ?isTeacher@ServerPlayer@@UEBA_NXZ + // vIndex: 245, symbol: ?isTeacher@ServerPlayer@@UEBA_NXZ virtual bool isTeacher() const; - // vIndex: 253, symbol: ?onSuspension@ServerPlayer@@UEAAXXZ + // vIndex: 246, symbol: ?onSuspension@ServerPlayer@@UEAAXXZ virtual void onSuspension(); - // vIndex: 254, symbol: ?onLinkedSlotsChanged@ServerPlayer@@UEAAXXZ + // vIndex: 247, symbol: ?onLinkedSlotsChanged@ServerPlayer@@UEAAXXZ virtual void onLinkedSlotsChanged(); - // vIndex: 255, symbol: ?sendInventoryTransaction@ServerPlayer@@UEBAXAEBVInventoryTransaction@@@Z + // vIndex: 248, symbol: ?sendInventoryTransaction@ServerPlayer@@UEBAXAEBVInventoryTransaction@@@Z virtual void sendInventoryTransaction(class InventoryTransaction const& transaction) const; - // vIndex: 256, symbol: + // vIndex: 249, symbol: // ?sendComplexInventoryTransaction@ServerPlayer@@UEBAXV?$unique_ptr@VComplexInventoryTransaction@@U?$default_delete@VComplexInventoryTransaction@@@std@@@std@@@Z virtual void sendComplexInventoryTransaction(std::unique_ptr transaction) const; - // vIndex: 257, symbol: ?sendNetworkPacket@ServerPlayer@@UEBAXAEAVPacket@@@Z + // vIndex: 250, symbol: ?sendNetworkPacket@ServerPlayer@@UEBAXAEAVPacket@@@Z virtual void sendNetworkPacket(class Packet& packet) const; - // vIndex: 258, symbol: ?getPlayerEventCoordinator@ServerPlayer@@UEAAAEAVPlayerEventCoordinator@@XZ + // vIndex: 251, symbol: ?getPlayerEventCoordinator@ServerPlayer@@UEAAAEAVPlayerEventCoordinator@@XZ virtual class PlayerEventCoordinator& getPlayerEventCoordinator(); - // vIndex: 263, symbol: ?getMaxChunkBuildRadius@ServerPlayer@@UEBAEXZ + // vIndex: 256, symbol: ?getMaxChunkBuildRadius@ServerPlayer@@UEBAEXZ virtual uchar getMaxChunkBuildRadius() const; - // vIndex: 267, symbol: ?getEditorPlayer@ServerPlayer@@UEBA?AV?$NonOwnerPointer@VIEditorPlayer@Editor@@@Bedrock@@XZ + // vIndex: 260, symbol: ?getEditorPlayer@ServerPlayer@@UEBA?AV?$NonOwnerPointer@VIEditorPlayer@Editor@@@Bedrock@@XZ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const; - // vIndex: 268, symbol: ?destroyEditorPlayer@ServerPlayer@@UEAAXXZ + // vIndex: 261, symbol: ?destroyEditorPlayer@ServerPlayer@@UEAAXXZ virtual void destroyEditorPlayer(); - // vIndex: 269, symbol: ?_getSpawnChunkLimit@ServerPlayer@@MEBAHXZ + // vIndex: 262, symbol: ?_getSpawnChunkLimit@ServerPlayer@@MEBAHXZ virtual int _getSpawnChunkLimit() const; - // vIndex: 270, symbol: ?_updateChunkPublisherView@ServerPlayer@@MEAAXAEBVVec3@@M@Z + // vIndex: 263, symbol: ?_updateChunkPublisherView@ServerPlayer@@MEAAXAEBVVec3@@M@Z virtual void _updateChunkPublisherView(class Vec3 const& position, float minDistance); // symbol: @@ -321,9 +309,6 @@ class ServerPlayer : public ::Player { // symbol: ?sendPlayerAuthInputReceivedEvent@ServerPlayer@@QEAAXXZ MCAPI void sendPlayerAuthInputReceivedEvent(); - // symbol: ?sendPlayerOnGround@ServerPlayer@@QEAAXXZ - MCAPI void sendPlayerOnGround(); - // symbol: ?setClientChunkRadius@ServerPlayer@@QEAAXIE@Z MCAPI void setClientChunkRadius(uint requestedRadius, uchar); diff --git a/src/mc/server/SimulatedPlayer.h b/src/mc/server/SimulatedPlayer.h index 34fdae757b..b3e271a9df 100644 --- a/src/mc/server/SimulatedPlayer.h +++ b/src/mc/server/SimulatedPlayer.h @@ -76,30 +76,30 @@ class SimulatedPlayer : public ::ServerPlayer { // vIndex: 10, symbol: __gen_??1SimulatedPlayer@@UEAA@XZ virtual ~SimulatedPlayer() = default; - // vIndex: 26, symbol: ?teleportTo@SimulatedPlayer@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@SimulatedPlayer@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int sourceEntityType, bool); - // vIndex: 171, symbol: ?aiStep@SimulatedPlayer@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@SimulatedPlayer@@UEAAXXZ virtual void aiStep(); - // vIndex: 259, symbol: ?isSimulated@SimulatedPlayer@@UEBA_NXZ + // vIndex: 252, symbol: ?isSimulated@SimulatedPlayer@@UEBA_NXZ virtual bool isSimulated() const; - // vIndex: 260, symbol: + // vIndex: 253, symbol: // ?getXuid@SimulatedPlayer@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getXuid() const; - // vIndex: 261, symbol: ?getMovementSettings@SimulatedPlayer@@UEBAAEBUPlayerMovementSettings@@XZ + // vIndex: 254, symbol: ?getMovementSettings@SimulatedPlayer@@UEBAAEBUPlayerMovementSettings@@XZ virtual struct PlayerMovementSettings const& getMovementSettings() const; - // vIndex: 265, symbol: + // vIndex: 258, symbol: // ?_createChunkSource@SimulatedPlayer@@MEAA?AV?$shared_ptr@VChunkViewSource@@@std@@AEAVChunkSource@@@Z virtual std::shared_ptr _createChunkSource(class ChunkSource& mainChunkSource); - // vIndex: 269, symbol: ?_getSpawnChunkLimit@SimulatedPlayer@@MEBAHXZ + // vIndex: 262, symbol: ?_getSpawnChunkLimit@SimulatedPlayer@@MEBAHXZ virtual int _getSpawnChunkLimit() const; - // vIndex: 270, symbol: ?_updateChunkPublisherView@SimulatedPlayer@@MEAAXAEBVVec3@@M@Z + // vIndex: 263, symbol: ?_updateChunkPublisherView@SimulatedPlayer@@MEAAXAEBVVec3@@M@Z virtual void _updateChunkPublisherView(class Vec3 const&, float); // symbol: diff --git a/src/mc/server/commands/CommandMessage.h b/src/mc/server/commands/CommandMessage.h index 7f70c3b490..869e0b24b4 100644 --- a/src/mc/server/commands/CommandMessage.h +++ b/src/mc/server/commands/CommandMessage.h @@ -43,12 +43,8 @@ class CommandMessage { // symbol: ??0CommandMessage@@QEAA@XZ MCAPI CommandMessage(); - // symbol: - // ?getMessage@CommandMessage@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVCommandOrigin@@@Z - MCAPI std::string getMessage(class CommandOrigin const&) const; - - // symbol: ?getMessageForChat@CommandMessage@@QEBA?AUGetMessageResult@@AEBVCommandOrigin@@H@Z - MCAPI struct GetMessageResult getMessageForChat(class CommandOrigin const&, int) const; + // symbol: ?generateMessage@CommandMessage@@QEBA?AUGenerateMessageResult@@AEBVCommandOrigin@@H@Z + MCAPI struct GenerateMessageResult generateMessage(class CommandOrigin const&, int) const; // symbol: ??1CommandMessage@@QEAA@XZ MCAPI ~CommandMessage(); diff --git a/src/mc/server/commands/CommandRationalRange.h b/src/mc/server/commands/CommandRationalRange.h new file mode 100644 index 0000000000..71c5b1191d --- /dev/null +++ b/src/mc/server/commands/CommandRationalRange.h @@ -0,0 +1,47 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class CommandRationalRange { +public: + // CommandRationalRange inner types define + enum class BoundType {}; + + enum class ValueType {}; + +public: + // prevent constructor by default + CommandRationalRange& operator=(CommandRationalRange const&); + CommandRationalRange(CommandRationalRange const&); + +public: + // NOLINTBEGIN + // symbol: ??0CommandRationalRange@@QEAA@XZ + MCAPI CommandRationalRange(); + + // symbol: ?getMaxValue@CommandRationalRange@@QEBA?AV?$variant@HM@std@@XZ + MCAPI std::variant getMaxValue() const; + + // symbol: ?getMinValue@CommandRationalRange@@QEBA?AV?$variant@HM@std@@XZ + MCAPI std::variant getMinValue() const; + + // symbol: ?hasBoundType@CommandRationalRange@@QEBA_NAEBW4BoundType@1@@Z + MCAPI bool hasBoundType(::CommandRationalRange::BoundType const&) const; + + // symbol: ?isOfValueType@CommandRationalRange@@QEBA_NAEBW4ValueType@1@@Z + MCAPI bool isOfValueType(::CommandRationalRange::ValueType const&) const; + + // symbol: ?isWithinRange@CommandRationalRange@@QEBA_NAEBV?$variant@HM@std@@@Z + MCAPI bool isWithinRange(std::variant const&) const; + + // symbol: ?resetToValueType@CommandRationalRange@@QEAAXAEBW4ValueType@1@@Z + MCAPI void resetToValueType(::CommandRationalRange::ValueType const&); + + // symbol: ?setInvert@CommandRationalRange@@QEAAX_N@Z + MCAPI void setInvert(bool); + + // symbol: ?setValue@CommandRationalRange@@QEAAXAEBV?$variant@HM@std@@AEBW4BoundType@1@@Z + MCAPI void setValue(std::variant const&, ::CommandRationalRange::BoundType const&); + + // NOLINTEND +}; diff --git a/src/mc/server/commands/CommandRegistry.h b/src/mc/server/commands/CommandRegistry.h index a2fd6cef35..60c6a55047 100644 --- a/src/mc/server/commands/CommandRegistry.h +++ b/src/mc/server/commands/CommandRegistry.h @@ -578,6 +578,9 @@ class CommandRegistry { // symbol: ?HASPERMISSIONSTATE_ENUM_ENABLED@CommandRegistry@@2PEBDEB MCAPI static char const* HASPERMISSIONSTATE_ENUM_ENABLED; + // symbol: ?HASPROPERTY_PARAM_PROPERTY_NAME@CommandRegistry@@2PEBDEB + MCAPI static char const* HASPROPERTY_PARAM_PROPERTY_NAME; + // symbol: ?TAG_VALUES_SOFTENUM_NAME@CommandRegistry@@2PEBDEB MCAPI static char const* TAG_VALUES_SOFTENUM_NAME; @@ -898,6 +901,11 @@ class CommandRegistry { std::vector& errorParams ); + // symbol: + // ?readString@CommandRegistry@@CA_NAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUParseToken@1@0AEAV?$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 static bool + readString(std::string&, struct CommandRegistry::ParseToken const&, std::string&, std::vector&); + // NOLINTEND private: diff --git a/src/mc/server/commands/CommandSelectorBase.h b/src/mc/server/commands/CommandSelectorBase.h index 0957f55654..044071f196 100644 --- a/src/mc/server/commands/CommandSelectorBase.h +++ b/src/mc/server/commands/CommandSelectorBase.h @@ -68,6 +68,11 @@ class CommandSelectorBase { // ?addHasPermissionFilters@CommandSelectorBase@@QEAAXAEBV?$vector@UHasPermissionFilter@@V?$allocator@UHasPermissionFilter@@@std@@@std@@@Z MCAPI void addHasPermissionFilters(std::vector const& filters); + // symbol: + // ?addHasPropertyFilter@CommandSelectorBase@@QEAAXAEBVHashedString@@_NAEBV?$optional@V?$variant@VCommandRationalRange@@_NV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@std@@@std@@@Z + MCAPI void + addHasPropertyFilter(class HashedString const&, bool, std::optional> const&); + // symbol: ?addLevelFilter@CommandSelectorBase@@QEAAXAEBU?$pair@HH@std@@@Z MCAPI void addLevelFilter(std::pair const& level); @@ -126,6 +131,9 @@ class CommandSelectorBase { // ?setExplicitIdSelector@CommandSelectorBase@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI void setExplicitIdSelector(std::string const& playerName); + // symbol: ?setForceDimensionFiltering@CommandSelectorBase@@QEAAX_N@Z + MCAPI void setForceDimensionFiltering(bool); + // symbol: ?setIncludeDeadPlayers@CommandSelectorBase@@QEAAX_N@Z MCAPI void setIncludeDeadPlayers(bool includeDead); diff --git a/src/mc/server/commands/MinecraftCommands.h b/src/mc/server/commands/MinecraftCommands.h index 3436c86343..237f64693f 100644 --- a/src/mc/server/commands/MinecraftCommands.h +++ b/src/mc/server/commands/MinecraftCommands.h @@ -60,11 +60,11 @@ class MinecraftCommands { MCAPI void handleOutput(class CommandOrigin const& origin, class CommandOutput const& output) const; // symbol: - // ?initCoreEnums@MinecraftCommands@@QEAAXVItemRegistryRef@@AEBVIWorldRegistriesProvider@@AEBVActorFactory@@AEBVExperiments@@AEBVBaseGameVersion@@@Z + // ?initCoreEnums@MinecraftCommands@@QEAAXVItemRegistryRef@@AEBVLevel@@AEBVActorFactory@@AEBVExperiments@@AEBVBaseGameVersion@@@Z MCAPI void initCoreEnums( class ItemRegistryRef, - class IWorldRegistriesProvider const& registries, - class ActorFactory const& actorFactory, + class Level const& registries, + class ActorFactory const& actorFactory, class Experiments const&, class BaseGameVersion const& worldBaseGameVersion ); @@ -98,6 +98,9 @@ class MinecraftCommands { MCAPI static void initEntityEnum(class CommandRegistry& registry, class ActorFactory const& actorFactory, class Experiments const&); + // symbol: ?initEntityPropertyEnum@MinecraftCommands@@SAXAEAVCommandRegistry@@AEBVLevel@@@Z + MCAPI static void initEntityPropertyEnum(class CommandRegistry&, class Level const&); + // symbol: ?initItemEnum@MinecraftCommands@@SAXVItemRegistryRef@@AEAVCommandRegistry@@AEBVBaseGameVersion@@@Z MCAPI static void initItemEnum( class ItemRegistryRef, diff --git a/src/mc/server/commands/test/SendShowStoreOfferCommand.h b/src/mc/server/commands/test/SendShowStoreOfferCommand.h new file mode 100644 index 0000000000..265d683462 --- /dev/null +++ b/src/mc/server/commands/test/SendShowStoreOfferCommand.h @@ -0,0 +1,27 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/Command.h" + +class SendShowStoreOfferCommand : public ::Command { +public: + // prevent constructor by default + SendShowStoreOfferCommand& operator=(SendShowStoreOfferCommand const&); + SendShowStoreOfferCommand(SendShowStoreOfferCommand const&); + SendShowStoreOfferCommand(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1SendShowStoreOfferCommand@@UEAA@XZ + virtual ~SendShowStoreOfferCommand() = default; + + // vIndex: 2, symbol: ?execute@SendShowStoreOfferCommand@@UEBAXAEBVCommandOrigin@@AEAVCommandOutput@@@Z + virtual void execute(class CommandOrigin const& origin, class CommandOutput& output) const; + + // symbol: ?setup@SendShowStoreOfferCommand@@SAXAEAVCommandRegistry@@@Z + MCAPI static void setup(class CommandRegistry& registry); + + // NOLINTEND +}; diff --git a/src/mc/server/common/PropertiesSettings.h b/src/mc/server/common/PropertiesSettings.h index 8ce138f5ef..37744bdf56 100644 --- a/src/mc/server/common/PropertiesSettings.h +++ b/src/mc/server/common/PropertiesSettings.h @@ -149,6 +149,9 @@ class PropertiesSettings { // symbol: ?getServerPortv6@PropertiesSettings@@QEBAGXZ MCAPI ushort getServerPortv6() const; + // symbol: ?getServerTextSettings@PropertiesSettings@@QEBAAEBV?$bitset@$02@std@@XZ + MCAPI std::bitset<3> const& getServerTextSettings() const; + // symbol: ?getServerTickRange@PropertiesSettings@@QEBAHXZ MCAPI int getServerTickRange() const; diff --git a/src/mc/util/BigEndianStringByteInput.h b/src/mc/util/BigEndianStringByteInput.h index 6d09bc5372..04d5a2bc95 100644 --- a/src/mc/util/BigEndianStringByteInput.h +++ b/src/mc/util/BigEndianStringByteInput.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/util/StringByteInput.h" class BigEndianStringByteInput : public ::StringByteInput { @@ -13,26 +14,28 @@ class BigEndianStringByteInput : public ::StringByteInput { // vIndex: 0, symbol: ??1BigEndianStringByteInput@@UEAA@XZ virtual ~BigEndianStringByteInput(); - // vIndex: 3, symbol: ?readFloat@BigEndianStringByteInput@@UEAAMXZ - virtual float readFloat(); + // vIndex: 3, symbol: ?readFloatResult@BigEndianStringByteInput@@UEAA?AV?$Result@MVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readFloatResult(); - // vIndex: 4, symbol: ?readDouble@BigEndianStringByteInput@@UEAANXZ - virtual double readDouble(); + // vIndex: 4, symbol: ?readDoubleResult@BigEndianStringByteInput@@UEAA?AV?$Result@NVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readDoubleResult(); - // vIndex: 6, symbol: ?readShort@BigEndianStringByteInput@@UEAAFXZ - virtual short readShort(); + // vIndex: 6, symbol: ?readShortResult@BigEndianStringByteInput@@UEAA?AV?$Result@FVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readShortResult(); - // vIndex: 7, symbol: ?readInt@BigEndianStringByteInput@@UEAAHXZ - virtual int readInt(); + // vIndex: 7, symbol: ?readIntResult@BigEndianStringByteInput@@UEAA?AV?$Result@HVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readIntResult(); - // vIndex: 8, symbol: ?readLongLong@BigEndianStringByteInput@@UEAA_JXZ - virtual int64 readLongLong(); + // vIndex: 8, symbol: ?readLongLongResult@BigEndianStringByteInput@@UEAA?AV?$Result@_JVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readLongLongResult(); - // vIndex: 9, symbol: ?readBytes@BigEndianStringByteInput@@UEAA_NPEAX_K@Z - virtual bool readBytes(void* data, uint64 bytes); + // vIndex: 9, symbol: + // ?readBytesResult@BigEndianStringByteInput@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@PEAX_K@Z + virtual class Bedrock::Result readBytesResult(void*, uint64); - // vIndex: 11, symbol: ?readBigEndianBytes@BigEndianStringByteInput@@UEAA_NPEAX_K@Z - virtual bool readBigEndianBytes(void* data, uint64 bytes); + // vIndex: 11, symbol: + // ?readBigEndianBytesResult@BigEndianStringByteInput@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@PEAX_K@Z + virtual class Bedrock::Result readBigEndianBytesResult(void*, uint64); // NOLINTEND }; diff --git a/src/mc/util/Bounds.h b/src/mc/util/Bounds.h index 636cfc799b..4eb49e77dc 100644 --- a/src/mc/util/Bounds.h +++ b/src/mc/util/Bounds.h @@ -26,8 +26,5 @@ struct Bounds : public BoundingBox { MCAPI Bounds(class BlockPos const& minBlock, class BlockPos const& maxBlock, int side, ::Bounds::Option buildOption); - // symbol: ??0Bounds@@QEAA@AEBVBlockPos@@HHFF@Z - MCAPI Bounds(class BlockPos const&, int, int, short, short); - // NOLINTEND }; diff --git a/src/mc/util/BytesDataInput.h b/src/mc/util/BytesDataInput.h index 654c6e9379..c036af91d6 100644 --- a/src/mc/util/BytesDataInput.h +++ b/src/mc/util/BytesDataInput.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/util/IDataInput.h" class BytesDataInput : public ::IDataInput { @@ -12,12 +13,12 @@ class BytesDataInput : public ::IDataInput { virtual ~BytesDataInput() = default; // vIndex: 1, symbol: - // ?readString@BytesDataInput@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - virtual std::string readString(); + // ?readStringResult@BytesDataInput@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@XZ + virtual class Bedrock::Result readStringResult(); // vIndex: 2, symbol: - // ?readLongString@BytesDataInput@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - virtual std::string readLongString(); + // ?readLongStringResult@BytesDataInput@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@XZ + virtual class Bedrock::Result readLongStringResult(); // vIndex: 3, symbol: ?readFloat@BytesDataInput@@UEAAMXZ virtual float readFloat(); @@ -25,8 +26,8 @@ class BytesDataInput : public ::IDataInput { // vIndex: 4, symbol: ?readDouble@BytesDataInput@@UEAANXZ virtual double readDouble(); - // vIndex: 5, symbol: ?readByte@BytesDataInput@@UEAADXZ - virtual char readByte(); + // vIndex: 5, symbol: ?readByteResult@BytesDataInput@@UEAA?AV?$Result@EVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readByteResult(); // vIndex: 6, symbol: ?readShort@BytesDataInput@@UEAAFXZ virtual short readShort(); diff --git a/src/mc/util/Carpet.h b/src/mc/util/Carpet.h new file mode 100644 index 0000000000..ae9888b386 --- /dev/null +++ b/src/mc/util/Carpet.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Carpet { +// NOLINTBEGIN +// symbol: ?get@Carpet@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::Carpet diff --git a/src/mc/util/Concrete.h b/src/mc/util/Concrete.h new file mode 100644 index 0000000000..d72807a657 --- /dev/null +++ b/src/mc/util/Concrete.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Concrete { +// NOLINTBEGIN +// symbol: ?get@Concrete@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::Concrete diff --git a/src/mc/util/ConcretePowder.h b/src/mc/util/ConcretePowder.h new file mode 100644 index 0000000000..3baed74b89 --- /dev/null +++ b/src/mc/util/ConcretePowder.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::ConcretePowder { +// NOLINTBEGIN +// symbol: ?get@ConcretePowder@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::ConcretePowder diff --git a/src/mc/util/Coral.h b/src/mc/util/Coral.h new file mode 100644 index 0000000000..467e8c8b9c --- /dev/null +++ b/src/mc/util/Coral.h @@ -0,0 +1,32 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/enums/CoralColor.h" +#include "mc/world/level/block/BlockLegacy.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Coral { +// NOLINTBEGIN +// symbol: ?get@Coral@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getBlockComplexAliasCallback@Coral@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getBlockComplexAliasCallback(); + +// symbol: +// ?getColorSplitStates@Coral@FlatteningUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@_N@Z +MCAPI std::vector getColorSplitStates(bool); + +// symbol: +// ?getDeadSplitStates@Coral@FlatteningUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@W4CoralColor@@@Z +MCAPI std::vector getDeadSplitStates(::CoralColor); +// NOLINTEND + +}; // namespace FlatteningUtils::Coral diff --git a/src/mc/util/CreatorMetadataUtils.h b/src/mc/util/CreatorMetadataUtils.h index 584857d11d..53e4513822 100644 --- a/src/mc/util/CreatorMetadataUtils.h +++ b/src/mc/util/CreatorMetadataUtils.h @@ -41,6 +41,9 @@ MCAPI class Json::Value _generateBlocksMetadataJson(); // symbol: ?_generateCameraMetadataJson@CreatorMetadataUtils@@YA?AVValue@Json@@AEBVCameraPresets@@@Z MCAPI class Json::Value _generateCameraMetadataJson(class CameraPresets const&); +// symbol: ?_generateCooldownCategoriesMetadataJson@CreatorMetadataUtils@@YA?AVValue@Json@@VItemRegistryRef@@@Z +MCAPI class Json::Value _generateCooldownCategoriesMetadataJson(class ItemRegistryRef); + // symbol: ?_generateDimensionsMetadataJson@CreatorMetadataUtils@@YA?AVValue@Json@@XZ MCAPI class Json::Value _generateDimensionsMetadataJson(); @@ -83,6 +86,9 @@ MCAPI void generateCameraPresetDocumentation(class Core::Path const&, class Came // symbol: ?generateCommandsDocumentation@CreatorMetadataUtils@@YAXAEAVCommandRegistry@@AEBVPath@Core@@@Z MCAPI void generateCommandsDocumentation(class CommandRegistry& commandRegistry, class Core::Path const&); +// symbol: ?generateCooldownCategoriesDocumentation@CreatorMetadataUtils@@YAXAEBVPath@Core@@VItemRegistryRef@@@Z +MCAPI void generateCooldownCategoriesDocumentation(class Core::Path const&, class ItemRegistryRef); + // symbol: // ?generateCreatorScriptingMetadata@CreatorMetadataUtils@@YAXAEAVScriptEngine@Scripting@@AEBVPath@Core@@11VItemRegistryRef@@AEBV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VActorDefinition@@U?$default_delete@VActorDefinition@@@std@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VActorDefinition@@U?$default_delete@VActorDefinition@@@std@@@2@@std@@@2@@std@@AEBVCameraPresets@@AEBVBiomeRegistry@@@Z MCAPI void diff --git a/src/mc/util/Easing.h b/src/mc/util/Easing.h index fe7b3fd390..26f81577f1 100644 --- a/src/mc/util/Easing.h +++ b/src/mc/util/Easing.h @@ -14,6 +14,9 @@ class Easing { public: // NOLINTBEGIN + // symbol: ?getEasingFunc@Easing@@SA?AV?$function@$$A6AMMMM@Z@std@@W4EasingType@@@Z + MCAPI static std::function getEasingFunc(::EasingType); + // symbol: // ?getStringFromEasingType@Easing@@SAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4EasingType@@@Z MCAPI static std::string const& getStringFromEasingType(::EasingType); diff --git a/src/mc/util/Fence.h b/src/mc/util/Fence.h new file mode 100644 index 0000000000..5c4f569dd9 --- /dev/null +++ b/src/mc/util/Fence.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Fence { +// NOLINTBEGIN +// symbol: ?get@Fence@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::Fence diff --git a/src/mc/util/FlatteningUtils.h b/src/mc/util/FlatteningUtils.h new file mode 100644 index 0000000000..d05c1fb07a --- /dev/null +++ b/src/mc/util/FlatteningUtils.h @@ -0,0 +1,101 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/enums/CoralColor.h" +#include "mc/enums/WoodType.h" +#include "mc/world/level/block/BlockLegacy.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { class RemovedState; } +namespace FlatteningUtils { struct BlockNameRefAuxVariant; } +namespace FlatteningUtils { struct Instance; } +namespace FlatteningUtils { struct LegacyBlockInfo; } +// clang-format on + +namespace FlatteningUtils { +// NOLINTBEGIN +// symbol: +// ?LegacyBlockInfos@FlatteningUtils@@3V?$vector@V?$reference_wrapper@$$CBULegacyBlockInfo@FlatteningUtils@@@std@@V?$allocator@V?$reference_wrapper@$$CBULegacyBlockInfo@FlatteningUtils@@@std@@@2@@std@@B +MCAPI extern std::vector> const LegacyBlockInfos; + +// symbol: ?LegacyCarpetInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyCarpetInfo; + +// symbol: ?LegacyConcreteInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyConcreteInfo; + +// symbol: ?LegacyConcretePowderInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyConcretePowderInfo; + +// symbol: ?LegacyCoralInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyCoralInfo; + +// symbol: ?LegacyFenceInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyFenceInfo; + +// symbol: ?LegacyHardStainedGlassInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyHardStainedGlassInfo; + +// symbol: ?LegacyHardStainedGlassPaneInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyHardStainedGlassPaneInfo; + +// symbol: ?LegacyLavaCauldronInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyLavaCauldronInfo; + +// symbol: ?LegacyLeaves2Info@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyLeaves2Info; + +// symbol: ?LegacyLeavesInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyLeavesInfo; + +// symbol: ?LegacyLog2Info@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyLog2Info; + +// symbol: ?LegacyLogInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyLogInfo; + +// symbol: ?LegacyPlanksInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyPlanksInfo; + +// symbol: ?LegacyShulkerBoxInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyShulkerBoxInfo; + +// symbol: ?LegacyStainedGlassInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyStainedGlassInfo; + +// symbol: ?LegacyStainedGlassPaneInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyStainedGlassPaneInfo; + +// symbol: ?LegacyStoneInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyStoneInfo; + +// symbol: ?LegacyTerracottaInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyTerracottaInfo; + +// symbol: ?LegacyWoodInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyWoodInfo; + +// symbol: ?LegacyWoodenDoubleSlabInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyWoodenDoubleSlabInfo; + +// symbol: ?LegacyWoodenSlabInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyWoodenSlabInfo; + +// symbol: ?LegacyWoolInfo@FlatteningUtils@@3ULegacyBlockInfo@1@B +MCAPI extern struct FlatteningUtils::LegacyBlockInfo const LegacyWoolInfo; + +// symbol: +// ?addUpdate@FlatteningUtils@@YAXAEAVCompoundTagUpdaterContext@@EEEAEBULegacyBlockInfo@1@AEBV?$vector@V?$shared_ptr@VRemovedState@FlatteningUtils@@@std@@V?$allocator@V?$shared_ptr@VRemovedState@FlatteningUtils@@@std@@@2@@std@@@Z +MCAPI void +addUpdate(class CompoundTagUpdaterContext&, uchar, uchar, uchar, struct FlatteningUtils::LegacyBlockInfo const&, std::vector> const&); + +// symbol: +// ?getSimpleBlockComplexAliasCallback@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@AEBULegacyBlockInfo@1@_K@Z +MCAPI std::function + getSimpleBlockComplexAliasCallback(struct FlatteningUtils::LegacyBlockInfo const&, uint64); +// NOLINTEND + +}; // namespace FlatteningUtils diff --git a/src/mc/util/HardStainedGlass.h b/src/mc/util/HardStainedGlass.h new file mode 100644 index 0000000000..2b7b30de15 --- /dev/null +++ b/src/mc/util/HardStainedGlass.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::HardStainedGlass { +// NOLINTBEGIN +// symbol: ?get@HardStainedGlass@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::HardStainedGlass diff --git a/src/mc/util/HardStainedGlassPane.h b/src/mc/util/HardStainedGlassPane.h new file mode 100644 index 0000000000..71a8beab12 --- /dev/null +++ b/src/mc/util/HardStainedGlassPane.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::HardStainedGlassPane { +// NOLINTBEGIN +// symbol: ?get@HardStainedGlassPane@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::HardStainedGlassPane diff --git a/src/mc/util/IDataInput.h b/src/mc/util/IDataInput.h index 18b63a0180..bbcae796f9 100644 --- a/src/mc/util/IDataInput.h +++ b/src/mc/util/IDataInput.h @@ -2,6 +2,9 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" + class IDataInput { public: // NOLINTBEGIN @@ -9,36 +12,58 @@ class IDataInput { virtual ~IDataInput() = default; // vIndex: 1, symbol: - // ?readString@BytesDataInput@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - virtual std::string readString() = 0; + // ?readStringResult@BytesDataInput@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@XZ + virtual class Bedrock::Result readStringResult() = 0; // vIndex: 2, symbol: - // ?readLongString@BytesDataInput@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - virtual std::string readLongString() = 0; + // ?readLongStringResult@BytesDataInput@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@XZ + virtual class Bedrock::Result readLongStringResult() = 0; - // vIndex: 3, symbol: ?readFloat@BigEndianStringByteInput@@UEAAMXZ - virtual float readFloat() = 0; + // vIndex: 3, symbol: ?readFloatResult@BigEndianStringByteInput@@UEAA?AV?$Result@MVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readFloatResult() = 0; - // vIndex: 4, symbol: ?readDouble@BigEndianStringByteInput@@UEAANXZ - virtual double readDouble() = 0; + // vIndex: 4, symbol: ?readDoubleResult@BigEndianStringByteInput@@UEAA?AV?$Result@NVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readDoubleResult() = 0; - // vIndex: 5, symbol: ?readByte@BytesDataInput@@UEAADXZ - virtual char readByte() = 0; + // vIndex: 5, symbol: ?readByteResult@BytesDataInput@@UEAA?AV?$Result@EVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readByteResult() = 0; - // vIndex: 6, symbol: ?readShort@BigEndianStringByteInput@@UEAAFXZ - virtual short readShort() = 0; + // vIndex: 6, symbol: ?readShortResult@BigEndianStringByteInput@@UEAA?AV?$Result@FVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readShortResult() = 0; - // vIndex: 7, symbol: ?readInt@BigEndianStringByteInput@@UEAAHXZ - virtual int readInt() = 0; + // vIndex: 7, symbol: ?readIntResult@BigEndianStringByteInput@@UEAA?AV?$Result@HVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readIntResult() = 0; - // vIndex: 8, symbol: ?readLongLong@BigEndianStringByteInput@@UEAA_JXZ - virtual int64 readLongLong() = 0; + // vIndex: 8, symbol: ?readLongLongResult@BigEndianStringByteInput@@UEAA?AV?$Result@_JVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readLongLongResult() = 0; - // vIndex: 9, symbol: ?readBytes@BigEndianStringByteInput@@UEAA_NPEAX_K@Z - virtual bool readBytes(void* data, uint64 bytes) = 0; + // vIndex: 9, symbol: + // ?readBytesResult@BigEndianStringByteInput@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@PEAX_K@Z + virtual class Bedrock::Result readBytesResult(void*, uint64) = 0; // vIndex: 10, symbol: ?numBytesLeft@StringByteInput@@UEBA_KXZ virtual uint64 numBytesLeft() const = 0; + // symbol: ?readByte@IDataInput@@QEAAEXZ + MCAPI uchar readByte(); + + // symbol: ?readBytes@IDataInput@@QEAA_NPEAX_K@Z + MCAPI bool readBytes(void*, uint64); + + // symbol: ?readInt@IDataInput@@QEAAHXZ + MCAPI int readInt(); + + // symbol: ?readLongLong@IDataInput@@QEAA_JXZ + MCAPI int64 readLongLong(); + + // symbol: ?readLongString@IDataInput@@QEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string readLongString(); + + // symbol: ?readShort@IDataInput@@QEAAFXZ + MCAPI short readShort(); + + // symbol: ?readString@IDataInput@@QEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string readString(); + // NOLINTEND }; diff --git a/src/mc/util/Instance.h b/src/mc/util/Instance.h new file mode 100644 index 0000000000..9aa402cd05 --- /dev/null +++ b/src/mc/util/Instance.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace FlatteningUtils { + +struct Instance { +public: + // prevent constructor by default + Instance& operator=(Instance const&); + Instance(Instance const&); + Instance(); + +public: + // NOLINTBEGIN + // symbol: ??1Instance@FlatteningUtils@@QEAA@XZ + MCAPI ~Instance(); + + // NOLINTEND +}; + +}; // namespace FlatteningUtils diff --git a/src/mc/util/IntRange.h b/src/mc/util/IntRange.h index 46d8cd5280..5712f2e3f1 100644 --- a/src/mc/util/IntRange.h +++ b/src/mc/util/IntRange.h @@ -25,12 +25,12 @@ struct IntRange { // symbol: ?getValue@IntRange@@QEBAHAEAVRandom@@@Z MCAPI int getValue(class Random& random) const; - // symbol: ?getValue@IntRange@@QEBAHAEAVRandomize@@@Z - MCAPI int getValue(class Randomize&) const; - // symbol: ?getValueInclusive@IntRange@@QEBAHAEAVRandom@@@Z MCAPI int getValueInclusive(class Random& random) const; + // symbol: ?getValueInclusive@IntRange@@QEBAHAEAVRandomize@@@Z + MCAPI int getValueInclusive(class Randomize&) const; + // symbol: ?isInRangeInclusive@IntRange@@QEBA_NH@Z MCAPI bool isInRangeInclusive(int value) const; diff --git a/src/mc/world/level/block/utils/updater/LavaCauldron.h b/src/mc/util/LavaCauldron.h similarity index 50% rename from src/mc/world/level/block/utils/updater/LavaCauldron.h rename to src/mc/util/LavaCauldron.h index 5ddd0d8444..42db59dc22 100644 --- a/src/mc/world/level/block/utils/updater/LavaCauldron.h +++ b/src/mc/util/LavaCauldron.h @@ -7,11 +7,10 @@ class Block; // clang-format on -namespace VanillaComplexAliasBlockUtils::LavaCauldron { +namespace FlatteningUtils::LavaCauldron { // NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@LavaCauldron@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +// symbol: ?getComplexAliasCallback@LavaCauldron@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ MCAPI std::function getComplexAliasCallback(); // NOLINTEND -}; // namespace VanillaComplexAliasBlockUtils::LavaCauldron +}; // namespace FlatteningUtils::LavaCauldron diff --git a/src/mc/util/Leaves.h b/src/mc/util/Leaves.h new file mode 100644 index 0000000000..47a1dfdfa8 --- /dev/null +++ b/src/mc/util/Leaves.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Leaves { +// NOLINTBEGIN +// symbol: ?get@Leaves@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getComplexAliasCallback@Leaves@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getComplexAliasCallback(); +// NOLINTEND + +}; // namespace FlatteningUtils::Leaves diff --git a/src/mc/util/Leaves2.h b/src/mc/util/Leaves2.h new file mode 100644 index 0000000000..0adf545c7a --- /dev/null +++ b/src/mc/util/Leaves2.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Leaves2 { +// NOLINTBEGIN +// symbol: ?get@Leaves2@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getComplexAliasCallback@Leaves2@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getComplexAliasCallback(); +// NOLINTEND + +}; // namespace FlatteningUtils::Leaves2 diff --git a/src/mc/util/Log.h b/src/mc/util/Log.h new file mode 100644 index 0000000000..df28ed2d13 --- /dev/null +++ b/src/mc/util/Log.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Log { +// NOLINTBEGIN +// symbol: ?get@Log@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getBlockComplexAliasCallback@Log@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getBlockComplexAliasCallback(); +// NOLINTEND + +}; // namespace FlatteningUtils::Log diff --git a/src/mc/util/Log2.h b/src/mc/util/Log2.h new file mode 100644 index 0000000000..58aa023343 --- /dev/null +++ b/src/mc/util/Log2.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Log2 { +// NOLINTBEGIN +// symbol: ?get@Log2@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getBlockComplexAliasCallback@Log2@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getBlockComplexAliasCallback(); +// NOLINTEND + +}; // namespace FlatteningUtils::Log2 diff --git a/src/mc/util/MobEffectPacketUtils.h b/src/mc/util/MobEffectPacketUtils.h index cdc3f7476e..705c47963e 100644 --- a/src/mc/util/MobEffectPacketUtils.h +++ b/src/mc/util/MobEffectPacketUtils.h @@ -2,10 +2,15 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/network/packet/MobEffectPacket.h" + namespace MobEffectPacketUtils { // NOLINTBEGIN -// symbol: ?shouldAlwaysSendToClient@MobEffectPacketUtils@@YA_NI@Z -MCAPI bool shouldAlwaysSendToClient(uint); +// symbol: +// ?createPacket@MobEffectPacketUtils@@YA?AV?$optional@VMobEffectPacket@@@std@@W4Event@MobEffectPacket@@AEBVMobEffectInstance@@AEBVEntityContext@@@Z +MCAPI std::optional + createPacket(::MobEffectPacket::Event, class MobEffectInstance const&, class EntityContext const&); // NOLINTEND }; // namespace MobEffectPacketUtils diff --git a/src/mc/util/Planks.h b/src/mc/util/Planks.h new file mode 100644 index 0000000000..5f09744b61 --- /dev/null +++ b/src/mc/util/Planks.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Planks { +// NOLINTBEGIN +// symbol: ?get@Planks@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::Planks diff --git a/src/mc/util/RakDataInput.h b/src/mc/util/RakDataInput.h index d2664289fa..37403c8eac 100644 --- a/src/mc/util/RakDataInput.h +++ b/src/mc/util/RakDataInput.h @@ -4,6 +4,7 @@ #include "mc/deps/raknet/BitStream.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/util/BytesDataInput.h" class RakDataInput : public ::BytesDataInput { @@ -15,8 +16,8 @@ class RakDataInput : public ::BytesDataInput { // vIndex: 0, symbol: ??1RakDataInput@@UEAA@XZ virtual ~RakDataInput(); - // vIndex: 9, symbol: ?readBytes@RakDataInput@@UEAA_NPEAX_K@Z - virtual bool readBytes(void* data, uint64 bytes); + // vIndex: 9, symbol: ?readBytesResult@RakDataInput@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@PEAX_K@Z + virtual class Bedrock::Result readBytesResult(void*, uint64); // vIndex: 10, symbol: ?numBytesLeft@RakDataInput@@UEBA_KXZ virtual uint64 numBytesLeft() const; diff --git a/src/mc/util/RemovedIntState.h b/src/mc/util/RemovedIntState.h new file mode 100644 index 0000000000..49cefd4e59 --- /dev/null +++ b/src/mc/util/RemovedIntState.h @@ -0,0 +1,41 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/util/RemovedState.h" + +// auto generated forward declare list +// clang-format off +class CompoundTag; +class CompoundTagUpdaterNodeBuilder; +namespace FlatteningUtils { class RemovedState; } +// clang-format on + +namespace FlatteningUtils { + +class RemovedIntState : public ::FlatteningUtils::RemovedState { +public: + // prevent constructor by default + RemovedIntState& operator=(RemovedIntState const&); + RemovedIntState(RemovedIntState const&); + RemovedIntState(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1RemovedIntState@FlatteningUtils@@UEAA@XZ + virtual ~RemovedIntState() = default; + + // vIndex: 1, symbol: ?addValue@RemovedIntState@FlatteningUtils@@UEAAXAEBVCompoundTag@@@Z + virtual void addValue(class CompoundTag const&); + + // vIndex: 2, symbol: ?match@RemovedIntState@FlatteningUtils@@UEBAXAEAVCompoundTagUpdaterNodeBuilder@@_K@Z + virtual void match(class CompoundTagUpdaterNodeBuilder&, uint64) const; + + // vIndex: 3, symbol: ?valueCount@RemovedIntState@FlatteningUtils@@UEBA_KXZ + virtual uint64 valueCount() const; + + // NOLINTEND +}; + +}; // namespace FlatteningUtils diff --git a/src/mc/util/RemovedState.h b/src/mc/util/RemovedState.h new file mode 100644 index 0000000000..f0c775484a --- /dev/null +++ b/src/mc/util/RemovedState.h @@ -0,0 +1,37 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class CompoundTag; +class CompoundTagUpdaterNodeBuilder; +// clang-format on + +namespace FlatteningUtils { + +class RemovedState { +public: + // prevent constructor by default + RemovedState& operator=(RemovedState const&); + RemovedState(RemovedState const&); + RemovedState(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: ??1RemovedState@FlatteningUtils@@UEAA@XZ + virtual ~RemovedState(); + + // vIndex: 1, symbol: ?addValue@RemovedIntState@FlatteningUtils@@UEAAXAEBVCompoundTag@@@Z + virtual void addValue(class CompoundTag const&) = 0; + + // vIndex: 2, symbol: ?match@RemovedIntState@FlatteningUtils@@UEBAXAEAVCompoundTagUpdaterNodeBuilder@@_K@Z + virtual void match(class CompoundTagUpdaterNodeBuilder&, uint64) const = 0; + + // vIndex: 3, symbol: ?valueCount@RemovedIntState@FlatteningUtils@@UEBA_KXZ + virtual uint64 valueCount() const = 0; + + // NOLINTEND +}; + +}; // namespace FlatteningUtils diff --git a/src/mc/util/RemovedStringState.h b/src/mc/util/RemovedStringState.h new file mode 100644 index 0000000000..a13bb13c17 --- /dev/null +++ b/src/mc/util/RemovedStringState.h @@ -0,0 +1,41 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/util/RemovedState.h" + +// auto generated forward declare list +// clang-format off +class CompoundTag; +class CompoundTagUpdaterNodeBuilder; +namespace FlatteningUtils { class RemovedState; } +// clang-format on + +namespace FlatteningUtils { + +class RemovedStringState : public ::FlatteningUtils::RemovedState { +public: + // prevent constructor by default + RemovedStringState& operator=(RemovedStringState const&); + RemovedStringState(RemovedStringState const&); + RemovedStringState(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1RemovedStringState@FlatteningUtils@@UEAA@XZ + virtual ~RemovedStringState() = default; + + // vIndex: 1, symbol: ?addValue@RemovedStringState@FlatteningUtils@@UEAAXAEBVCompoundTag@@@Z + virtual void addValue(class CompoundTag const&); + + // vIndex: 2, symbol: ?match@RemovedStringState@FlatteningUtils@@UEBAXAEAVCompoundTagUpdaterNodeBuilder@@_K@Z + virtual void match(class CompoundTagUpdaterNodeBuilder&, uint64) const; + + // vIndex: 3, symbol: ?valueCount@RemovedStringState@FlatteningUtils@@UEBA_KXZ + virtual uint64 valueCount() const; + + // NOLINTEND +}; + +}; // namespace FlatteningUtils diff --git a/src/mc/util/ShulkerBox.h b/src/mc/util/ShulkerBox.h new file mode 100644 index 0000000000..bb83e07c27 --- /dev/null +++ b/src/mc/util/ShulkerBox.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::ShulkerBox { +// NOLINTBEGIN +// symbol: ?get@ShulkerBox@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::ShulkerBox diff --git a/src/mc/util/StainedGlass.h b/src/mc/util/StainedGlass.h new file mode 100644 index 0000000000..e853f6a770 --- /dev/null +++ b/src/mc/util/StainedGlass.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::StainedGlass { +// NOLINTBEGIN +// symbol: ?get@StainedGlass@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::StainedGlass diff --git a/src/mc/util/StainedGlassPane.h b/src/mc/util/StainedGlassPane.h new file mode 100644 index 0000000000..d98174a6dc --- /dev/null +++ b/src/mc/util/StainedGlassPane.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::StainedGlassPane { +// NOLINTBEGIN +// symbol: ?get@StainedGlassPane@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::StainedGlassPane diff --git a/src/mc/util/Stone.h b/src/mc/util/Stone.h new file mode 100644 index 0000000000..857d180353 --- /dev/null +++ b/src/mc/util/Stone.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Stone { +// NOLINTBEGIN +// symbol: ?get@Stone@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::Stone diff --git a/src/mc/util/StringByteInput.h b/src/mc/util/StringByteInput.h index f234ab1137..f70f3ca27b 100644 --- a/src/mc/util/StringByteInput.h +++ b/src/mc/util/StringByteInput.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/util/BytesDataInput.h" class StringByteInput : public ::BytesDataInput { @@ -19,8 +20,8 @@ class StringByteInput : public ::BytesDataInput { // vIndex: 0, symbol: ??1StringByteInput@@UEAA@XZ virtual ~StringByteInput(); - // vIndex: 9, symbol: ?readBytes@StringByteInput@@UEAA_NPEAX_K@Z - virtual bool readBytes(void* data, uint64 bytes); + // vIndex: 9, symbol: ?readBytesResult@StringByteInput@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@PEAX_K@Z + virtual class Bedrock::Result readBytesResult(void*, uint64); // vIndex: 10, symbol: ?numBytesLeft@StringByteInput@@UEBA_KXZ virtual uint64 numBytesLeft() const; diff --git a/src/mc/util/Terracotta.h b/src/mc/util/Terracotta.h new file mode 100644 index 0000000000..18d5ee21ff --- /dev/null +++ b/src/mc/util/Terracotta.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Terracotta { +// NOLINTBEGIN +// symbol: ?get@Terracotta@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::Terracotta diff --git a/src/mc/util/VarIntDataInput.h b/src/mc/util/VarIntDataInput.h index 87c15fed62..1216194800 100644 --- a/src/mc/util/VarIntDataInput.h +++ b/src/mc/util/VarIntDataInput.h @@ -4,6 +4,7 @@ #include "mc/deps/core/utility/ReadOnlyBinaryStream.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" #include "mc/util/BytesDataInput.h" class VarIntDataInput : public ::BytesDataInput { @@ -20,33 +21,33 @@ class VarIntDataInput : public ::BytesDataInput { virtual ~VarIntDataInput(); // vIndex: 1, symbol: - // ?readString@VarIntDataInput@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - virtual std::string readString(); + // ?readStringResult@VarIntDataInput@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@XZ + virtual class Bedrock::Result readStringResult(); // vIndex: 2, symbol: - // ?readLongString@VarIntDataInput@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - virtual std::string readLongString(); + // ?readLongStringResult@VarIntDataInput@@UEAA?AV?$Result@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@Verror_code@2@@Bedrock@@XZ + virtual class Bedrock::Result readLongStringResult(); - // vIndex: 3, symbol: ?readFloat@VarIntDataInput@@UEAAMXZ - virtual float readFloat(); + // vIndex: 3, symbol: ?readFloatResult@VarIntDataInput@@UEAA?AV?$Result@MVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readFloatResult(); - // vIndex: 4, symbol: ?readDouble@VarIntDataInput@@UEAANXZ - virtual double readDouble(); + // vIndex: 4, symbol: ?readDoubleResult@VarIntDataInput@@UEAA?AV?$Result@NVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readDoubleResult(); - // vIndex: 5, symbol: ?readByte@VarIntDataInput@@UEAADXZ - virtual char readByte(); + // vIndex: 5, symbol: ?readByteResult@VarIntDataInput@@UEAA?AV?$Result@EVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readByteResult(); - // vIndex: 6, symbol: ?readShort@VarIntDataInput@@UEAAFXZ - virtual short readShort(); + // vIndex: 6, symbol: ?readShortResult@VarIntDataInput@@UEAA?AV?$Result@FVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readShortResult(); - // vIndex: 7, symbol: ?readInt@VarIntDataInput@@UEAAHXZ - virtual int readInt(); + // vIndex: 7, symbol: ?readIntResult@VarIntDataInput@@UEAA?AV?$Result@HVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readIntResult(); - // vIndex: 8, symbol: ?readLongLong@VarIntDataInput@@UEAA_JXZ - virtual int64 readLongLong(); + // vIndex: 8, symbol: ?readLongLongResult@VarIntDataInput@@UEAA?AV?$Result@_JVerror_code@std@@@Bedrock@@XZ + virtual class Bedrock::Result readLongLongResult(); - // vIndex: 9, symbol: ?readBytes@VarIntDataInput@@UEAA_NPEAX_K@Z - virtual bool readBytes(void* data, uint64 bytes); + // vIndex: 9, symbol: ?readBytesResult@VarIntDataInput@@UEAA?AV?$Result@XVerror_code@std@@@Bedrock@@PEAX_K@Z + virtual class Bedrock::Result readBytesResult(void*, uint64); // vIndex: 10, symbol: ?numBytesLeft@VarIntDataInput@@UEBA_KXZ virtual uint64 numBytesLeft() const; diff --git a/src/mc/util/Wood.h b/src/mc/util/Wood.h new file mode 100644 index 0000000000..9e1cb1ac36 --- /dev/null +++ b/src/mc/util/Wood.h @@ -0,0 +1,32 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/enums/WoodType.h" +#include "mc/world/level/block/BlockLegacy.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Wood { +// NOLINTBEGIN +// symbol: ?get@Wood@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getComplexAliasCallback@Wood@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getComplexAliasCallback(); + +// symbol: +// ?getStrippedSplitStates@Wood@FlatteningUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@W4WoodType@@@Z +MCAPI std::vector getStrippedSplitStates(::WoodType); + +// symbol: +// ?getWoodTypeSplitStates@Wood@FlatteningUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@_N@Z +MCAPI std::vector getWoodTypeSplitStates(bool); +// NOLINTEND + +}; // namespace FlatteningUtils::Wood diff --git a/src/mc/util/WoodenDoubleSlab.h b/src/mc/util/WoodenDoubleSlab.h new file mode 100644 index 0000000000..ef9166cef6 --- /dev/null +++ b/src/mc/util/WoodenDoubleSlab.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::WoodenDoubleSlab { +// NOLINTBEGIN +// symbol: ?get@WoodenDoubleSlab@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getComplexAliasCallback@WoodenDoubleSlab@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getComplexAliasCallback(); +// NOLINTEND + +}; // namespace FlatteningUtils::WoodenDoubleSlab diff --git a/src/mc/util/WoodenSlab.h b/src/mc/util/WoodenSlab.h new file mode 100644 index 0000000000..9f0ce1ebd2 --- /dev/null +++ b/src/mc/util/WoodenSlab.h @@ -0,0 +1,20 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Block; +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::WoodenSlab { +// NOLINTBEGIN +// symbol: ?get@WoodenSlab@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); + +// symbol: ?getComplexAliasCallback@WoodenSlab@FlatteningUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ +MCAPI std::function getComplexAliasCallback(); +// NOLINTEND + +}; // namespace FlatteningUtils::WoodenSlab diff --git a/src/mc/util/Wool.h b/src/mc/util/Wool.h new file mode 100644 index 0000000000..ad497a88c7 --- /dev/null +++ b/src/mc/util/Wool.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +namespace FlatteningUtils { struct Instance; } +// clang-format on + +namespace FlatteningUtils::Wool { +// NOLINTBEGIN +// symbol: ?get@Wool@FlatteningUtils@@YA?AUInstance@2@XZ +MCAPI struct FlatteningUtils::Instance get(); +// NOLINTEND + +}; // namespace FlatteningUtils::Wool diff --git a/src/mc/util/molang/MolangActorIdArrayPtr.h b/src/mc/util/molang/MolangActorIdArrayPtr.h index 1f4e760581..577b31da4d 100644 --- a/src/mc/util/molang/MolangActorIdArrayPtr.h +++ b/src/mc/util/molang/MolangActorIdArrayPtr.h @@ -9,9 +9,6 @@ struct MolangActorIdArrayPtr { public: // NOLINTBEGIN - // symbol: ??0MolangActorIdArrayPtr@@QEAA@V?$vector@UActorUniqueID@@V?$allocator@UActorUniqueID@@@std@@@std@@@Z - MCAPI explicit MolangActorIdArrayPtr(std::vector actorIds); - // symbol: ??1MolangActorIdArrayPtr@@QEAA@XZ MCAPI ~MolangActorIdArrayPtr(); diff --git a/src/mc/world/Minecraft.h b/src/mc/world/Minecraft.h index 8033774e30..5ce2cdd584 100644 --- a/src/mc/world/Minecraft.h +++ b/src/mc/world/Minecraft.h @@ -141,9 +141,6 @@ class Minecraft : public ::IEntityRegistryOwner { // symbol: ?update@Minecraft@@QEAA_NXZ MCAPI bool update(); - // symbol: ?_tryCatchupMovementTicks@Minecraft@@SAXAEAVEntitySystems@@AEAVEntityRegistry@@@Z - MCAPI static void _tryCatchupMovementTicks(class EntitySystems&, class EntityRegistry& registry); - // NOLINTEND // private: diff --git a/src/mc/world/VanillaWorldSystems.h b/src/mc/world/VanillaWorldSystems.h index 4c9c6614db..da363c70c6 100644 --- a/src/mc/world/VanillaWorldSystems.h +++ b/src/mc/world/VanillaWorldSystems.h @@ -13,12 +13,11 @@ namespace VanillaWorldSystems { class Impl; } namespace VanillaWorldSystems { // NOLINTBEGIN // symbol: -// ?init@VanillaWorldSystems@@YA?AV?$shared_ptr@VImpl@VanillaWorldSystems@@@std@@AEBV?$NonOwnerPointer@VLevel@@@Bedrock@@AEBVExperiments@@AEBVBaseGameVersion@@PEAVResourcePackManager@@VItemRegistryRef@@@Z +// ?init@VanillaWorldSystems@@YA?AV?$shared_ptr@VImpl@VanillaWorldSystems@@@std@@AEBV?$NonOwnerPointer@VLevel@@@Bedrock@@AEBVExperiments@@AEBVBaseGameVersion@@VItemRegistryRef@@@Z MCAPI std::shared_ptr init( - class Bedrock::NonOwnerPointer const& level, + class Bedrock::NonOwnerPointer const&, class Experiments const&, - class BaseGameVersion const& baseGameVersion, - class ResourcePackManager* rpm, + class BaseGameVersion const&, class ItemRegistryRef ); // NOLINTEND diff --git a/src/mc/world/actor/Actor.h b/src/mc/world/actor/Actor.h index c83321f258..713badcf86 100644 --- a/src/mc/world/actor/Actor.h +++ b/src/mc/world/actor/Actor.h @@ -178,431 +178,413 @@ class Actor : public ::ActorStatusProvider { // vIndex: 22, symbol: ?isFireImmune@Actor@@UEBA_NXZ virtual bool isFireImmune() const; - // vIndex: 23, symbol: ?breaksFallingBlocks@Actor@@UEBA_NXZ - virtual bool breaksFallingBlocks() const; - - // vIndex: 24, symbol: ?blockedByShield@Actor@@UEAAXAEBVActorDamageSource@@AEAV1@@Z + // vIndex: 23, symbol: ?blockedByShield@Actor@@UEAAXAEBVActorDamageSource@@AEAV1@@Z virtual void blockedByShield(class ActorDamageSource const& source, class Actor& blocker); - // vIndex: 25, symbol: ?canDisableShield@Actor@@UEAA_NXZ + // vIndex: 24, symbol: ?canDisableShield@Actor@@UEAA_NXZ virtual bool canDisableShield(); - // vIndex: 26, symbol: ?teleportTo@Actor@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@Actor@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int entityType, bool); - // vIndex: 27, symbol: ?lerpMotion@Actor@@UEAAXAEBVVec3@@@Z + // vIndex: 26, symbol: ?lerpMotion@Actor@@UEAAXAEBVVec3@@@Z virtual void lerpMotion(class Vec3 const& delta); - // vIndex: 28, symbol: + // vIndex: 27, symbol: // ?tryCreateAddActorPacket@Actor@@UEAA?AV?$unique_ptr@VAddActorBasePacket@@U?$default_delete@VAddActorBasePacket@@@std@@@std@@XZ virtual std::unique_ptr tryCreateAddActorPacket(); - // vIndex: 29, symbol: ?normalTick@Actor@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Actor@@UEAAXXZ virtual void normalTick(); - // vIndex: 30, symbol: ?baseTick@Actor@@UEAAXXZ + // vIndex: 29, symbol: ?baseTick@Actor@@UEAAXXZ virtual void baseTick(); - // vIndex: 31, symbol: ?passengerTick@Actor@@UEAAXXZ + // vIndex: 30, symbol: ?passengerTick@Actor@@UEAAXXZ virtual void passengerTick(); - // vIndex: 32, symbol: ?startRiding@Actor@@UEAA_NAEAV1@@Z + // vIndex: 31, symbol: ?startRiding@Actor@@UEAA_NAEAV1@@Z virtual bool startRiding(class Actor&); - // vIndex: 33, symbol: ?addPassenger@Actor@@UEAAXAEAV1@@Z + // vIndex: 32, symbol: ?addPassenger@Actor@@UEAAXAEAV1@@Z virtual void addPassenger(class Actor&); - // vIndex: 34, symbol: + // vIndex: 33, symbol: // ?getExitTip@Actor@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV23@W4InputMode@@W4NewInteractionModel@@@Z virtual std::string getExitTip(std::string const& kind, ::InputMode mode, ::NewInteractionModel) const; - // vIndex: 35, symbol: + // vIndex: 34, symbol: // ?getEntityLocNameString@Actor@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getEntityLocNameString() const; - // vIndex: 36, symbol: ?isInWall@Actor@@UEBA_NXZ + // vIndex: 35, symbol: ?isInWall@Actor@@UEBA_NXZ virtual bool isInWall() const; - // vIndex: 37, symbol: ?isInvisible@Actor@@UEBA_NXZ + // vIndex: 36, symbol: ?isInvisible@Actor@@UEBA_NXZ virtual bool isInvisible() const; - // vIndex: 38, symbol: ?canShowNameTag@Actor@@UEBA_NXZ + // vIndex: 37, symbol: ?canShowNameTag@Actor@@UEBA_NXZ virtual bool canShowNameTag() const; - // vIndex: 39, symbol: + // vIndex: 38, symbol: // ?getFormattedNameTag@Actor@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getFormattedNameTag() const; - // vIndex: 40, symbol: ?getNameTagTextColor@Actor@@UEBA?AVColor@mce@@XZ + // vIndex: 39, symbol: ?getNameTagTextColor@Actor@@UEBA?AVColor@mce@@XZ virtual class mce::Color getNameTagTextColor() const; - // vIndex: 41, symbol: ?getShadowRadius@Actor@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Actor@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 42, symbol: ?getHeadLookVector@Actor@@UEBA?AVVec3@@M@Z + // vIndex: 41, symbol: ?getHeadLookVector@Actor@@UEBA?AVVec3@@M@Z virtual class Vec3 getHeadLookVector(float lerpFactor = 0.0f) const; - // vIndex: 43, symbol: ?canInteractWithOtherEntitiesInGame@Actor@@UEBA_NXZ + // vIndex: 42, symbol: ?canInteractWithOtherEntitiesInGame@Actor@@UEBA_NXZ virtual bool canInteractWithOtherEntitiesInGame() const; - // vIndex: 44, symbol: ?getBrightness@Actor@@UEBAMMAEBVIConstBlockSource@@@Z + // vIndex: 43, symbol: ?getBrightness@Actor@@UEBAMMAEBVIConstBlockSource@@@Z virtual float getBrightness(float a, class IConstBlockSource const& region) const; - // vIndex: 45, symbol: ?playerTouch@Actor@@UEAAXAEAVPlayer@@@Z + // vIndex: 44, symbol: ?playerTouch@Actor@@UEAAXAEAVPlayer@@@Z virtual void playerTouch(class Player& player); - // vIndex: 46, symbol: ?isImmobile@Actor@@UEBA_NXZ + // vIndex: 45, symbol: ?isImmobile@Actor@@UEBA_NXZ virtual bool isImmobile() const; - // vIndex: 47, symbol: ?isSilentObserver@Actor@@UEBA_NXZ + // vIndex: 46, symbol: ?isSilentObserver@Actor@@UEBA_NXZ virtual bool isSilentObserver() const; - // vIndex: 48, symbol: ?isPickable@Actor@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Actor@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 49, symbol: ?isSleeping@Actor@@UEBA_NXZ + // vIndex: 48, symbol: ?isSleeping@Actor@@UEBA_NXZ virtual bool isSleeping() const; - // vIndex: 50, symbol: ?setSleeping@Actor@@UEAAX_N@Z + // vIndex: 49, symbol: ?setSleeping@Actor@@UEAAX_N@Z virtual void setSleeping(bool val); - // vIndex: 51, symbol: ?setSneaking@Actor@@UEAAX_N@Z + // vIndex: 50, symbol: ?setSneaking@Actor@@UEAAX_N@Z virtual void setSneaking(bool value); - // vIndex: 52, symbol: ?isBlocking@Actor@@UEBA_NXZ + // vIndex: 51, symbol: ?isBlocking@Actor@@UEBA_NXZ virtual bool isBlocking() const; - // vIndex: 53, symbol: ?isDamageBlocked@Actor@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 52, symbol: ?isDamageBlocked@Actor@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isDamageBlocked(class ActorDamageSource const& source) const; - // vIndex: 54, symbol: ?isAlive@Actor@@UEBA_NXZ + // vIndex: 53, symbol: ?isAlive@Actor@@UEBA_NXZ virtual bool isAlive() const; - // vIndex: 55, symbol: ?isOnFire@Actor@@UEBA_NXZ + // vIndex: 54, symbol: ?isOnFire@Actor@@UEBA_NXZ virtual bool isOnFire() const; - // vIndex: 56, symbol: ?isSurfaceMob@Actor@@UEBA_NXZ + // vIndex: 55, symbol: ?isSurfaceMob@Actor@@UEBA_NXZ virtual bool isSurfaceMob() const; - // vIndex: 57, symbol: ?isTargetable@Actor@@UEBA_NXZ + // vIndex: 56, symbol: ?isTargetable@Actor@@UEBA_NXZ virtual bool isTargetable() const; - // vIndex: 58, symbol: ?isLocalPlayer@Actor@@UEBA_NXZ + // vIndex: 57, symbol: ?isLocalPlayer@Actor@@UEBA_NXZ virtual bool isLocalPlayer() const; - // vIndex: 59, symbol: ?isPlayer@Actor@@UEBA_NXZ + // vIndex: 58, symbol: ?isPlayer@Actor@@UEBA_NXZ virtual bool isPlayer() const; - // vIndex: 60, symbol: ?canAttack@Actor@@UEBA_NPEAV1@_N@Z + // vIndex: 59, symbol: ?canAttack@Actor@@UEBA_NPEAV1@_N@Z virtual bool canAttack(class Actor* entity, bool allowInvulnerable) const; - // vIndex: 61, symbol: ?setTarget@Actor@@UEAAXPEAV1@@Z + // vIndex: 60, symbol: ?setTarget@Actor@@UEAAXPEAV1@@Z virtual void setTarget(class Actor* entity); - // vIndex: 62, symbol: ?isValidTarget@Actor@@UEBA_NPEAV1@@Z + // vIndex: 61, symbol: ?isValidTarget@Actor@@UEBA_NPEAV1@@Z virtual bool isValidTarget(class Actor* attacker) const; - // vIndex: 63, symbol: ?attack@Actor@@UEAA_NAEAV1@AEBW4ActorDamageCause@@@Z + // vIndex: 62, symbol: ?attack@Actor@@UEAA_NAEAV1@AEBW4ActorDamageCause@@@Z virtual bool attack(class Actor& target, ::ActorDamageCause const& cause); - // vIndex: 64, symbol: ?performRangedAttack@Actor@@UEAAXAEAV1@M@Z + // vIndex: 63, symbol: ?performRangedAttack@Actor@@UEAAXAEAV1@M@Z virtual void performRangedAttack(class Actor& target, float power); - // vIndex: 65, symbol: ?setOwner@Actor@@UEAAXUActorUniqueID@@@Z + // vIndex: 64, symbol: ?setOwner@Actor@@UEAAXUActorUniqueID@@@Z virtual void setOwner(struct ActorUniqueID ownerId); - // vIndex: 66, symbol: ?setSitting@Actor@@UEAAX_N@Z + // vIndex: 65, symbol: ?setSitting@Actor@@UEAAX_N@Z virtual void setSitting(bool value); - // vIndex: 67, symbol: ?onTame@Actor@@UEAAXXZ + // vIndex: 66, symbol: ?onTame@Actor@@UEAAXXZ virtual void onTame(); - // vIndex: 68, symbol: ?onFailedTame@Actor@@UEAAXXZ + // vIndex: 67, symbol: ?onFailedTame@Actor@@UEAAXXZ virtual void onFailedTame(); - // vIndex: 69, symbol: ?setStanding@Actor@@UEAAX_N@Z + // vIndex: 68, symbol: ?setStanding@Actor@@UEAAX_N@Z virtual void setStanding(bool value); - // vIndex: 70, symbol: ?canPowerJump@Actor@@UEBA_NXZ + // vIndex: 69, symbol: ?canPowerJump@Actor@@UEBA_NXZ virtual bool canPowerJump() const; - // vIndex: 71, symbol: ?isEnchanted@Actor@@UEBA_NXZ + // vIndex: 70, symbol: ?isEnchanted@Actor@@UEBA_NXZ virtual bool isEnchanted() const; - // vIndex: 72, symbol: ?shouldRender@Actor@@UEBA_NXZ + // vIndex: 71, symbol: ?shouldRender@Actor@@UEBA_NXZ virtual bool shouldRender() const; - // vIndex: 73, symbol: ?playAmbientSound@Actor@@UEAAXXZ + // vIndex: 72, symbol: ?playAmbientSound@Actor@@UEAAXXZ virtual void playAmbientSound(); - // vIndex: 74, symbol: ?getAmbientSound@Actor@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@Actor@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; - // vIndex: 75, symbol: ?isInvulnerableTo@Actor@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Actor@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 76, symbol: ?getBlockDamageCause@Actor@@UEBA?AW4ActorDamageCause@@AEBVBlock@@@Z + // vIndex: 75, symbol: ?getBlockDamageCause@Actor@@UEBA?AW4ActorDamageCause@@AEBVBlock@@@Z virtual ::ActorDamageCause getBlockDamageCause(class Block const& block) const; - // vIndex: 77, symbol: ?doFireHurt@Actor@@UEAA_NH@Z + // vIndex: 76, symbol: ?doFireHurt@Actor@@UEAA_NH@Z virtual bool doFireHurt(int amount); - // vIndex: 78, symbol: ?onLightningHit@Actor@@UEAAXXZ + // vIndex: 77, symbol: ?onLightningHit@Actor@@UEAAXXZ virtual void onLightningHit(); - // vIndex: 79, symbol: ?feed@Actor@@UEAAXH@Z + // vIndex: 78, symbol: ?feed@Actor@@UEAAXH@Z virtual void feed(int itemId); - // vIndex: 80, symbol: ?handleEntityEvent@Actor@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Actor@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent eventId, int data); - // vIndex: 81, symbol: ?getPickRadius@Actor@@UEAAMXZ + // vIndex: 80, symbol: ?getPickRadius@Actor@@UEAAMXZ virtual float getPickRadius(); - // vIndex: 82, symbol: ?getActorRendererId@Actor@@UEBAAEBVHashedString@@XZ + // vIndex: 81, symbol: ?getActorRendererId@Actor@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getActorRendererId() const; - // vIndex: 83, symbol: ?despawn@Actor@@UEAAXXZ + // vIndex: 82, symbol: ?despawn@Actor@@UEAAXXZ virtual void despawn(); - // vIndex: 84, symbol: ?setArmor@Actor@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z + // vIndex: 83, symbol: ?setArmor@Actor@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z virtual void setArmor(::ArmorSlot slot, class ItemStack const& item); - // vIndex: 85, symbol: ?getArmorMaterialTypeInSlot@Actor@@UEBA?AW4ArmorMaterialType@@W4ArmorSlot@@@Z + // vIndex: 84, symbol: ?getArmorMaterialTypeInSlot@Actor@@UEBA?AW4ArmorMaterialType@@W4ArmorSlot@@@Z virtual ::ArmorMaterialType getArmorMaterialTypeInSlot(::ArmorSlot) const; - // vIndex: 86, symbol: ?getArmorMaterialTextureTypeInSlot@Actor@@UEBA?AW4ArmorTextureType@@W4ArmorSlot@@@Z + // vIndex: 85, symbol: ?getArmorMaterialTextureTypeInSlot@Actor@@UEBA?AW4ArmorTextureType@@W4ArmorSlot@@@Z virtual ::ArmorTextureType getArmorMaterialTextureTypeInSlot(::ArmorSlot) const; - // vIndex: 87, symbol: ?getArmorColorInSlot@Actor@@UEBAMW4ArmorSlot@@H@Z + // vIndex: 86, symbol: ?getArmorColorInSlot@Actor@@UEBAMW4ArmorSlot@@H@Z virtual float getArmorColorInSlot(::ArmorSlot, int) const; - // vIndex: 88, symbol: ?setEquippedSlot@Actor@@UEAAXW4EquipmentSlot@Legacy@Puv@@AEBVItemStack@@@Z + // vIndex: 87, symbol: ?setEquippedSlot@Actor@@UEAAXW4EquipmentSlot@Legacy@Puv@@AEBVItemStack@@@Z virtual void setEquippedSlot(::Puv::Legacy::EquipmentSlot, class ItemStack const&); - // vIndex: 89, symbol: ?setCarriedItem@Actor@@UEAAXAEBVItemStack@@@Z + // vIndex: 88, symbol: ?setCarriedItem@Actor@@UEAAXAEBVItemStack@@@Z virtual void setCarriedItem(class ItemStack const& item); - // vIndex: 90, symbol: ?getCarriedItem@Actor@@UEBAAEBVItemStack@@XZ + // vIndex: 89, symbol: ?getCarriedItem@Actor@@UEBAAEBVItemStack@@XZ virtual class ItemStack const& getCarriedItem() const; - // vIndex: 91, symbol: ?setOffhandSlot@Actor@@UEAAXAEBVItemStack@@@Z + // vIndex: 90, symbol: ?setOffhandSlot@Actor@@UEAAXAEBVItemStack@@@Z virtual void setOffhandSlot(class ItemStack const& item); - // vIndex: 92, symbol: ?getEquippedTotem@Actor@@UEBAAEBVItemStack@@XZ + // vIndex: 91, symbol: ?getEquippedTotem@Actor@@UEBAAEBVItemStack@@XZ virtual class ItemStack const& getEquippedTotem() const; - // vIndex: 93, symbol: ?consumeTotem@Actor@@UEAA_NXZ + // vIndex: 92, symbol: ?consumeTotem@Actor@@UEAA_NXZ virtual bool consumeTotem(); - // vIndex: 94, symbol: ?save@Actor@@UEBA_NAEAVCompoundTag@@@Z + // vIndex: 93, symbol: ?save@Actor@@UEBA_NAEAVCompoundTag@@@Z virtual bool save(class CompoundTag& entityTag) const; - // vIndex: 95, symbol: ?load@Actor@@UEAA_NAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 94, symbol: ?load@Actor@@UEAA_NAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual bool load(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper = ::ll::defaultDataLoadHelper); - // vIndex: 96, symbol: ?queryEntityRenderer@Actor@@UEBAAEBVHashedString@@XZ + // vIndex: 95, symbol: ?queryEntityRenderer@Actor@@UEBAAEBVHashedString@@XZ virtual class HashedString const& queryEntityRenderer() const; - // vIndex: 97, symbol: ?getSourceUniqueID@Actor@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@Actor@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 98, symbol: ?canFreeze@Actor@@UEBA_NXZ + // vIndex: 97, symbol: ?canFreeze@Actor@@UEBA_NXZ virtual bool canFreeze() const; - // vIndex: 99, symbol: ?getLiquidAABB@Actor@@UEBA?AVAABB@@W4MaterialType@@@Z + // vIndex: 98, symbol: ?getLiquidAABB@Actor@@UEBA?AVAABB@@W4MaterialType@@@Z virtual class AABB getLiquidAABB(::MaterialType liquidType) const; - // vIndex: 100, symbol: ?handleInsidePortal@Actor@@UEAAXAEBVBlockPos@@@Z + // vIndex: 99, symbol: ?handleInsidePortal@Actor@@UEAAXAEBVBlockPos@@@Z virtual void handleInsidePortal(class BlockPos const& portalPos); - // vIndex: 101, symbol: ?getPortalCooldown@Actor@@UEBAHXZ - virtual int getPortalCooldown() const; - - // vIndex: 102, symbol: ?getPortalWaitTime@Actor@@UEBAHXZ - virtual int getPortalWaitTime() const; - - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@Actor@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@Actor@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 104, symbol: ?changeDimension@Actor@@UEAAXV?$AutomaticID@VDimension@@H@@@Z + // vIndex: 101, symbol: ?changeDimension@Actor@@UEAAXV?$AutomaticID@VDimension@@H@@@Z virtual void changeDimension(DimensionType toId); - // vIndex: 105, symbol: ?changeDimension@Actor@@UEAAXAEBVChangeDimensionPacket@@@Z + // vIndex: 102, symbol: ?changeDimension@Actor@@UEAAXAEBVChangeDimensionPacket@@@Z virtual void changeDimension(class ChangeDimensionPacket const& packet); - // vIndex: 106, symbol: ?getControllingPlayer@Actor@@UEBA?AUActorUniqueID@@XZ + // vIndex: 103, symbol: ?getControllingPlayer@Actor@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getControllingPlayer() const; - // vIndex: 107, symbol: ?checkFallDamage@Actor@@UEAAXM_N0@Z - virtual void checkFallDamage(float, bool, bool); - - // vIndex: 108, symbol: ?causeFallDamageToActor@Actor@@UEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@Actor@@UEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 109, symbol: ?onSynchedDataUpdate@Actor@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Actor@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 110, symbol: ?canAddPassenger@Actor@@UEBA_NAEAV1@@Z + // vIndex: 106, symbol: ?canAddPassenger@Actor@@UEBA_NAEAV1@@Z virtual bool canAddPassenger(class Actor&) const; - // vIndex: 111, symbol: ?canPickupItem@Actor@@UEBA_NAEBVItemStack@@@Z + // vIndex: 107, symbol: ?canPickupItem@Actor@@UEBA_NAEBVItemStack@@@Z virtual bool canPickupItem(class ItemStack const& item) const; - // vIndex: 112, symbol: ?canBePulledIntoVehicle@Actor@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@Actor@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 113, symbol: ?inCaravan@Actor@@UEBA_NXZ + // vIndex: 109, symbol: ?inCaravan@Actor@@UEBA_NXZ virtual bool inCaravan() const; - // vIndex: 114, symbol: ?sendMotionPacketIfNeeded@Actor@@UEAAXAEBUPlayerMovementSettings@@@Z + // vIndex: 110, symbol: ?sendMotionPacketIfNeeded@Actor@@UEAAXAEBUPlayerMovementSettings@@@Z virtual void sendMotionPacketIfNeeded(struct PlayerMovementSettings const&); - // vIndex: 115, symbol: ?canSynchronizeNewEntity@Actor@@UEBA_NXZ + // vIndex: 111, symbol: ?canSynchronizeNewEntity@Actor@@UEBA_NXZ virtual bool canSynchronizeNewEntity() const; - // vIndex: 116, symbol: ?startSwimming@Actor@@UEAAXXZ + // vIndex: 112, symbol: ?startSwimming@Actor@@UEAAXXZ virtual void startSwimming(); - // vIndex: 117, symbol: ?stopSwimming@Actor@@UEAAXXZ + // vIndex: 113, symbol: ?stopSwimming@Actor@@UEAAXXZ virtual void stopSwimming(); - // vIndex: 118, symbol: + // vIndex: 114, symbol: // ?buildDebugInfo@Actor@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void buildDebugInfo(std::string& out) const; - // vIndex: 119, symbol: ?getCommandPermissionLevel@Actor@@UEBA?AW4CommandPermissionLevel@@XZ + // vIndex: 115, symbol: ?getCommandPermissionLevel@Actor@@UEBA?AW4CommandPermissionLevel@@XZ virtual ::CommandPermissionLevel getCommandPermissionLevel() const; - // vIndex: 120, symbol: ?getDeathTime@Actor@@UEBAHXZ + // vIndex: 116, symbol: ?getDeathTime@Actor@@UEBAHXZ virtual int getDeathTime() const; - // vIndex: 121, symbol: ?canBeAffected@Actor@@UEBA_NI@Z + // vIndex: 117, symbol: ?canBeAffected@Actor@@UEBA_NI@Z virtual bool canBeAffected(uint id) const; - // vIndex: 122, symbol: ?canBeAffectedByArrow@Actor@@UEBA_NAEBVMobEffectInstance@@@Z + // vIndex: 118, symbol: ?canBeAffectedByArrow@Actor@@UEBA_NAEBVMobEffectInstance@@@Z virtual bool canBeAffectedByArrow(class MobEffectInstance const& effect) const; - // vIndex: 123, symbol: ?onEffectAdded@Actor@@UEAAXAEAVMobEffectInstance@@@Z - virtual void onEffectAdded(class MobEffectInstance& effect); - - // vIndex: 124, symbol: ?onEffectUpdated@Actor@@UEAAXAEAVMobEffectInstance@@@Z - virtual void onEffectUpdated(class MobEffectInstance& effect); - - // vIndex: 125, symbol: ?onEffectRemoved@Actor@@UEAAXAEAVMobEffectInstance@@@Z + // vIndex: 119, symbol: ?onEffectRemoved@Actor@@UEAAXAEAVMobEffectInstance@@@Z virtual void onEffectRemoved(class MobEffectInstance& effect); - // vIndex: 126, symbol: ?canObstructSpawningAndBlockPlacement@Actor@@UEBA_NXZ + // vIndex: 120, symbol: ?canObstructSpawningAndBlockPlacement@Actor@@UEBA_NXZ virtual bool canObstructSpawningAndBlockPlacement() const; - // vIndex: 127, symbol: ?getAnimationComponent@Actor@@UEAAAEAVAnimationComponent@@XZ + // vIndex: 121, symbol: ?getAnimationComponent@Actor@@UEAAAEAVAnimationComponent@@XZ virtual class AnimationComponent& getAnimationComponent(); - // vIndex: 128, symbol: ?openContainerComponent@Actor@@UEAAXAEAVPlayer@@@Z + // vIndex: 122, symbol: ?openContainerComponent@Actor@@UEAAXAEAVPlayer@@@Z virtual void openContainerComponent(class Player& player); - // vIndex: 129, symbol: ?swing@Actor@@UEAAXXZ + // vIndex: 123, symbol: ?swing@Actor@@UEAAXXZ virtual void swing(); - // vIndex: 130, symbol: ?useItem@Actor@@UEAAXAEAVItemStackBase@@W4ItemUseMethod@@_N@Z + // vIndex: 124, symbol: ?useItem@Actor@@UEAAXAEAVItemStackBase@@W4ItemUseMethod@@_N@Z virtual void useItem(class ItemStackBase& item, ::ItemUseMethod itemUseMethod, bool consumeItem); - // vIndex: 131, symbol: + // vIndex: 125, symbol: // ?getDebugText@Actor@@UEAAXAEAV?$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@@@Z virtual void getDebugText(std::vector& outputInfo); - // vIndex: 132, symbol: ?getMapDecorationRotation@Actor@@UEBAMXZ + // vIndex: 126, symbol: ?getMapDecorationRotation@Actor@@UEBAMXZ virtual float getMapDecorationRotation() const; - // vIndex: 133, symbol: ?getPassengerYRotation@Actor@@UEBAMAEBV1@@Z + // vIndex: 127, symbol: ?getPassengerYRotation@Actor@@UEBAMAEBV1@@Z virtual float getPassengerYRotation(class Actor const&) const; - // vIndex: 134, symbol: ?add@Actor@@UEAA_NAEAVItemStack@@@Z + // vIndex: 128, symbol: ?add@Actor@@UEAA_NAEAVItemStack@@@Z virtual bool add(class ItemStack& item); - // vIndex: 135, symbol: ?drop@Actor@@UEAA_NAEBVItemStack@@_N@Z + // vIndex: 129, symbol: ?drop@Actor@@UEAA_NAEBVItemStack@@_N@Z virtual bool drop(class ItemStack const& item, bool randomly); - // vIndex: 136, symbol: ?getInteraction@Actor@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z + // vIndex: 130, symbol: ?getInteraction@Actor@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z virtual bool getInteraction(class Player& player, class ActorInteraction& interaction, class Vec3 const& location); - // vIndex: 137, symbol: ?canDestroyBlock@Actor@@UEBA_NAEBVBlock@@@Z + // vIndex: 131, symbol: ?canDestroyBlock@Actor@@UEBA_NAEBVBlock@@@Z virtual bool canDestroyBlock(class Block const& block) const; - // vIndex: 138, symbol: ?setAuxValue@Actor@@UEAAXH@Z + // vIndex: 132, symbol: ?setAuxValue@Actor@@UEAAXH@Z virtual void setAuxValue(int val); - // vIndex: 139, symbol: ?startSpinAttack@Actor@@UEAAXXZ + // vIndex: 133, symbol: ?startSpinAttack@Actor@@UEAAXXZ virtual void startSpinAttack(); - // vIndex: 140, symbol: ?stopSpinAttack@Actor@@UEAAXXZ + // vIndex: 134, symbol: ?stopSpinAttack@Actor@@UEAAXXZ virtual void stopSpinAttack(); - // vIndex: 141, symbol: ?renderDebugServerState@Actor@@UEAAXAEBVOptions@@@Z + // vIndex: 135, symbol: ?renderDebugServerState@Actor@@UEAAXAEBVOptions@@@Z virtual void renderDebugServerState(class Options const& options); - // vIndex: 142, symbol: ?kill@Actor@@UEAAXXZ + // vIndex: 136, symbol: ?kill@Actor@@UEAAXXZ virtual void kill(); - // vIndex: 143, symbol: ?die@Actor@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Actor@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 144, symbol: ?shouldDropDeathLoot@Actor@@UEBA_NXZ + // vIndex: 138, symbol: ?shouldDropDeathLoot@Actor@@UEBA_NXZ virtual bool shouldDropDeathLoot() const; - // vIndex: 145, symbol: ?applySnapshot@Actor@@UEAAXAEBVEntityContext@@0@Z + // vIndex: 139, symbol: ?applySnapshot@Actor@@UEAAXAEBVEntityContext@@0@Z virtual void applySnapshot(class EntityContext const& snapshotEntity, class EntityContext const& originalSnapshotEntity); - // vIndex: 146, symbol: ?getNextStep@Actor@@UEAAMM@Z + // vIndex: 140, symbol: ?getNextStep@Actor@@UEAAMM@Z virtual float getNextStep(float); - // vIndex: 147, symbol: ?onPush@Actor@@UEAAXAEAV1@@Z + // vIndex: 141, symbol: ?onPush@Actor@@UEAAXAEAV1@@Z virtual void onPush(class Actor&); - // vIndex: 148, symbol: ?getLastDeathPos@Actor@@UEBA?AV?$optional@VBlockPos@@@std@@XZ + // vIndex: 142, symbol: ?getLastDeathPos@Actor@@UEBA?AV?$optional@VBlockPos@@@std@@XZ virtual std::optional getLastDeathPos() const; - // vIndex: 149, symbol: ?getLastDeathDimension@Actor@@UEBA?AV?$optional@V?$AutomaticID@VDimension@@H@@@std@@XZ + // vIndex: 143, symbol: ?getLastDeathDimension@Actor@@UEBA?AV?$optional@V?$AutomaticID@VDimension@@H@@@std@@XZ virtual std::optional getLastDeathDimension() const; - // vIndex: 150, symbol: ?hasDiedBefore@Actor@@UEBA_NXZ + // vIndex: 144, symbol: ?hasDiedBefore@Actor@@UEBA_NXZ virtual bool hasDiedBefore() const; - // vIndex: 151, symbol: ?doEnterWaterSplashEffect@Actor@@UEAAXXZ + // vIndex: 145, symbol: ?doEnterWaterSplashEffect@Actor@@UEAAXXZ virtual void doEnterWaterSplashEffect(); - // vIndex: 152, symbol: ?doExitWaterSplashEffect@Actor@@UEAAXXZ + // vIndex: 146, symbol: ?doExitWaterSplashEffect@Actor@@UEAAXXZ virtual void doExitWaterSplashEffect(); - // vIndex: 153, symbol: ?doWaterSplashEffect@Actor@@UEAAXXZ + // vIndex: 147, symbol: ?doWaterSplashEffect@Actor@@UEAAXXZ virtual void doWaterSplashEffect(); - // vIndex: 154, symbol: ?_shouldProvideFeedbackOnHandContainerItemSet@Actor@@MEBA_NW4HandSlot@@AEBVItemStack@@@Z + // vIndex: 148, symbol: ?_shouldProvideFeedbackOnHandContainerItemSet@Actor@@MEBA_NW4HandSlot@@AEBVItemStack@@@Z virtual bool _shouldProvideFeedbackOnHandContainerItemSet(::HandSlot handSlot, class ItemStack const& item) const; - // vIndex: 155, symbol: ?_shouldProvideFeedbackOnArmorSet@Actor@@MEBA_NW4ArmorSlot@@AEBVItemStack@@@Z + // vIndex: 149, symbol: ?_shouldProvideFeedbackOnArmorSet@Actor@@MEBA_NW4ArmorSlot@@AEBVItemStack@@@Z virtual bool _shouldProvideFeedbackOnArmorSet(::ArmorSlot slot, class ItemStack const& item) const; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Actor@@MEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Actor@@MEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams&); - // vIndex: 157, symbol: ?shouldTryMakeStepSound@Actor@@MEAA_NXZ + // vIndex: 151, symbol: ?shouldTryMakeStepSound@Actor@@MEAA_NXZ virtual bool shouldTryMakeStepSound(); - // vIndex: 158, symbol: ?_hurt@Actor@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Actor@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@Actor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Actor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Actor@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Actor@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 161, symbol: ?_playStepSound@Actor@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Actor@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); - // vIndex: 162, symbol: ?_doAutoAttackOnTouch@Actor@@EEAAXAEAV1@@Z + // vIndex: 156, symbol: ?_doAutoAttackOnTouch@Actor@@EEAAXAEAV1@@Z virtual void _doAutoAttackOnTouch(class Actor& entity); // symbol: ??0Actor@@QEAA@AEAVILevel@@AEAVEntityContext@@@Z @@ -681,6 +663,9 @@ class Actor : public ::ActorStatusProvider { // symbol: ?celebrateHunt@Actor@@QEAAXH_N@Z MCAPI void celebrateHunt(int duration, bool); + // symbol: ?checkFallDamage@Actor@@QEAAXM_N0@Z + MCAPI void checkFallDamage(float, bool, bool); + // symbol: ?chorusFruitTeleport@Actor@@QEAAXAEBVVec3@@@Z MCAPI void chorusFruitTeleport(class Vec3 const& range); @@ -702,9 +687,6 @@ class Actor : public ::ActorStatusProvider { // symbol: ?createUpdateTradePacket@Actor@@QEAA?AVUpdateTradePacket@@H@Z MCAPI class UpdateTradePacket createUpdateTradePacket(int containerID); - // symbol: ?damageSensorComponentHurt@Actor@@QEAA_NAEAMAEBVActorDamageSource@@_N@Z - MCAPI bool damageSensorComponentHurt(float& damage, class ActorDamageSource const& source, bool isFatal); - // symbol: ?deregisterTagsFromLevelCache@Actor@@QEAAXXZ MCAPI void deregisterTagsFromLevelCache(); @@ -935,6 +917,9 @@ class Actor : public ::ActorStatusProvider { // symbol: ?getLastHurtByMob@Actor@@QEAAPEAVMob@@XZ MCAPI class Mob* getLastHurtByMob(); + // symbol: ?getLastHurtByMobID@Actor@@QEBA?AUActorUniqueID@@XZ + MCAPI struct ActorUniqueID getLastHurtByMobID() const; + // symbol: ?getLastHurtByMobTime@Actor@@QEAAHXZ MCAPI int getLastHurtByMobTime(); @@ -944,6 +929,9 @@ class Actor : public ::ActorStatusProvider { // symbol: ?getLastHurtByPlayer@Actor@@QEAAPEAVPlayer@@XZ MCAPI class Player* getLastHurtByPlayer(); + // symbol: ?getLastHurtByPlayerID@Actor@@QEBA?AUActorUniqueID@@XZ + MCAPI struct ActorUniqueID getLastHurtByPlayerID() const; + // symbol: ?getLastHurtCause@Actor@@QEBA?AW4ActorDamageCause@@XZ MCAPI ::ActorDamageCause getLastHurtCause() const; @@ -1074,9 +1062,6 @@ class Actor : public ::ActorStatusProvider { // symbol: ?getSkinID@Actor@@QEBAHXZ MCAPI int getSkinID() const; - // symbol: ?getSlideOffset@Actor@@QEBA?AVVec2@@XZ - MCAPI class Vec2 getSlideOffset() const; - // symbol: ?getSpatialNetworkData@Actor@@QEAAAEAVSpatialActorNetworkData@@XZ MCAPI class SpatialActorNetworkData& getSpatialNetworkData(); @@ -1600,9 +1585,6 @@ class Actor : public ::ActorStatusProvider { // symbol: ?removeTag@Actor@@QEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI bool removeTag(std::string const& tag); - // symbol: ?resetSlideYOffset@Actor@@QEAAXXZ - MCAPI void resetSlideYOffset(); - // symbol: ?saveEntityFlags@Actor@@QEBAXAEAVCompoundTag@@@Z MCAPI void saveEntityFlags(class CompoundTag& entityTag) const; diff --git a/src/mc/world/actor/ActorDamageSource.h b/src/mc/world/actor/ActorDamageSource.h index 1b3f60d077..5ae07c7931 100644 --- a/src/mc/world/actor/ActorDamageSource.h +++ b/src/mc/world/actor/ActorDamageSource.h @@ -101,10 +101,18 @@ class ActorDamageSource { MCAPI static std::vector> generateDamageCauseCommandEnum(std::optional); + // symbol: + // ?generateNewDamageCauseCommandEnum@ActorDamageSource@@SA?AV?$vector@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4ActorDamageCause@@@std@@V?$allocator@U?$pair@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4ActorDamageCause@@@std@@@2@@std@@V?$optional@UVersion@Scripting@@@3@@Z + MCAPI static std::vector> + generateNewDamageCauseCommandEnum(std::optional); + // symbol: // ?generateVersionedDamageCauseCommandEnum@ActorDamageSource@@SA?AV?$vector@VVersionedActorDamageCause@@V?$allocator@VVersionedActorDamageCause@@@std@@@std@@XZ MCAPI static std::vector generateVersionedDamageCauseCommandEnum(); + // symbol: ?getCauseMapVersionCutoffInclusive@ActorDamageSource@@SA?AW4ActorDamageCause@@UVersion@Scripting@@@Z + MCAPI static ::ActorDamageCause getCauseMapVersionCutoffInclusive(struct Scripting::Version); + // symbol: ?isDamageCausedByMob@ActorDamageSource@@SA_NW4ActorDamageCause@@@Z MCAPI static bool isDamageCausedByMob(::ActorDamageCause cause); diff --git a/src/mc/world/actor/ActorHistory.h b/src/mc/world/actor/ActorHistory.h index 9cfd2f65e2..84be934752 100644 --- a/src/mc/world/actor/ActorHistory.h +++ b/src/mc/world/actor/ActorHistory.h @@ -19,6 +19,9 @@ class ActorHistory { public: // NOLINTBEGIN + // symbol: ??0Snapshot@ActorHistory@@QEAA@$$QEAU01@@Z + MCAPI Snapshot(struct ActorHistory::Snapshot&&); + // symbol: ??1Snapshot@ActorHistory@@QEAA@XZ MCAPI ~Snapshot(); @@ -36,12 +39,12 @@ class ActorHistory { // symbol: ??0ActorHistory@@QEAA@_K@Z MCAPI explicit ActorHistory(uint64); + // symbol: ?addCorrectionToFrame@ActorHistory@@QEAAXV?$shared_ptr@UIMovementCorrection@@@std@@_K@Z + MCAPI void addCorrectionToFrame(std::shared_ptr, uint64); + // symbol: ?addFrame@ActorHistory@@QEAA_NAEAVEntityContext@@_KAEAVEntityRegistry@@@Z MCAPI bool addFrame(class EntityContext&, uint64, class EntityRegistry&); - // symbol: ?addInputToFrame@ActorHistory@@QEAAXV?$shared_ptr@UIReplayableActorInput@@@std@@_K@Z - MCAPI void addInputToFrame(std::shared_ptr input, uint64 frame); - // symbol: ?addInputToFrontOfFrame@ActorHistory@@QEAAXV?$shared_ptr@UIReplayableActorInput@@@std@@_K@Z MCAPI void addInputToFrontOfFrame(std::shared_ptr, uint64); @@ -51,6 +54,15 @@ class ActorHistory { // symbol: ?getFrame@ActorHistory@@QEBAPEBUSnapshot@1@_K@Z MCAPI struct ActorHistory::Snapshot const* getFrame(uint64 frame) const; + // symbol: ?getOldestFrame@ActorHistory@@QEBA_KXZ + MCAPI uint64 getOldestFrame() const; + + // symbol: ?queueCorrection@ActorHistory@@QEAAXV?$shared_ptr@UIMovementCorrection@@@std@@@Z + MCAPI void queueCorrection(std::shared_ptr); + + // symbol: ?setSnapshotAsCorrection@ActorHistory@@QEAAX_K@Z + MCAPI void setSnapshotAsCorrection(uint64); + // symbol: ??1ActorHistory@@QEAA@XZ MCAPI ~ActorHistory(); diff --git a/src/mc/world/actor/ActorSpawnRuleBase.h b/src/mc/world/actor/ActorSpawnRuleBase.h index 14b019a796..4210e1d169 100644 --- a/src/mc/world/actor/ActorSpawnRuleBase.h +++ b/src/mc/world/actor/ActorSpawnRuleBase.h @@ -34,9 +34,9 @@ class ActorSpawnRuleBase { readResourceFiles(class ResourcePackManager&, class MobSpawnRules const&, std::unordered_map&) = 0; // symbol: - // ?loadSpawnCondition@ActorSpawnRuleBase@@SA?AUActorSpawnConditionData@@AEBVValue@Json@@AEBVMobSpawnRules@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + // ?loadSpawnCondition@ActorSpawnRuleBase@@SA?AUActorSpawnConditionData@@AEBVSemVersion@@AEBVValue@Json@@AEBVMobSpawnRules@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI static struct ActorSpawnConditionData - loadSpawnCondition(class Json::Value const&, class MobSpawnRules const&, std::string const&); + loadSpawnCondition(class SemVersion const&, class Json::Value const&, class MobSpawnRules const&, std::string const&); // NOLINTEND diff --git a/src/mc/world/actor/AreaEffectCloud.h b/src/mc/world/actor/AreaEffectCloud.h index afe5e04a7c..990cc6855c 100644 --- a/src/mc/world/actor/AreaEffectCloud.h +++ b/src/mc/world/actor/AreaEffectCloud.h @@ -44,19 +44,19 @@ class AreaEffectCloud : public ::Actor { // vIndex: 10, symbol: __gen_??1AreaEffectCloud@@UEAA@XZ virtual ~AreaEffectCloud() = default; - // vIndex: 29, symbol: ?normalTick@AreaEffectCloud@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@AreaEffectCloud@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@AreaEffectCloud@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@AreaEffectCloud@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 65, symbol: ?setOwner@AreaEffectCloud@@UEAAXUActorUniqueID@@@Z + // vIndex: 64, symbol: ?setOwner@AreaEffectCloud@@UEAAXUActorUniqueID@@@Z virtual void setOwner(struct ActorUniqueID ownerID); - // vIndex: 159, symbol: ?readAdditionalSaveData@AreaEffectCloud@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@AreaEffectCloud@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@AreaEffectCloud@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@AreaEffectCloud@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0AreaEffectCloud@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/ArmorStand.h b/src/mc/world/actor/ArmorStand.h index 1d4e75e571..daa78289f9 100644 --- a/src/mc/world/actor/ArmorStand.h +++ b/src/mc/world/actor/ArmorStand.h @@ -54,40 +54,40 @@ class ArmorStand : public ::Mob { // vIndex: 10, symbol: __gen_??1ArmorStand@@UEAA@XZ virtual ~ArmorStand() = default; - // vIndex: 29, symbol: ?normalTick@ArmorStand@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@ArmorStand@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@ArmorStand@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@ArmorStand@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@ArmorStand@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@ArmorStand@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 75, symbol: ?isInvulnerableTo@ArmorStand@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@ArmorStand@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 136, symbol: ?getInteraction@ArmorStand@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z + // vIndex: 130, symbol: ?getInteraction@ArmorStand@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z virtual bool getInteraction(class Player& player, class ActorInteraction& interaction, class Vec3 const& location); - // vIndex: 142, symbol: ?kill@ArmorStand@@UEAAXXZ + // vIndex: 136, symbol: ?kill@ArmorStand@@UEAAXXZ virtual void kill(); - // vIndex: 143, symbol: ?die@ArmorStand@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@ArmorStand@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@ArmorStand@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@ArmorStand@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams&); - // vIndex: 158, symbol: ?_hurt@ArmorStand@@UEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@ArmorStand@@UEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float, bool, bool); - // vIndex: 159, symbol: ?readAdditionalSaveData@ArmorStand@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@ArmorStand@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@ArmorStand@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@ArmorStand@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 172, symbol: ?pushActors@ArmorStand@@UEAAXXZ + // vIndex: 166, symbol: ?pushActors@ArmorStand@@UEAAXXZ virtual void pushActors(); // symbol: ??0ArmorStand@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/EnderCrystal.h b/src/mc/world/actor/EnderCrystal.h index 3dbbcae9fc..b699fc11c1 100644 --- a/src/mc/world/actor/EnderCrystal.h +++ b/src/mc/world/actor/EnderCrystal.h @@ -39,25 +39,25 @@ class EnderCrystal : public ::Actor { // vIndex: 10, symbol: __gen_??1EnderCrystal@@UEAA@XZ virtual ~EnderCrystal() = default; - // vIndex: 29, symbol: ?normalTick@EnderCrystal@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@EnderCrystal@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@EnderCrystal@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@EnderCrystal@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@EnderCrystal@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@EnderCrystal@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 75, symbol: ?isInvulnerableTo@EnderCrystal@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@EnderCrystal@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 158, symbol: ?_hurt@EnderCrystal@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@EnderCrystal@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@EnderCrystal@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@EnderCrystal@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@EnderCrystal@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@EnderCrystal@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0EnderCrystal@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/FishingHook.h b/src/mc/world/actor/FishingHook.h index 01cbbde06e..b9de181b48 100644 --- a/src/mc/world/actor/FishingHook.h +++ b/src/mc/world/actor/FishingHook.h @@ -45,22 +45,22 @@ class FishingHook : public ::Actor { // vIndex: 13, symbol: ?remove@FishingHook@@UEAAXXZ virtual void remove(); - // vIndex: 41, symbol: ?getShadowRadius@FishingHook@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@FishingHook@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 80, symbol: ?handleEntityEvent@FishingHook@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@FishingHook@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent eventId, int data); - // vIndex: 94, symbol: ?save@FishingHook@@UEBA_NAEAVCompoundTag@@@Z + // vIndex: 93, symbol: ?save@FishingHook@@UEBA_NAEAVCompoundTag@@@Z virtual bool save(class CompoundTag& entityTag) const; - // vIndex: 97, symbol: ?getSourceUniqueID@FishingHook@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@FishingHook@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@FishingHook@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@FishingHook@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 144, symbol: ?shouldDropDeathLoot@FishingHook@@UEBA_NXZ + // vIndex: 138, symbol: ?shouldDropDeathLoot@FishingHook@@UEBA_NXZ virtual bool shouldDropDeathLoot() const; // symbol: ??0FishingHook@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/HangingActor.h b/src/mc/world/actor/HangingActor.h index df0455faa4..f3db58865a 100644 --- a/src/mc/world/actor/HangingActor.h +++ b/src/mc/world/actor/HangingActor.h @@ -46,40 +46,40 @@ class HangingActor : public ::Actor { // vIndex: 10, symbol: ??1HangingActor@@UEAA@XZ virtual ~HangingActor(); - // vIndex: 29, symbol: ?normalTick@HangingActor@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@HangingActor@@UEAAXXZ virtual void normalTick(); - // vIndex: 44, symbol: ?getBrightness@HangingActor@@UEBAMMAEBVIConstBlockSource@@@Z + // vIndex: 43, symbol: ?getBrightness@HangingActor@@UEBAMMAEBVIConstBlockSource@@@Z virtual float getBrightness(float, class IConstBlockSource const& region) const; - // vIndex: 48, symbol: ?isPickable@HangingActor@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@HangingActor@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 75, symbol: ?isInvulnerableTo@HangingActor@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@HangingActor@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 158, symbol: ?_hurt@HangingActor@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@HangingActor@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@HangingActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@HangingActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@HangingActor@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@HangingActor@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?getWidth@Painting@@UEBAHXZ + // vIndex: 157, symbol: ?getWidth@Painting@@UEBAHXZ virtual int getWidth() const = 0; - // vIndex: 164, symbol: ?getHeight@Painting@@UEBAHXZ + // vIndex: 158, symbol: ?getHeight@Painting@@UEBAHXZ virtual int getHeight() const = 0; - // vIndex: 165, symbol: ?dropItem@Painting@@UEAAXXZ + // vIndex: 159, symbol: ?dropItem@Painting@@UEAAXXZ virtual void dropItem() = 0; - // vIndex: 166, symbol: ?placeHangingEntity@HangingActor@@UEAA_NAEAVBlockSource@@H@Z + // vIndex: 160, symbol: ?placeHangingEntity@HangingActor@@UEAA_NAEAVBlockSource@@H@Z virtual bool placeHangingEntity(class BlockSource& region, int direction); - // vIndex: 167, symbol: ?wouldSurvive@HangingActor@@UEAA_NAEAVBlockSource@@@Z + // vIndex: 161, symbol: ?wouldSurvive@HangingActor@@UEAA_NAEAVBlockSource@@@Z virtual bool wouldSurvive(class BlockSource& region); // symbol: ??0HangingActor@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/LeashFenceKnotActor.h b/src/mc/world/actor/LeashFenceKnotActor.h index a965c93ae8..3a1b2a76ea 100644 --- a/src/mc/world/actor/LeashFenceKnotActor.h +++ b/src/mc/world/actor/LeashFenceKnotActor.h @@ -50,34 +50,34 @@ class LeashFenceKnotActor : public ::HangingActor { // vIndex: 13, symbol: ?remove@LeashFenceKnotActor@@UEAAXXZ virtual void remove(); - // vIndex: 26, symbol: ?teleportTo@LeashFenceKnotActor@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@LeashFenceKnotActor@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int sourceEntityType, bool); - // vIndex: 41, symbol: ?getShadowRadius@LeashFenceKnotActor@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@LeashFenceKnotActor@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@LeashFenceKnotActor@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@LeashFenceKnotActor@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 136, symbol: ?getInteraction@LeashFenceKnotActor@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z + // vIndex: 130, symbol: ?getInteraction@LeashFenceKnotActor@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z virtual bool getInteraction(class Player& player, class ActorInteraction& interaction, class Vec3 const& location); - // vIndex: 159, symbol: ?readAdditionalSaveData@LeashFenceKnotActor@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@LeashFenceKnotActor@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@LeashFenceKnotActor@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@LeashFenceKnotActor@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?getWidth@LeashFenceKnotActor@@UEBAHXZ + // vIndex: 157, symbol: ?getWidth@LeashFenceKnotActor@@UEBAHXZ virtual int getWidth() const; - // vIndex: 164, symbol: ?getHeight@LeashFenceKnotActor@@UEBAHXZ + // vIndex: 158, symbol: ?getHeight@LeashFenceKnotActor@@UEBAHXZ virtual int getHeight() const; - // vIndex: 165, symbol: ?dropItem@LeashFenceKnotActor@@UEAAXXZ + // vIndex: 159, symbol: ?dropItem@LeashFenceKnotActor@@UEAAXXZ virtual void dropItem(); - // vIndex: 167, symbol: ?wouldSurvive@LeashFenceKnotActor@@UEAA_NAEAVBlockSource@@@Z + // vIndex: 161, symbol: ?wouldSurvive@LeashFenceKnotActor@@UEAA_NAEAVBlockSource@@@Z virtual bool wouldSurvive(class BlockSource& region); // symbol: diff --git a/src/mc/world/actor/Mob.h b/src/mc/world/actor/Mob.h index 5b9cd91bf6..5c3148ea17 100644 --- a/src/mc/world/actor/Mob.h +++ b/src/mc/world/actor/Mob.h @@ -79,250 +79,247 @@ class Mob : public ::Actor { // vIndex: 21, symbol: ?resetInterpolated@Mob@@UEAAXXZ virtual void resetInterpolated(); - // vIndex: 24, symbol: ?blockedByShield@Mob@@UEAAXAEBVActorDamageSource@@AEAVActor@@@Z + // vIndex: 23, symbol: ?blockedByShield@Mob@@UEAAXAEBVActorDamageSource@@AEAVActor@@@Z virtual void blockedByShield(class ActorDamageSource const& source, class Actor& blocker); - // vIndex: 26, symbol: ?teleportTo@Mob@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@Mob@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int sourceEntityType, bool); - // vIndex: 29, symbol: ?normalTick@Mob@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Mob@@UEAAXXZ virtual void normalTick(); - // vIndex: 30, symbol: ?baseTick@Mob@@UEAAXXZ + // vIndex: 29, symbol: ?baseTick@Mob@@UEAAXXZ virtual void baseTick(); - // vIndex: 32, symbol: ?startRiding@Mob@@UEAA_NAEAVActor@@@Z + // vIndex: 31, symbol: ?startRiding@Mob@@UEAA_NAEAVActor@@@Z virtual bool startRiding(class Actor&); - // vIndex: 33, symbol: ?addPassenger@Mob@@UEAAXAEAVActor@@@Z + // vIndex: 32, symbol: ?addPassenger@Mob@@UEAAXAEAVActor@@@Z virtual void addPassenger(class Actor&); - // vIndex: 46, symbol: ?isImmobile@Mob@@UEBA_NXZ + // vIndex: 45, symbol: ?isImmobile@Mob@@UEBA_NXZ virtual bool isImmobile() const; - // vIndex: 48, symbol: ?isPickable@Mob@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Mob@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 49, symbol: ?isSleeping@Mob@@UEBA_NXZ + // vIndex: 48, symbol: ?isSleeping@Mob@@UEBA_NXZ virtual bool isSleeping() const; - // vIndex: 50, symbol: ?setSleeping@Mob@@UEAAX_N@Z + // vIndex: 49, symbol: ?setSleeping@Mob@@UEAAX_N@Z virtual void setSleeping(bool val); - // vIndex: 52, symbol: ?isBlocking@Mob@@UEBA_NXZ + // vIndex: 51, symbol: ?isBlocking@Mob@@UEBA_NXZ virtual bool isBlocking() const; - // vIndex: 54, symbol: ?isAlive@Mob@@UEBA_NXZ + // vIndex: 53, symbol: ?isAlive@Mob@@UEBA_NXZ virtual bool isAlive() const; - // vIndex: 56, symbol: ?isSurfaceMob@Mob@@UEBA_NXZ + // vIndex: 55, symbol: ?isSurfaceMob@Mob@@UEBA_NXZ virtual bool isSurfaceMob() const; - // vIndex: 61, symbol: ?setTarget@Mob@@UEAAXPEAVActor@@@Z + // vIndex: 60, symbol: ?setTarget@Mob@@UEAAXPEAVActor@@@Z virtual void setTarget(class Actor* target); - // vIndex: 63, symbol: ?attack@Mob@@UEAA_NAEAVActor@@AEBW4ActorDamageCause@@@Z + // vIndex: 62, symbol: ?attack@Mob@@UEAA_NAEAVActor@@AEBW4ActorDamageCause@@@Z virtual bool attack(class Actor& target, ::ActorDamageCause const& cause); - // vIndex: 70, symbol: ?canPowerJump@Mob@@UEBA_NXZ + // vIndex: 69, symbol: ?canPowerJump@Mob@@UEBA_NXZ virtual bool canPowerJump() const; - // vIndex: 76, symbol: ?getBlockDamageCause@Mob@@UEBA?AW4ActorDamageCause@@AEBVBlock@@@Z + // vIndex: 75, symbol: ?getBlockDamageCause@Mob@@UEBA?AW4ActorDamageCause@@AEBVBlock@@@Z virtual ::ActorDamageCause getBlockDamageCause(class Block const& block) const; - // vIndex: 77, symbol: ?doFireHurt@Mob@@UEAA_NH@Z + // vIndex: 76, symbol: ?doFireHurt@Mob@@UEAA_NH@Z virtual bool doFireHurt(int amount); - // vIndex: 80, symbol: ?handleEntityEvent@Mob@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Mob@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 85, symbol: ?getArmorMaterialTypeInSlot@Mob@@UEBA?AW4ArmorMaterialType@@W4ArmorSlot@@@Z + // vIndex: 84, symbol: ?getArmorMaterialTypeInSlot@Mob@@UEBA?AW4ArmorMaterialType@@W4ArmorSlot@@@Z virtual ::ArmorMaterialType getArmorMaterialTypeInSlot(::ArmorSlot slot) const; - // vIndex: 86, symbol: ?getArmorMaterialTextureTypeInSlot@Mob@@UEBA?AW4ArmorTextureType@@W4ArmorSlot@@@Z + // vIndex: 85, symbol: ?getArmorMaterialTextureTypeInSlot@Mob@@UEBA?AW4ArmorTextureType@@W4ArmorSlot@@@Z virtual ::ArmorTextureType getArmorMaterialTextureTypeInSlot(::ArmorSlot slot) const; - // vIndex: 87, symbol: ?getArmorColorInSlot@Mob@@UEBAMW4ArmorSlot@@H@Z + // vIndex: 86, symbol: ?getArmorColorInSlot@Mob@@UEBAMW4ArmorSlot@@H@Z virtual float getArmorColorInSlot(::ArmorSlot slot, int channelRGBA) const; - // vIndex: 88, symbol: ?setEquippedSlot@Mob@@UEAAXW4EquipmentSlot@Legacy@Puv@@AEBVItemStack@@@Z + // vIndex: 87, symbol: ?setEquippedSlot@Mob@@UEAAXW4EquipmentSlot@Legacy@Puv@@AEBVItemStack@@@Z virtual void setEquippedSlot(::Puv::Legacy::EquipmentSlot, class ItemStack const&); - // vIndex: 98, symbol: ?canFreeze@Mob@@UEBA_NXZ + // vIndex: 97, symbol: ?canFreeze@Mob@@UEBA_NXZ virtual bool canFreeze() const; - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@Mob@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@Mob@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 108, symbol: ?causeFallDamageToActor@Mob@@MEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@Mob@@MEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 112, symbol: ?canBePulledIntoVehicle@Mob@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@Mob@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 113, symbol: ?inCaravan@Mob@@UEBA_NXZ + // vIndex: 109, symbol: ?inCaravan@Mob@@UEBA_NXZ virtual bool inCaravan() const; - // vIndex: 118, symbol: + // vIndex: 114, symbol: // ?buildDebugInfo@Mob@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void buildDebugInfo(std::string& out) const; - // vIndex: 120, symbol: ?getDeathTime@Mob@@UEBAHXZ + // vIndex: 116, symbol: ?getDeathTime@Mob@@UEBAHXZ virtual int getDeathTime() const; - // vIndex: 129, symbol: ?swing@Mob@@UEAAXXZ + // vIndex: 123, symbol: ?swing@Mob@@UEAAXXZ virtual void swing(); - // vIndex: 141, symbol: ?renderDebugServerState@Mob@@UEAAXAEBVOptions@@@Z + // vIndex: 135, symbol: ?renderDebugServerState@Mob@@UEAAXAEBVOptions@@@Z virtual void renderDebugServerState(class Options const& options); - // vIndex: 142, symbol: ?kill@Mob@@UEAAXXZ + // vIndex: 136, symbol: ?kill@Mob@@UEAAXXZ virtual void kill(); - // vIndex: 143, symbol: ?die@Mob@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Mob@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 144, symbol: ?shouldDropDeathLoot@Mob@@UEBA_NXZ + // vIndex: 138, symbol: ?shouldDropDeathLoot@Mob@@UEBA_NXZ virtual bool shouldDropDeathLoot() const; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Mob@@MEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Mob@@MEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@Mob@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Mob@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float dmg, bool knock, bool); - // vIndex: 159, symbol: ?readAdditionalSaveData@Mob@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Mob@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Mob@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Mob@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& entityTag) const; - // vIndex: 161, symbol: ?_playStepSound@Mob@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Mob@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); - // vIndex: 163, symbol: ?knockback@Mob@@UEAAXPEAVActor@@HMMMMM@Z + // vIndex: 157, symbol: ?knockback@Mob@@UEAAXPEAVActor@@HMMMMM@Z virtual void knockback(class Actor* source, int dmg, float xd, float zd, float, float, float heightCap); - // vIndex: 164, symbol: ?spawnAnim@Mob@@UEAAXXZ + // vIndex: 158, symbol: ?spawnAnim@Mob@@UEAAXXZ virtual void spawnAnim(); - // vIndex: 165, symbol: ?setSprinting@Mob@@UEAAX_N@Z + // vIndex: 159, symbol: ?setSprinting@Mob@@UEAAX_N@Z virtual void setSprinting(bool shouldSprint); - // vIndex: 166, symbol: ?getHurtSound@Mob@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 160, symbol: ?getHurtSound@Mob@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getHurtSound(); - // vIndex: 167, symbol: ?getDeathSound@Mob@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 161, symbol: ?getDeathSound@Mob@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getDeathSound(); - // vIndex: 168, symbol: ?getSpeed@Mob@@UEBAMXZ + // vIndex: 162, symbol: ?getSpeed@Mob@@UEBAMXZ virtual float getSpeed() const; - // vIndex: 169, symbol: ?setSpeed@Mob@@UEAAXM@Z + // vIndex: 163, symbol: ?setSpeed@Mob@@UEAAXM@Z virtual void setSpeed(float speed); - // vIndex: 170, symbol: ?hurtEffects@Mob@@UEAAXAEBVActorDamageSource@@M_N1@Z + // vIndex: 164, symbol: ?hurtEffects@Mob@@UEAAXAEBVActorDamageSource@@M_N1@Z virtual void hurtEffects(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 171, symbol: ?aiStep@Mob@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Mob@@UEAAXXZ virtual void aiStep(); - // vIndex: 172, symbol: ?pushActors@Mob@@UEAAXXZ + // vIndex: 166, symbol: ?pushActors@Mob@@UEAAXXZ virtual void pushActors(); - // vIndex: 173, symbol: ?checkSpawnRules@Mob@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Mob@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 174, symbol: ?checkSpawnObstruction@Mob@@UEBA_NXZ + // vIndex: 168, symbol: ?checkSpawnObstruction@Mob@@UEBA_NXZ virtual bool checkSpawnObstruction() const; - // vIndex: 175, symbol: ?getItemUseDuration@Mob@@UEBAHXZ + // vIndex: 169, symbol: ?getItemUseDuration@Mob@@UEBAHXZ virtual int getItemUseDuration() const; - // vIndex: 176, symbol: ?getItemUseStartupProgress@Mob@@UEBAMXZ + // vIndex: 170, symbol: ?getItemUseStartupProgress@Mob@@UEBAMXZ virtual float getItemUseStartupProgress() const; - // vIndex: 177, symbol: ?getItemUseIntervalProgress@Mob@@UEBAMXZ + // vIndex: 171, symbol: ?getItemUseIntervalProgress@Mob@@UEBAMXZ virtual float getItemUseIntervalProgress() const; - // vIndex: 178, symbol: ?getMaxHeadXRot@Mob@@UEAAMXZ + // vIndex: 172, symbol: ?getMaxHeadXRot@Mob@@UEAAMXZ virtual float getMaxHeadXRot(); - // vIndex: 179, symbol: ?isAlliedTo@Mob@@UEAA_NPEAV1@@Z + // vIndex: 173, symbol: ?isAlliedTo@Mob@@UEAA_NPEAV1@@Z virtual bool isAlliedTo(class Mob* other); - // vIndex: 180, symbol: ?doHurtTarget@Mob@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z + // vIndex: 174, symbol: ?doHurtTarget@Mob@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z virtual bool doHurtTarget(class Actor* target, ::ActorDamageCause const& cause); - // vIndex: 181, symbol: ?getArmorValue@Mob@@UEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@Mob@@UEBAHXZ virtual int getArmorValue() const; - // vIndex: 182, symbol: ?hurtArmorSlots@Mob@@UEAAXAEBVActorDamageSource@@HV?$bitset@$03@std@@@Z + // vIndex: 176, symbol: ?hurtArmorSlots@Mob@@UEAAXAEBVActorDamageSource@@HV?$bitset@$03@std@@@Z virtual void hurtArmorSlots(class ActorDamageSource const& source, int dmg, std::bitset<4> hurtSlots); - // vIndex: 183, symbol: ?setDamagedArmor@Mob@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z + // vIndex: 177, symbol: ?setDamagedArmor@Mob@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z virtual void setDamagedArmor(::ArmorSlot slot, class ItemStack const& item); - // vIndex: 184, symbol: ?sendArmorDamage@Mob@@UEAAXV?$bitset@$03@std@@@Z + // vIndex: 178, symbol: ?sendArmorDamage@Mob@@UEAAXV?$bitset@$03@std@@@Z virtual void sendArmorDamage(std::bitset<4> damagedSlots); - // vIndex: 185, symbol: ?sendArmor@Mob@@UEAAXV?$bitset@$03@std@@@Z + // vIndex: 179, symbol: ?sendArmor@Mob@@UEAAXV?$bitset@$03@std@@@Z virtual void sendArmor(std::bitset<4> armorSlots); - // vIndex: 186, symbol: ?getAllHand@Mob@@UEBA?AV?$vector@PEBVItemStack@@V?$allocator@PEBVItemStack@@@std@@@std@@XZ + // vIndex: 180, symbol: ?getAllHand@Mob@@UEBA?AV?$vector@PEBVItemStack@@V?$allocator@PEBVItemStack@@@std@@@std@@XZ virtual std::vector getAllHand() const; - // vIndex: 187, symbol: + // vIndex: 181, symbol: // ?getAllEquipment@Mob@@UEBA?AV?$vector@PEBVItemStack@@V?$allocator@PEBVItemStack@@@std@@@std@@XZ virtual std::vector getAllEquipment() const; - // vIndex: 188, symbol: ?dropEquipmentOnDeath@Mob@@UEAAXAEBVActorDamageSource@@H@Z + // vIndex: 182, symbol: ?dropEquipmentOnDeath@Mob@@UEAAXAEBVActorDamageSource@@H@Z virtual void dropEquipmentOnDeath(class ActorDamageSource const& source, int lootBonusLevel); - // vIndex: 189, symbol: ?dropEquipmentOnDeath@Mob@@UEAAXXZ + // vIndex: 183, symbol: ?dropEquipmentOnDeath@Mob@@UEAAXXZ virtual void dropEquipmentOnDeath(); - // vIndex: 190, symbol: ?clearVanishEnchantedItemsOnDeath@Mob@@UEAAXXZ + // vIndex: 184, symbol: ?clearVanishEnchantedItemsOnDeath@Mob@@UEAAXXZ virtual void clearVanishEnchantedItemsOnDeath(); - // vIndex: 191, symbol: ?sendInventory@Mob@@UEAAX_N@Z + // vIndex: 185, symbol: ?sendInventory@Mob@@UEAAX_N@Z virtual void sendInventory(bool shouldSelectSlot); - // vIndex: 192, symbol: ?getDamageAfterEnchantReduction@Mob@@UEBAMAEBVActorDamageSource@@M@Z + // vIndex: 186, symbol: ?getDamageAfterEnchantReduction@Mob@@UEBAMAEBVActorDamageSource@@M@Z virtual float getDamageAfterEnchantReduction(class ActorDamageSource const& source, float damage) const; - // vIndex: 193, symbol: ?createAIGoals@Mob@@UEAA_NXZ + // vIndex: 187, symbol: ?createAIGoals@Mob@@UEAA_NXZ virtual bool createAIGoals(); - // vIndex: 194, symbol: ?onBorn@Mob@@UEAAXAEAVActor@@0@Z + // vIndex: 188, symbol: ?onBorn@Mob@@UEAAXAEAVActor@@0@Z virtual void onBorn(class Actor& parentLeft, class Actor& parentRight); - // vIndex: 195, symbol: ?setItemSlot@Mob@@UEAA_NW4EquipmentSlot@Legacy@Puv@@AEBVItemStack@@@Z + // vIndex: 189, symbol: ?setItemSlot@Mob@@UEAA_NW4EquipmentSlot@Legacy@Puv@@AEBVItemStack@@@Z virtual bool setItemSlot(::Puv::Legacy::EquipmentSlot, class ItemStack const&); - // vIndex: 196, symbol: ?setTransitioningSitting@Mob@@UEAAX_N@Z + // vIndex: 190, symbol: ?setTransitioningSitting@Mob@@UEAAX_N@Z virtual void setTransitioningSitting(bool value); - // vIndex: 197, symbol: ?getAttackTime@Mob@@UEAAHXZ - virtual int getAttackTime(); - - // vIndex: 198, symbol: ?_getWalkTargetValue@Mob@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Mob@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 199, symbol: ?canExistWhenDisallowMob@Mob@@UEBA_NXZ + // vIndex: 192, symbol: ?canExistWhenDisallowMob@Mob@@UEBA_NXZ virtual bool canExistWhenDisallowMob() const; - // vIndex: 200, symbol: + // vIndex: 193, symbol: // ?initBodyControl@Mob@@MEAA?AV?$unique_ptr@VBodyControl@@U?$default_delete@VBodyControl@@@std@@@std@@XZ virtual std::unique_ptr initBodyControl(); - // vIndex: 201, symbol: ?newServerAiStep@Mob@@MEAAXXZ + // vIndex: 194, symbol: ?newServerAiStep@Mob@@MEAAXXZ virtual void newServerAiStep(); - // vIndex: 202, symbol: ?tickDeath@Mob@@MEAAXXZ + // vIndex: 195, symbol: ?tickDeath@Mob@@MEAAXXZ virtual void tickDeath(); - // vIndex: 203, symbol: ?_getAdjustedAABBForSpawnCheck@Mob@@MEBA?AVAABB@@AEBV2@AEBVVec3@@@Z + // vIndex: 196, symbol: ?_getAdjustedAABBForSpawnCheck@Mob@@MEBA?AVAABB@@AEBV2@AEBVVec3@@@Z virtual class AABB _getAdjustedAABBForSpawnCheck(class AABB const& aabb, class Vec3 const& mobPos) const; // symbol: ??0Mob@@QEAA@AEAVLevel@@AEAVEntityContext@@@Z @@ -342,9 +339,6 @@ class Mob : public ::Actor { // symbol: ?ate@Mob@@QEAAXXZ MCAPI void ate(); - // symbol: ?attackAnimation@Mob@@QEAAXPEAVActor@@M@Z - MCAPI void attackAnimation(class Actor* target, float distance); - // symbol: ?calcMoveRelativeSpeed@Mob@@QEAAMW4TravelType@@@Z MCAPI float calcMoveRelativeSpeed(::TravelType travelType); @@ -390,6 +384,9 @@ class Mob : public ::Actor { // symbol: ?getDamageAfterArmorReduction@Mob@@QEBAMAEBVActorDamageSource@@M@Z MCAPI float getDamageAfterArmorReduction(class ActorDamageSource const& source, float damage) const; + // symbol: ?getDamageAfterDamageSensorComponentAdjustments@Mob@@QEAAMAEBVActorDamageSource@@M@Z + MCAPI float getDamageAfterDamageSensorComponentAdjustments(class ActorDamageSource const&, float); + // symbol: ?getDamageAfterResistanceEffect@Mob@@QEBAMAEBVActorDamageSource@@M@Z MCAPI float getDamageAfterResistanceEffect(class ActorDamageSource const& source, float damage) const; diff --git a/src/mc/world/actor/OwningGetCollisionShapeEntityProxy.h b/src/mc/world/actor/OwningGetCollisionShapeEntityProxy.h index 668860ab80..118cdc9d96 100644 --- a/src/mc/world/actor/OwningGetCollisionShapeEntityProxy.h +++ b/src/mc/world/actor/OwningGetCollisionShapeEntityProxy.h @@ -2,6 +2,9 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/entity/utilities/ActorType.h" + class OwningGetCollisionShapeEntityProxy { public: // prevent constructor by default @@ -17,14 +20,17 @@ class OwningGetCollisionShapeEntityProxy { // vIndex: 1, symbol: __unk_vfn_1 virtual void __unk_vfn_1(); - // vIndex: 2, symbol: __unk_vfn_2 - virtual void __unk_vfn_2(); + // vIndex: 2, symbol: + // ?canDescendThroughBlock@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBA_NXZ + virtual bool canDescendThroughBlock() const; - // vIndex: 3, symbol: __unk_vfn_3 - virtual void __unk_vfn_3(); + // vIndex: 3, symbol: + // ?getFallDistance@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBAMXZ + virtual float getFallDistance() const; - // vIndex: 4, symbol: __unk_vfn_4 - virtual void __unk_vfn_4(); + // vIndex: 4, symbol: + // ?getEntityTypeId@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBA?AW4ActorType@@XZ + virtual ::ActorType getEntityTypeId() const; // vIndex: 5, symbol: // ?isWearingLeatherBoots@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBA_NXZ @@ -34,16 +40,22 @@ class OwningGetCollisionShapeEntityProxy { // ?hasLightWeightFamilyTag@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBA_NXZ virtual bool hasLightWeightFamilyTag() const; - // vIndex: 7, symbol: __unk_vfn_7 - virtual void __unk_vfn_7(); + // vIndex: 7, symbol: + // ?getAABB@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBAAEBVAABB@@XZ + virtual class AABB const& getAABB() const; - // vIndex: 8, symbol: __unk_vfn_8 - virtual void __unk_vfn_8(); + // vIndex: 8, symbol: + // ?isWorldBuilder@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBA_NXZ + virtual bool isWorldBuilder() const; // vIndex: 9, symbol: // ?isRiding@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBA_NXZ virtual bool isRiding() const; + // vIndex: 10, symbol: + // ?hasPassenger@?$GetCollisionShapeEntityProxy@V?$StrictExecutionContext@U?$Filter@V?$FlagComponent@UCanStandOnSnowFlag@@@@V?$FlagComponent@UHasLightweightFamilyFlag@@@@@@U?$Read@UAABBShapeComponent@@UMovementAbilitiesComponent@@UActorTypeComponent@@UFallDistanceComponent@@UPassengerComponent@@UActorGameTypeComponent@@UActorDataFlagComponent@@UVehicleComponent@@@@U?$Write@$$V@@U?$AddRemove@$$V@@U?$GlobalRead@UExternalDataComponent@@@@U?$GlobalWrite@$$V@@U?$EntityFactoryT@$$V@@@@@@UEBA_NXZ + virtual bool hasPassenger() const; + // symbol: ??0OwningGetCollisionShapeEntityProxy@@QEAA@AEBVEntityContext@@@Z MCAPI explicit OwningGetCollisionShapeEntityProxy(class EntityContext const&); diff --git a/src/mc/world/actor/Painting.h b/src/mc/world/actor/Painting.h index 3a52cf6b93..56cb0f4b7b 100644 --- a/src/mc/world/actor/Painting.h +++ b/src/mc/world/actor/Painting.h @@ -42,32 +42,32 @@ class Painting : public ::HangingActor { // vIndex: 13, symbol: ?remove@Painting@@UEAAXXZ virtual void remove(); - // vIndex: 28, symbol: + // vIndex: 27, symbol: // ?tryCreateAddActorPacket@Painting@@UEAA?AV?$unique_ptr@VAddActorBasePacket@@U?$default_delete@VAddActorBasePacket@@@std@@@std@@XZ virtual std::unique_ptr tryCreateAddActorPacket(); - // vIndex: 41, symbol: ?getShadowRadius@Painting@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Painting@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@Painting@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Painting@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 159, symbol: ?readAdditionalSaveData@Painting@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Painting@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Painting@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Painting@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?getWidth@Painting@@UEBAHXZ + // vIndex: 157, symbol: ?getWidth@Painting@@UEBAHXZ virtual int getWidth() const; - // vIndex: 164, symbol: ?getHeight@Painting@@UEBAHXZ + // vIndex: 158, symbol: ?getHeight@Painting@@UEBAHXZ virtual int getHeight() const; - // vIndex: 165, symbol: ?dropItem@Painting@@UEAAXXZ + // vIndex: 159, symbol: ?dropItem@Painting@@UEAAXXZ virtual void dropItem(); - // vIndex: 166, symbol: ?placeHangingEntity@Painting@@UEAA_NAEAVBlockSource@@H@Z + // vIndex: 160, symbol: ?placeHangingEntity@Painting@@UEAA_NAEAVBlockSource@@H@Z virtual bool placeHangingEntity(class BlockSource& region, int direction); // symbol: ??0Painting@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/VehicleUtils.h b/src/mc/world/actor/VehicleUtils.h index 3b7b5f2612..1aae9046d6 100644 --- a/src/mc/world/actor/VehicleUtils.h +++ b/src/mc/world/actor/VehicleUtils.h @@ -36,15 +36,17 @@ class VehicleUtils { // symbol: // ?getActivatorRailExitPatternStrategy@VehicleUtils@@SAP6A?AV?$optional@VVec3@@@std@@AEBUVehicleDirections@1@V?$function@$$A6A_NAEBVVec3@@0@Z@3@@ZAEBVBaseGameVersion@@@Z - MCAPI static auto getActivatorRailExitPatternStrategy(class BaseGameVersion const& version) -> std::optional< - class - Vec3> (*)(struct VehicleUtils::VehicleDirections const&, std::function); + MCAPI static auto getActivatorRailExitPatternStrategy(class BaseGameVersion const& version) + -> std::optional< + class + Vec3> (*)(struct VehicleUtils::VehicleDirections const&, std::function); // symbol: // ?getActorExitPatternStrategy@VehicleUtils@@SAP6A?AV?$optional@VVec3@@@std@@AEBUVehicleDirections@1@V?$function@$$A6A_NAEBVVec3@@0@Z@3@@ZAEBVBaseGameVersion@@@Z - MCAPI static auto getActorExitPatternStrategy(class BaseGameVersion const& version) -> std::optional< - class - Vec3> (*)(struct VehicleUtils::VehicleDirections const&, std::function); + MCAPI static auto getActorExitPatternStrategy(class BaseGameVersion const& version) + -> std::optional< + class + Vec3> (*)(struct VehicleUtils::VehicleDirections const&, std::function); // symbol: ?ignoredExitCollisionBlock@VehicleUtils@@SA_NAEBVBlock@@@Z MCAPI static bool ignoredExitCollisionBlock(class Block const& block); diff --git a/src/mc/world/actor/agent/Agent.h b/src/mc/world/actor/agent/Agent.h index becd248d44..a38759747e 100644 --- a/src/mc/world/actor/agent/Agent.h +++ b/src/mc/world/actor/agent/Agent.h @@ -45,64 +45,61 @@ class Agent : public ::Mob { // vIndex: 10, symbol: __gen_??1Agent@@UEAA@XZ virtual ~Agent() = default; - // vIndex: 23, symbol: ?breaksFallingBlocks@Agent@@UEBA_NXZ - virtual bool breaksFallingBlocks() const; - - // vIndex: 26, symbol: ?teleportTo@Agent@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@Agent@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int entityType, bool); - // vIndex: 29, symbol: ?normalTick@Agent@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Agent@@UEAAXXZ virtual void normalTick(); - // vIndex: 37, symbol: ?isInvisible@Agent@@UEBA_NXZ + // vIndex: 36, symbol: ?isInvisible@Agent@@UEBA_NXZ virtual bool isInvisible() const; - // vIndex: 38, symbol: ?canShowNameTag@Agent@@UEBA_NXZ + // vIndex: 37, symbol: ?canShowNameTag@Agent@@UEBA_NXZ virtual bool canShowNameTag() const; - // vIndex: 40, symbol: ?getNameTagTextColor@Agent@@UEBA?AVColor@mce@@XZ + // vIndex: 39, symbol: ?getNameTagTextColor@Agent@@UEBA?AVColor@mce@@XZ virtual class mce::Color getNameTagTextColor() const; - // vIndex: 48, symbol: ?isPickable@Agent@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Agent@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 57, symbol: ?isTargetable@Agent@@UEBA_NXZ + // vIndex: 56, symbol: ?isTargetable@Agent@@UEBA_NXZ virtual bool isTargetable() const; - // vIndex: 65, symbol: ?setOwner@Agent@@UEAAXUActorUniqueID@@@Z + // vIndex: 64, symbol: ?setOwner@Agent@@UEAAXUActorUniqueID@@@Z virtual void setOwner(struct ActorUniqueID id); - // vIndex: 80, symbol: ?handleEntityEvent@Agent@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Agent@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 89, symbol: ?setCarriedItem@Agent@@UEAAXAEBVItemStack@@@Z + // vIndex: 88, symbol: ?setCarriedItem@Agent@@UEAAXAEBVItemStack@@@Z virtual void setCarriedItem(class ItemStack const& item); - // vIndex: 112, symbol: ?canBePulledIntoVehicle@Agent@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@Agent@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 121, symbol: ?canBeAffected@Agent@@UEBA_NI@Z + // vIndex: 117, symbol: ?canBeAffected@Agent@@UEBA_NI@Z virtual bool canBeAffected(uint) const; - // vIndex: 142, symbol: ?kill@Agent@@UEAAXXZ + // vIndex: 136, symbol: ?kill@Agent@@UEAAXXZ virtual void kill(); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Agent@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Agent@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@Agent@@EEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Agent@@EEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 163, symbol: ?knockback@Agent@@UEAAXPEAVActor@@HMMMMM@Z + // vIndex: 157, symbol: ?knockback@Agent@@UEAAXPEAVActor@@HMMMMM@Z virtual void knockback(class Actor*, int, float, float, float, float, float); - // vIndex: 193, symbol: ?createAIGoals@Agent@@UEAA_NXZ + // vIndex: 187, symbol: ?createAIGoals@Agent@@UEAA_NXZ virtual bool createAIGoals(); - // vIndex: 199, symbol: ?canExistWhenDisallowMob@Agent@@UEBA_NXZ + // vIndex: 192, symbol: ?canExistWhenDisallowMob@Agent@@UEBA_NXZ virtual bool canExistWhenDisallowMob() const; - // vIndex: 200, symbol: + // vIndex: 193, symbol: // ?initBodyControl@Agent@@EEAA?AV?$unique_ptr@VBodyControl@@U?$default_delete@VBodyControl@@@std@@@std@@XZ virtual std::unique_ptr initBodyControl(); diff --git a/src/mc/world/actor/ai/goal/TradeWithPlayerDefinition.h b/src/mc/world/actor/ai/goal/TradeWithPlayerDefinition.h new file mode 100644 index 0000000000..44904bd02f --- /dev/null +++ b/src/mc/world/actor/ai/goal/TradeWithPlayerDefinition.h @@ -0,0 +1,32 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/json/JsonSchemaObjectNode.h" +#include "mc/world/actor/ai/goal/BaseGoalDefinition.h" + +// auto generated forward declare list +// clang-format off +namespace JsonUtil { class EmptyClass; } +// clang-format on + +class TradeWithPlayerDefinition : public ::BaseGoalDefinition { +public: + // prevent constructor by default + TradeWithPlayerDefinition& operator=(TradeWithPlayerDefinition const&); + TradeWithPlayerDefinition(TradeWithPlayerDefinition const&); + TradeWithPlayerDefinition(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1TradeWithPlayerDefinition@@UEAA@XZ + virtual ~TradeWithPlayerDefinition() = default; + + // symbol: + // ?buildSchema@TradeWithPlayerDefinition@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$shared_ptr@V?$JsonSchemaObjectNode@VEmptyClass@JsonUtil@@VTradeWithPlayerDefinition@@@JsonUtil@@@3@@Z + MCAPI static void + buildSchema(std::string const&, std::shared_ptr>&); + + // NOLINTEND +}; diff --git a/src/mc/world/actor/ai/goal/TradeWithPlayerGoal.h b/src/mc/world/actor/ai/goal/TradeWithPlayerGoal.h index 8cc69ac38f..b862375f60 100644 --- a/src/mc/world/actor/ai/goal/TradeWithPlayerGoal.h +++ b/src/mc/world/actor/ai/goal/TradeWithPlayerGoal.h @@ -3,48 +3,10 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/deps/json/JsonSchemaObjectNode.h" #include "mc/world/AutomaticID.h" -#include "mc/world/actor/ai/goal/BaseGoalDefinition.h" #include "mc/world/actor/ai/goal/Goal.h" -// auto generated forward declare list -// clang-format off -namespace JsonUtil { class EmptyClass; } -// clang-format on - class TradeWithPlayerGoal : public ::Goal { -public: - // TradeWithPlayerGoal inner types declare - // clang-format off - class TradeWithPlayerDefinition; - // clang-format on - - // TradeWithPlayerGoal inner types define - class TradeWithPlayerDefinition : public ::BaseGoalDefinition { - public: - // prevent constructor by default - TradeWithPlayerDefinition& operator=(TradeWithPlayerDefinition const&); - TradeWithPlayerDefinition(TradeWithPlayerDefinition const&); - TradeWithPlayerDefinition(); - - public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1TradeWithPlayerDefinition@TradeWithPlayerGoal@@UEAA@XZ - virtual ~TradeWithPlayerDefinition() = default; - - // symbol: - // ?buildSchema@TradeWithPlayerDefinition@TradeWithPlayerGoal@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$shared_ptr@V?$JsonSchemaObjectNode@VEmptyClass@JsonUtil@@VTradeWithPlayerDefinition@TradeWithPlayerGoal@@@JsonUtil@@@4@@Z - MCAPI static void buildSchema( - std::string const& name, - std::shared_ptr>& root - ); - - // NOLINTEND - }; - public: // prevent constructor by default TradeWithPlayerGoal& operator=(TradeWithPlayerGoal const&); diff --git a/src/mc/world/actor/animal/Allay.h b/src/mc/world/actor/animal/Allay.h index d016348fb0..8106171044 100644 --- a/src/mc/world/actor/animal/Allay.h +++ b/src/mc/world/actor/animal/Allay.h @@ -42,13 +42,13 @@ class Allay : public ::Mob { // vIndex: 10, symbol: __gen_??1Allay@@UEAA@XZ virtual ~Allay() = default; - // vIndex: 159, symbol: ?readAdditionalSaveData@Allay@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Allay@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Allay@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Allay@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 171, symbol: ?aiStep@Allay@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Allay@@UEAAXXZ virtual void aiStep(); // symbol: ??0Allay@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Animal.h b/src/mc/world/actor/animal/Animal.h index 9dec58eef4..999d02dde6 100644 --- a/src/mc/world/actor/animal/Animal.h +++ b/src/mc/world/actor/animal/Animal.h @@ -42,10 +42,10 @@ class Animal : public ::Mob { // vIndex: 10, symbol: ??1Animal@@UEAA@XZ virtual ~Animal(); - // vIndex: 75, symbol: ?isInvulnerableTo@Animal@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Animal@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 198, symbol: ?_getWalkTargetValue@Animal@@MEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Animal@@MEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); // symbol: ??0Animal@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Armadillo.h b/src/mc/world/actor/animal/Armadillo.h index dce5d5486d..9819d8d6cc 100644 --- a/src/mc/world/actor/animal/Armadillo.h +++ b/src/mc/world/actor/animal/Armadillo.h @@ -39,9 +39,12 @@ class Armadillo : public ::Animal { // vIndex: 10, symbol: __gen_??1Armadillo@@UEAA@XZ virtual ~Armadillo() = default; - // vIndex: 41, symbol: ?getShadowRadius@Armadillo@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Armadillo@@UEBAMXZ virtual float getShadowRadius() const; + // vIndex: 160, symbol: ?getHurtSound@Armadillo@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ + virtual ::Puv::Legacy::LevelSoundEvent getHurtSound(); + // symbol: ??0Armadillo@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z MCAPI Armadillo(class ActorDefinitionGroup*, struct ActorDefinitionIdentifier const&, class EntityContext&); diff --git a/src/mc/world/actor/animal/Axolotl.h b/src/mc/world/actor/animal/Axolotl.h index f5f3c98fa2..28398fe9e3 100644 --- a/src/mc/world/actor/animal/Axolotl.h +++ b/src/mc/world/actor/animal/Axolotl.h @@ -42,10 +42,10 @@ class Axolotl : public ::Animal { // vIndex: 10, symbol: __gen_??1Axolotl@@UEAA@XZ virtual ~Axolotl() = default; - // vIndex: 198, symbol: ?_getWalkTargetValue@Axolotl@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Axolotl@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 203, symbol: ?_getAdjustedAABBForSpawnCheck@Axolotl@@UEBA?AVAABB@@AEBV2@AEBVVec3@@@Z + // vIndex: 196, symbol: ?_getAdjustedAABBForSpawnCheck@Axolotl@@UEBA?AVAABB@@AEBV2@AEBVVec3@@@Z virtual class AABB _getAdjustedAABBForSpawnCheck(class AABB const& aabb, class Vec3 const& mobPos) const; // symbol: ??0Axolotl@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Bat.h b/src/mc/world/actor/animal/Bat.h index c36e9edca2..94c7b8811c 100644 --- a/src/mc/world/actor/animal/Bat.h +++ b/src/mc/world/actor/animal/Bat.h @@ -39,22 +39,19 @@ class Bat : public ::Mob { // vIndex: 10, symbol: __gen_??1Bat@@UEAA@XZ virtual ~Bat() = default; - // vIndex: 107, symbol: ?checkFallDamage@Bat@@MEAAXM_N0@Z - virtual void checkFallDamage(float, bool, bool); - - // vIndex: 158, symbol: ?_hurt@Bat@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Bat@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@Bat@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Bat@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Bat@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Bat@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& entityTag) const; - // vIndex: 172, symbol: ?pushActors@Bat@@UEAAXXZ + // vIndex: 166, symbol: ?pushActors@Bat@@UEAAXXZ virtual void pushActors(); - // vIndex: 201, symbol: ?newServerAiStep@Bat@@MEAAXXZ + // vIndex: 194, symbol: ?newServerAiStep@Bat@@MEAAXXZ virtual void newServerAiStep(); // symbol: ??0Bat@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Bee.h b/src/mc/world/actor/animal/Bee.h index 1dc38b9e4f..d5258d7209 100644 --- a/src/mc/world/actor/animal/Bee.h +++ b/src/mc/world/actor/animal/Bee.h @@ -42,7 +42,7 @@ class Bee : public ::Animal { // vIndex: 10, symbol: ??1Bee@@UEAA@XZ virtual ~Bee(); - // vIndex: 109, symbol: ?onSynchedDataUpdate@Bee@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Bee@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); // symbol: ??0Bee@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Camel.h b/src/mc/world/actor/animal/Camel.h index 52b38e5a3e..301084e916 100644 --- a/src/mc/world/actor/animal/Camel.h +++ b/src/mc/world/actor/animal/Camel.h @@ -42,13 +42,13 @@ class Camel : public ::Animal { // vIndex: 20, symbol: ?getInterpolatedRidingOffset@Camel@@UEBA?AVVec3@@MH@Z virtual class Vec3 getInterpolatedRidingOffset(float, int) const; - // vIndex: 29, symbol: ?normalTick@Camel@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Camel@@UEAAXXZ virtual void normalTick(); - // vIndex: 161, symbol: ?_playStepSound@Camel@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Camel@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const&, class Block const& onBlock); - // vIndex: 171, symbol: ?aiStep@Camel@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Camel@@UEAAXXZ virtual void aiStep(); // symbol: ??0Camel@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Cat.h b/src/mc/world/actor/animal/Cat.h index f9ee846ff8..a9399f406c 100644 --- a/src/mc/world/actor/animal/Cat.h +++ b/src/mc/world/actor/animal/Cat.h @@ -39,16 +39,16 @@ class Cat : public ::Animal { // vIndex: 10, symbol: __gen_??1Cat@@UEAA@XZ virtual ~Cat() = default; - // vIndex: 67, symbol: ?onTame@Cat@@UEAAXXZ + // vIndex: 66, symbol: ?onTame@Cat@@UEAAXXZ virtual void onTame(); - // vIndex: 74, symbol: ?getAmbientSound@Cat@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@Cat@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Cat@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Cat@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 171, symbol: ?aiStep@Cat@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Cat@@UEAAXXZ virtual void aiStep(); // symbol: ??0Cat@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Chicken.h b/src/mc/world/actor/animal/Chicken.h index 328d633a53..2f50054d63 100644 --- a/src/mc/world/actor/animal/Chicken.h +++ b/src/mc/world/actor/animal/Chicken.h @@ -39,10 +39,10 @@ class Chicken : public ::Animal { // vIndex: 10, symbol: __gen_??1Chicken@@UEAA@XZ virtual ~Chicken() = default; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Chicken@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Chicken@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams&); - // vIndex: 161, symbol: ?_playStepSound@Chicken@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Chicken@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); // symbol: ??0Chicken@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Dolphin.h b/src/mc/world/actor/animal/Dolphin.h index 99b6ed09ed..1a55ea1efa 100644 --- a/src/mc/world/actor/animal/Dolphin.h +++ b/src/mc/world/actor/animal/Dolphin.h @@ -42,16 +42,16 @@ class Dolphin : public ::WaterAnimal { // vIndex: 10, symbol: __gen_??1Dolphin@@UEAA@XZ virtual ~Dolphin() = default; - // vIndex: 112, symbol: ?canBePulledIntoVehicle@Dolphin@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@Dolphin@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 171, symbol: ?aiStep@Dolphin@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Dolphin@@UEAAXXZ virtual void aiStep(); - // vIndex: 193, symbol: ?createAIGoals@Dolphin@@UEAA_NXZ + // vIndex: 187, symbol: ?createAIGoals@Dolphin@@UEAA_NXZ virtual bool createAIGoals(); - // vIndex: 198, symbol: ?_getWalkTargetValue@Dolphin@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Dolphin@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); // symbol: ??0Dolphin@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Fish.h b/src/mc/world/actor/animal/Fish.h index e2ebd71372..b772818cd4 100644 --- a/src/mc/world/actor/animal/Fish.h +++ b/src/mc/world/actor/animal/Fish.h @@ -42,13 +42,13 @@ class Fish : public ::WaterAnimal { // vIndex: 10, symbol: ??1Fish@@UEAA@XZ virtual ~Fish(); - // vIndex: 32, symbol: ?startRiding@Fish@@UEAA_NAEAVActor@@@Z + // vIndex: 31, symbol: ?startRiding@Fish@@UEAA_NAEAVActor@@@Z virtual bool startRiding(class Actor&); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Fish@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Fish@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 193, symbol: ?createAIGoals@Fish@@UEAA_NXZ + // vIndex: 187, symbol: ?createAIGoals@Fish@@UEAA_NXZ virtual bool createAIGoals(); // symbol: ??0Fish@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/GlowSquid.h b/src/mc/world/actor/animal/GlowSquid.h index b1e1aa381a..9487fcbf24 100644 --- a/src/mc/world/actor/animal/GlowSquid.h +++ b/src/mc/world/actor/animal/GlowSquid.h @@ -39,19 +39,19 @@ class GlowSquid : public ::Squid { // vIndex: 10, symbol: __gen_??1GlowSquid@@UEAA@XZ virtual ~GlowSquid() = default; - // vIndex: 29, symbol: ?normalTick@GlowSquid@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@GlowSquid@@UEAAXXZ virtual void normalTick(); - // vIndex: 80, symbol: ?handleEntityEvent@GlowSquid@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@GlowSquid@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 158, symbol: ?_hurt@GlowSquid@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@GlowSquid@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 198, symbol: ?_getWalkTargetValue@GlowSquid@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@GlowSquid@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 204, symbol: ?_getInkSquirtSoundEvent@GlowSquid@@MEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 197, symbol: ?_getInkSquirtSoundEvent@GlowSquid@@MEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent _getInkSquirtSoundEvent() const; // symbol: ??0GlowSquid@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Goat.h b/src/mc/world/actor/animal/Goat.h index 7c487d8085..87d64951dd 100644 --- a/src/mc/world/actor/animal/Goat.h +++ b/src/mc/world/actor/animal/Goat.h @@ -42,25 +42,25 @@ class Goat : public ::Animal { // vIndex: 10, symbol: __gen_??1Goat@@UEAA@XZ virtual ~Goat() = default; - // vIndex: 74, symbol: ?getAmbientSound@Goat@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@Goat@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; - // vIndex: 80, symbol: ?handleEntityEvent@Goat@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Goat@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Goat@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Goat@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 159, symbol: ?readAdditionalSaveData@Goat@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Goat@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Goat@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Goat@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 166, symbol: ?getHurtSound@Goat@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 160, symbol: ?getHurtSound@Goat@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getHurtSound(); - // vIndex: 167, symbol: ?getDeathSound@Goat@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 161, symbol: ?getDeathSound@Goat@@UEAA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getDeathSound(); // symbol: ??0Goat@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Horse.h b/src/mc/world/actor/animal/Horse.h index 2b7c9f2101..7d550618ba 100644 --- a/src/mc/world/actor/animal/Horse.h +++ b/src/mc/world/actor/animal/Horse.h @@ -46,76 +46,76 @@ class Horse : public ::Animal { // vIndex: 20, symbol: ?getInterpolatedRidingOffset@Horse@@UEBA?AVVec3@@MH@Z virtual class Vec3 getInterpolatedRidingOffset(float a, int) const; - // vIndex: 41, symbol: ?getShadowRadius@Horse@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Horse@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 46, symbol: ?isImmobile@Horse@@UEBA_NXZ + // vIndex: 45, symbol: ?isImmobile@Horse@@UEBA_NXZ virtual bool isImmobile() const; - // vIndex: 68, symbol: ?onFailedTame@Horse@@UEAAXXZ + // vIndex: 67, symbol: ?onFailedTame@Horse@@UEAAXXZ virtual void onFailedTame(); - // vIndex: 69, symbol: ?setStanding@Horse@@UEAAX_N@Z + // vIndex: 68, symbol: ?setStanding@Horse@@UEAAX_N@Z virtual void setStanding(bool value); - // vIndex: 79, symbol: ?feed@Horse@@UEAAXH@Z + // vIndex: 78, symbol: ?feed@Horse@@UEAAXH@Z virtual void feed(int itemId); - // vIndex: 98, symbol: ?canFreeze@Horse@@UEBA_NXZ + // vIndex: 97, symbol: ?canFreeze@Horse@@UEBA_NXZ virtual bool canFreeze() const; - // vIndex: 106, symbol: ?getControllingPlayer@Horse@@UEBA?AUActorUniqueID@@XZ + // vIndex: 103, symbol: ?getControllingPlayer@Horse@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getControllingPlayer() const; - // vIndex: 108, symbol: ?causeFallDamageToActor@Horse@@MEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@Horse@@MEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 109, symbol: ?onSynchedDataUpdate@Horse@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Horse@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 128, symbol: ?openContainerComponent@Horse@@UEAAXAEAVPlayer@@@Z + // vIndex: 122, symbol: ?openContainerComponent@Horse@@UEAAXAEAVPlayer@@@Z virtual void openContainerComponent(class Player& player); - // vIndex: 143, symbol: ?die@Horse@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Horse@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& damagesource); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Horse@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Horse@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@Horse@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Horse@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float dmg, bool knock, bool ignite); - // vIndex: 161, symbol: ?_playStepSound@Horse@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Horse@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& _onBlock); - // vIndex: 181, symbol: ?getArmorValue@Horse@@UEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@Horse@@UEBAHXZ virtual int getArmorValue() const; - // vIndex: 204, symbol: ?setType@Horse@@UEAAXH@Z + // vIndex: 197, symbol: ?setType@Horse@@UEAAXH@Z virtual void setType(int i); - // vIndex: 205, symbol: ?getType@Horse@@UEBAHXZ + // vIndex: 198, symbol: ?getType@Horse@@UEBAHXZ virtual int getType() const; - // vIndex: 206, symbol: ?setHorseEating@Horse@@UEAAX_N@Z + // vIndex: 199, symbol: ?setHorseEating@Horse@@UEAAX_N@Z virtual void setHorseEating(bool state); - // vIndex: 207, symbol: ?getStandAnim@Horse@@UEBAMM@Z + // vIndex: 200, symbol: ?getStandAnim@Horse@@UEBAMM@Z virtual float getStandAnim(float a) const; - // vIndex: 208, symbol: ?isAdult@Horse@@UEBA_NXZ + // vIndex: 201, symbol: ?isAdult@Horse@@UEBA_NXZ virtual bool isAdult() const; - // vIndex: 209, symbol: ?isHorseEating@Horse@@UEBA_NXZ + // vIndex: 202, symbol: ?isHorseEating@Horse@@UEBA_NXZ virtual bool isHorseEating() const; - // vIndex: 210, symbol: ?isMouthOpen@Horse@@UEBA_NXZ + // vIndex: 203, symbol: ?isMouthOpen@Horse@@UEBA_NXZ virtual bool isMouthOpen() const; - // vIndex: 211, symbol: ?makeMad@Horse@@UEAAXXZ + // vIndex: 204, symbol: ?makeMad@Horse@@UEAAXXZ virtual void makeMad(); - // vIndex: 212, symbol: ?tameToPlayer@Horse@@UEAA_NAEAVPlayer@@_N@Z + // vIndex: 205, symbol: ?tameToPlayer@Horse@@UEAA_NAEAVPlayer@@_N@Z virtual bool tameToPlayer(class Player& player, bool tamingParticles); // symbol: ??0Horse@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/IronGolem.h b/src/mc/world/actor/animal/IronGolem.h index 0225b1cfef..4deaed7672 100644 --- a/src/mc/world/actor/animal/IronGolem.h +++ b/src/mc/world/actor/animal/IronGolem.h @@ -39,28 +39,28 @@ class IronGolem : public ::Mob { // vIndex: 10, symbol: __gen_??1IronGolem@@UEAA@XZ virtual ~IronGolem() = default; - // vIndex: 41, symbol: ?getShadowRadius@IronGolem@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@IronGolem@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 80, symbol: ?handleEntityEvent@IronGolem@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@IronGolem@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 143, symbol: ?die@IronGolem@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@IronGolem@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@IronGolem@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@IronGolem@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 161, symbol: ?_playStepSound@IronGolem@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@IronGolem@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); - // vIndex: 170, symbol: ?hurtEffects@IronGolem@@UEAAXAEBVActorDamageSource@@M_N1@Z + // vIndex: 164, symbol: ?hurtEffects@IronGolem@@UEAAXAEBVActorDamageSource@@M_N1@Z virtual void hurtEffects(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 171, symbol: ?aiStep@IronGolem@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@IronGolem@@UEAAXXZ virtual void aiStep(); - // vIndex: 180, symbol: ?doHurtTarget@IronGolem@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z + // vIndex: 174, symbol: ?doHurtTarget@IronGolem@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z virtual bool doHurtTarget(class Actor* target, ::ActorDamageCause const& cause); // symbol: ??0IronGolem@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Llama.h b/src/mc/world/actor/animal/Llama.h index 792a37c52e..cafec8f5d1 100644 --- a/src/mc/world/actor/animal/Llama.h +++ b/src/mc/world/actor/animal/Llama.h @@ -39,19 +39,19 @@ class Llama : public ::Animal { // vIndex: 10, symbol: __gen_??1Llama@@UEAA@XZ virtual ~Llama() = default; - // vIndex: 68, symbol: ?onFailedTame@Llama@@UEAAXXZ + // vIndex: 67, symbol: ?onFailedTame@Llama@@UEAAXXZ virtual void onFailedTame(); - // vIndex: 108, symbol: ?causeFallDamageToActor@Llama@@MEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@Llama@@MEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Llama@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Llama@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 161, symbol: ?_playStepSound@Llama@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Llama@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); - // vIndex: 181, symbol: ?getArmorValue@Llama@@UEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@Llama@@UEBAHXZ virtual int getArmorValue() const; // symbol: ??0Llama@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/MushroomCow.h b/src/mc/world/actor/animal/MushroomCow.h index a8d0a4a14a..e2f51f8096 100644 --- a/src/mc/world/actor/animal/MushroomCow.h +++ b/src/mc/world/actor/animal/MushroomCow.h @@ -39,7 +39,7 @@ class MushroomCow : public ::Animal { // vIndex: 10, symbol: __gen_??1MushroomCow@@UEAA@XZ virtual ~MushroomCow() = default; - // vIndex: 173, symbol: ?checkSpawnRules@MushroomCow@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@MushroomCow@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); // symbol: ??0MushroomCow@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Ocelot.h b/src/mc/world/actor/animal/Ocelot.h index b202ecb143..fcffec635d 100644 --- a/src/mc/world/actor/animal/Ocelot.h +++ b/src/mc/world/actor/animal/Ocelot.h @@ -39,7 +39,7 @@ class Ocelot : public ::Animal { // vIndex: 10, symbol: __gen_??1Ocelot@@UEAA@XZ virtual ~Ocelot() = default; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Ocelot@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Ocelot@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams&); // symbol: ??0Ocelot@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Panda.h b/src/mc/world/actor/animal/Panda.h index 0ad7b6f905..1e6f995b45 100644 --- a/src/mc/world/actor/animal/Panda.h +++ b/src/mc/world/actor/animal/Panda.h @@ -39,13 +39,13 @@ class Panda : public ::Animal { // vIndex: 10, symbol: __gen_??1Panda@@UEAA@XZ virtual ~Panda() = default; - // vIndex: 74, symbol: ?getAmbientSound@Panda@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@Panda@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@Panda@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Panda@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 196, symbol: ?setTransitioningSitting@Panda@@UEAAX_N@Z + // vIndex: 190, symbol: ?setTransitioningSitting@Panda@@UEAAX_N@Z virtual void setTransitioningSitting(bool value); // symbol: ??0Panda@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Parrot.h b/src/mc/world/actor/animal/Parrot.h index ff1a1fcc1e..8d947d581a 100644 --- a/src/mc/world/actor/animal/Parrot.h +++ b/src/mc/world/actor/animal/Parrot.h @@ -42,28 +42,28 @@ class Parrot : public ::Animal { // vIndex: 10, symbol: __gen_??1Parrot@@UEAA@XZ virtual ~Parrot() = default; - // vIndex: 41, symbol: ?getShadowRadius@Parrot@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Parrot@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 66, symbol: ?setSitting@Parrot@@UEAAX_N@Z + // vIndex: 65, symbol: ?setSitting@Parrot@@UEAAX_N@Z virtual void setSitting(bool value); - // vIndex: 73, symbol: ?playAmbientSound@Parrot@@UEAAXXZ + // vIndex: 72, symbol: ?playAmbientSound@Parrot@@UEAAXXZ virtual void playAmbientSound(); - // vIndex: 74, symbol: ?getAmbientSound@Parrot@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@Parrot@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; - // vIndex: 75, symbol: ?isInvulnerableTo@Parrot@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Parrot@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 112, symbol: ?canBePulledIntoVehicle@Parrot@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@Parrot@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 161, symbol: ?_playStepSound@Parrot@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Parrot@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); - // vIndex: 198, symbol: ?_getWalkTargetValue@Parrot@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Parrot@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); // symbol: ??0Parrot@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Pig.h b/src/mc/world/actor/animal/Pig.h index 20dce0934d..c379bd8de3 100644 --- a/src/mc/world/actor/animal/Pig.h +++ b/src/mc/world/actor/animal/Pig.h @@ -39,10 +39,10 @@ class Pig : public ::Animal { // vIndex: 10, symbol: __gen_??1Pig@@UEAA@XZ virtual ~Pig() = default; - // vIndex: 158, symbol: ?_hurt@Pig@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Pig@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float dmg, bool knock, bool ignite); - // vIndex: 161, symbol: ?_playStepSound@Pig@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Pig@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); // symbol: ??0Pig@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/PolarBear.h b/src/mc/world/actor/animal/PolarBear.h index 023f8354c0..41d2e87768 100644 --- a/src/mc/world/actor/animal/PolarBear.h +++ b/src/mc/world/actor/animal/PolarBear.h @@ -39,10 +39,10 @@ class PolarBear : public ::Animal { // vIndex: 10, symbol: __gen_??1PolarBear@@UEAA@XZ virtual ~PolarBear() = default; - // vIndex: 29, symbol: ?normalTick@PolarBear@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@PolarBear@@UEAAXXZ virtual void normalTick(); - // vIndex: 98, symbol: ?canFreeze@PolarBear@@UEBA_NXZ + // vIndex: 97, symbol: ?canFreeze@PolarBear@@UEBA_NXZ virtual bool canFreeze() const; // symbol: ??0PolarBear@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Pufferfish.h b/src/mc/world/actor/animal/Pufferfish.h index 2022fe365b..a3103dfe24 100644 --- a/src/mc/world/actor/animal/Pufferfish.h +++ b/src/mc/world/actor/animal/Pufferfish.h @@ -39,16 +39,16 @@ class Pufferfish : public ::Fish { // vIndex: 10, symbol: __gen_??1Pufferfish@@UEAA@XZ virtual ~Pufferfish() = default; - // vIndex: 29, symbol: ?normalTick@Pufferfish@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Pufferfish@@UEAAXXZ virtual void normalTick(); - // vIndex: 32, symbol: ?startRiding@Pufferfish@@UEAA_NAEAVActor@@@Z + // vIndex: 31, symbol: ?startRiding@Pufferfish@@UEAA_NAEAVActor@@@Z virtual bool startRiding(class Actor&); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Pufferfish@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Pufferfish@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@Pufferfish@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Pufferfish@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); // symbol: ??0Pufferfish@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Rabbit.h b/src/mc/world/actor/animal/Rabbit.h index 286c25d818..2cd6237264 100644 --- a/src/mc/world/actor/animal/Rabbit.h +++ b/src/mc/world/actor/animal/Rabbit.h @@ -39,10 +39,10 @@ class Rabbit : public ::Animal { // vIndex: 10, symbol: __gen_??1Rabbit@@UEAA@XZ virtual ~Rabbit() = default; - // vIndex: 109, symbol: ?onSynchedDataUpdate@Rabbit@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Rabbit@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Rabbit@@MEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Rabbit@@MEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); // symbol: ??0Rabbit@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Salmon.h b/src/mc/world/actor/animal/Salmon.h index c8391ee24e..7e4eab5160 100644 --- a/src/mc/world/actor/animal/Salmon.h +++ b/src/mc/world/actor/animal/Salmon.h @@ -39,7 +39,7 @@ class Salmon : public ::Fish { // vIndex: 10, symbol: __gen_??1Salmon@@UEAA@XZ virtual ~Salmon() = default; - // vIndex: 193, symbol: ?createAIGoals@Salmon@@UEAA_NXZ + // vIndex: 187, symbol: ?createAIGoals@Salmon@@UEAA_NXZ virtual bool createAIGoals(); // symbol: ??0Salmon@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Sheep.h b/src/mc/world/actor/animal/Sheep.h index 07b79989ef..c3d8f90eda 100644 --- a/src/mc/world/actor/animal/Sheep.h +++ b/src/mc/world/actor/animal/Sheep.h @@ -39,7 +39,7 @@ class Sheep : public ::Animal { // vIndex: 10, symbol: __gen_??1Sheep@@UEAA@XZ virtual ~Sheep() = default; - // vIndex: 80, symbol: ?handleEntityEvent@Sheep@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Sheep@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); // symbol: ??0Sheep@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Sniffer.h b/src/mc/world/actor/animal/Sniffer.h index a6b220dc2a..34d052f77f 100644 --- a/src/mc/world/actor/animal/Sniffer.h +++ b/src/mc/world/actor/animal/Sniffer.h @@ -39,7 +39,7 @@ class Sniffer : public ::Animal { // vIndex: 10, symbol: __gen_??1Sniffer@@UEAA@XZ virtual ~Sniffer() = default; - // vIndex: 74, symbol: ?getAmbientSound@Sniffer@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@Sniffer@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; // symbol: ??0Sniffer@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Squid.h b/src/mc/world/actor/animal/Squid.h index e4c289c331..fb5840e1d2 100644 --- a/src/mc/world/actor/animal/Squid.h +++ b/src/mc/world/actor/animal/Squid.h @@ -42,22 +42,22 @@ class Squid : public ::Mob { // vIndex: 10, symbol: ??1Squid@@UEAA@XZ virtual ~Squid(); - // vIndex: 80, symbol: ?handleEntityEvent@Squid@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Squid@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Squid@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Squid@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@Squid@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Squid@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 173, symbol: ?checkSpawnRules@Squid@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Squid@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 174, symbol: ?checkSpawnObstruction@Squid@@UEBA_NXZ + // vIndex: 168, symbol: ?checkSpawnObstruction@Squid@@UEBA_NXZ virtual bool checkSpawnObstruction() const; - // vIndex: 204, symbol: ?_getInkSquirtSoundEvent@Squid@@MEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 197, symbol: ?_getInkSquirtSoundEvent@Squid@@MEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent _getInkSquirtSoundEvent() const; // symbol: diff --git a/src/mc/world/actor/animal/Strider.h b/src/mc/world/actor/animal/Strider.h index ff4f868e13..0bd4f8a202 100644 --- a/src/mc/world/actor/animal/Strider.h +++ b/src/mc/world/actor/animal/Strider.h @@ -61,19 +61,19 @@ class Strider : public ::Animal { // vIndex: 10, symbol: __gen_??1Strider@@UEAA@XZ virtual ~Strider() = default; - // vIndex: 29, symbol: ?normalTick@Strider@@MEAAXXZ + // vIndex: 28, symbol: ?normalTick@Strider@@MEAAXXZ virtual void normalTick(); - // vIndex: 146, symbol: ?getNextStep@Strider@@MEAAMM@Z + // vIndex: 140, symbol: ?getNextStep@Strider@@MEAAMM@Z virtual float getNextStep(float); - // vIndex: 157, symbol: ?shouldTryMakeStepSound@Strider@@MEAA_NXZ + // vIndex: 151, symbol: ?shouldTryMakeStepSound@Strider@@MEAA_NXZ virtual bool shouldTryMakeStepSound(); - // vIndex: 161, symbol: ?_playStepSound@Strider@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Strider@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const&, class Block const& onBlock); - // vIndex: 198, symbol: ?_getWalkTargetValue@Strider@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Strider@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); // symbol: ??0Strider@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Tadpole.h b/src/mc/world/actor/animal/Tadpole.h index fe9ee2cd87..53e390b3bb 100644 --- a/src/mc/world/actor/animal/Tadpole.h +++ b/src/mc/world/actor/animal/Tadpole.h @@ -42,10 +42,10 @@ class Tadpole : public ::WaterAnimal { // vIndex: 10, symbol: __gen_??1Tadpole@@UEAA@XZ virtual ~Tadpole() = default; - // vIndex: 204, symbol: ?getFlopVerticalVelocityFactor@Tadpole@@UEBAMXZ + // vIndex: 197, symbol: ?getFlopVerticalVelocityFactor@Tadpole@@UEBAMXZ virtual float getFlopVerticalVelocityFactor() const; - // vIndex: 205, symbol: ?getFlopHorizontalVelocityFactor@Tadpole@@UEBAMXZ + // vIndex: 198, symbol: ?getFlopHorizontalVelocityFactor@Tadpole@@UEBAMXZ virtual float getFlopHorizontalVelocityFactor() const; // symbol: ??0Tadpole@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/TropicalFish.h b/src/mc/world/actor/animal/TropicalFish.h index 32fd8861b6..252120bc0e 100644 --- a/src/mc/world/actor/animal/TropicalFish.h +++ b/src/mc/world/actor/animal/TropicalFish.h @@ -43,16 +43,16 @@ class TropicalFish : public ::WaterAnimal { // vIndex: 10, symbol: __gen_??1TropicalFish@@UEAA@XZ virtual ~TropicalFish() = default; - // vIndex: 32, symbol: ?startRiding@TropicalFish@@UEAA_NAEAVActor@@@Z + // vIndex: 31, symbol: ?startRiding@TropicalFish@@UEAA_NAEAVActor@@@Z virtual bool startRiding(class Actor&); - // vIndex: 109, symbol: ?onSynchedDataUpdate@TropicalFish@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@TropicalFish@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@TropicalFish@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@TropicalFish@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 193, symbol: ?createAIGoals@TropicalFish@@UEAA_NXZ + // vIndex: 187, symbol: ?createAIGoals@TropicalFish@@UEAA_NXZ virtual bool createAIGoals(); // symbol: ??0TropicalFish@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Turtle.h b/src/mc/world/actor/animal/Turtle.h index 4c331098c6..dbecd74aa9 100644 --- a/src/mc/world/actor/animal/Turtle.h +++ b/src/mc/world/actor/animal/Turtle.h @@ -39,13 +39,13 @@ class Turtle : public ::Animal { // vIndex: 10, symbol: __gen_??1Turtle@@UEAA@XZ virtual ~Turtle() = default; - // vIndex: 41, symbol: ?getShadowRadius@Turtle@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Turtle@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 143, symbol: ?die@Turtle@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Turtle@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 198, symbol: ?_getWalkTargetValue@Turtle@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Turtle@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); // symbol: ??0Turtle@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/WaterAnimal.h b/src/mc/world/actor/animal/WaterAnimal.h index 9a02df32b7..af473758e0 100644 --- a/src/mc/world/actor/animal/WaterAnimal.h +++ b/src/mc/world/actor/animal/WaterAnimal.h @@ -39,13 +39,13 @@ class WaterAnimal : public ::Mob { // vIndex: 10, symbol: ??1WaterAnimal@@UEAA@XZ virtual ~WaterAnimal(); - // vIndex: 173, symbol: ?checkSpawnRules@WaterAnimal@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@WaterAnimal@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 204, symbol: ?getFlopVerticalVelocityFactor@WaterAnimal@@UEBAMXZ + // vIndex: 197, symbol: ?getFlopVerticalVelocityFactor@WaterAnimal@@UEBAMXZ virtual float getFlopVerticalVelocityFactor() const; - // vIndex: 205, symbol: ?getFlopHorizontalVelocityFactor@WaterAnimal@@UEBAMXZ + // vIndex: 198, symbol: ?getFlopHorizontalVelocityFactor@WaterAnimal@@UEBAMXZ virtual float getFlopHorizontalVelocityFactor() const; // symbol: ??0WaterAnimal@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animal/Wolf.h b/src/mc/world/actor/animal/Wolf.h index 737ffcc9c1..397e61d2aa 100644 --- a/src/mc/world/actor/animal/Wolf.h +++ b/src/mc/world/actor/animal/Wolf.h @@ -39,34 +39,34 @@ class Wolf : public ::Animal { // vIndex: 10, symbol: __gen_??1Wolf@@UEAA@XZ virtual ~Wolf() = default; - // vIndex: 66, symbol: ?setSitting@Wolf@@UEAAX_N@Z + // vIndex: 65, symbol: ?setSitting@Wolf@@UEAAX_N@Z virtual void setSitting(bool value); - // vIndex: 74, symbol: ?getAmbientSound@Wolf@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@Wolf@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; - // vIndex: 80, symbol: ?handleEntityEvent@Wolf@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Wolf@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 95, symbol: ?load@Wolf@@UEAA_NAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 94, symbol: ?load@Wolf@@UEAA_NAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual bool load(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 109, symbol: ?onSynchedDataUpdate@Wolf@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Wolf@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 158, symbol: ?_hurt@Wolf@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Wolf@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 179, symbol: ?isAlliedTo@Wolf@@UEAA_NPEAVMob@@@Z + // vIndex: 173, symbol: ?isAlliedTo@Wolf@@UEAA_NPEAVMob@@@Z virtual bool isAlliedTo(class Mob* other); - // vIndex: 181, symbol: ?getArmorValue@Wolf@@UEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@Wolf@@UEBAHXZ virtual int getArmorValue() const; - // vIndex: 194, symbol: ?onBorn@Wolf@@UEAAXAEAVActor@@0@Z + // vIndex: 188, symbol: ?onBorn@Wolf@@UEAAXAEAVActor@@0@Z virtual void onBorn(class Actor& parentLeft, class Actor& parentRight); - // vIndex: 201, symbol: ?newServerAiStep@Wolf@@UEAAXXZ + // vIndex: 194, symbol: ?newServerAiStep@Wolf@@UEAAXXZ virtual void newServerAiStep(); // symbol: ??0Wolf@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/animation/ParticleProvider.h b/src/mc/world/actor/animation/ParticleProvider.h index 4aa2529e0d..392eecac5b 100644 --- a/src/mc/world/actor/animation/ParticleProvider.h +++ b/src/mc/world/actor/animation/ParticleProvider.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/deps/core/common/bedrock/pubsub/Connector.h" #include "mc/enums/ParticleType.h" class ParticleProvider { @@ -10,10 +11,42 @@ class ParticleProvider { // prevent constructor by default ParticleProvider& operator=(ParticleProvider const&); ParticleProvider(ParticleProvider const&); - ParticleProvider(); public: // NOLINTBEGIN + // vIndex: 0, symbol: ??1ParticleProvider@@UEAA@XZ + virtual ~ParticleProvider(); + + // vIndex: 1, symbol: + // ?getSendServerLegacyParticleConnector@ParticleProvider@@UEAAAEAV?$Connector@$$A6AXW4ParticleType@@AEBVVec3@@1H@Z@PubSub@Bedrock@@XZ + virtual class Bedrock::PubSub::Connector& + getSendServerLegacyParticleConnector(); + + // vIndex: 2, symbol: + // ?getAddTerrainParticleEffectConnector@ParticleProvider@@UEAAAEAV?$Connector@$$A6AXAEBVBlockPos@@AEBVBlock@@AEBVVec3@@MMM@Z@PubSub@Bedrock@@XZ + virtual class Bedrock::PubSub::Connector< + void(class BlockPos const&, class Block const&, class Vec3 const&, float, float, float)>& + getAddTerrainParticleEffectConnector(); + + // vIndex: 3, symbol: + // ?getAddTerrainSlideEffectConnector@ParticleProvider@@UEAAAEAV?$Connector@$$A6AXAEBVBlockPos@@AEBVBlock@@AEBVVec3@@MMM@Z@PubSub@Bedrock@@XZ + virtual class Bedrock::PubSub::Connector< + void(class BlockPos const&, class Block const&, class Vec3 const&, float, float, float)>& + getAddTerrainSlideEffectConnector(); + + // vIndex: 4, symbol: + // ?getAddBreakingItemParticleEffectConnector@ParticleProvider@@UEAAAEAV?$Connector@$$A6AXAEBVVec3@@W4ParticleType@@AEBUResolvedItemIconInfo@@@Z@PubSub@Bedrock@@XZ + virtual class Bedrock::PubSub::Connector< + void(class Vec3 const&, ::ParticleType, struct ResolvedItemIconInfo const&)>& + getAddBreakingItemParticleEffectConnector(); + + // symbol: ??0ParticleProvider@@QEAA@XZ + MCAPI ParticleProvider(); + + // symbol: + // ?addBreakingItemParticleEffect@ParticleProvider@@QEAAXAEBVVec3@@W4ParticleType@@AEBUResolvedItemIconInfo@@@Z + MCAPI void addBreakingItemParticleEffect(class Vec3 const&, ::ParticleType, struct ResolvedItemIconInfo const&); + // symbol: ?addParticle@ParticleProvider@@QEAAPEAVParticle@@W4ParticleType@@AEBVVec3@@1HPEBVCompoundTag@@_N@Z MCAPI class Particle* addParticle( ::ParticleType type, @@ -31,8 +64,15 @@ class ParticleProvider { class MolangVariableMap const& molangVariables ); - // symbol: ??1ParticleProvider@@QEAA@XZ - MCAPI ~ParticleProvider(); + // symbol: ?addTerrainParticleEffect@ParticleProvider@@QEAAXAEBVBlockPos@@AEBVBlock@@AEBVVec3@@MMM@Z + MCAPI void + addTerrainParticleEffect(class BlockPos const&, class Block const&, class Vec3 const&, float, float, float); + + // symbol: ?addTerrainSlideEffect@ParticleProvider@@QEAAXAEBVBlockPos@@AEBVBlock@@AEBVVec3@@MMM@Z + MCAPI void addTerrainSlideEffect(class BlockPos const&, class Block const&, class Vec3 const&, float, float, float); + + // symbol: ?sendServerLegacyParticle@ParticleProvider@@QEAAXW4ParticleType@@AEBVVec3@@1H@Z + MCAPI void sendServerLegacyParticle(::ParticleType, class Vec3 const&, class Vec3 const&, int); // NOLINTEND }; diff --git a/src/mc/world/actor/bhave/definition/WindBurstDefinition.h b/src/mc/world/actor/bhave/definition/WindBurstDefinition.h new file mode 100644 index 0000000000..ea12d8f163 --- /dev/null +++ b/src/mc/world/actor/bhave/definition/WindBurstDefinition.h @@ -0,0 +1,40 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/json/JsonSchemaObjectNode.h" + +// auto generated forward declare list +// clang-format off +namespace JsonUtil { class EmptyClass; } +// clang-format on + +class WindBurstDefinition { +public: + // prevent constructor by default + WindBurstDefinition& operator=(WindBurstDefinition const&); + WindBurstDefinition(WindBurstDefinition const&); + WindBurstDefinition(); + +public: + // NOLINTBEGIN + // symbol: ?initialize@WindBurstDefinition@@QEBAXAEAVEntityContext@@AEAUWindBurstComponent@@@Z + MCAPI void initialize(class EntityContext&, struct WindBurstComponent&) const; + + // symbol: + // ?setParticleDefinitionByName@WindBurstDefinition@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI void setParticleDefinitionByName(std::string const&); + + // symbol: + // ?setSoundDefinitionByName@WindBurstDefinition@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI void setSoundDefinitionByName(std::string const&); + + // symbol: + // ?buildSchema@WindBurstDefinition@@SAXAEAV?$shared_ptr@V?$JsonSchemaObjectNode@VEmptyClass@JsonUtil@@VWindBurstDefinition@@@JsonUtil@@@std@@@Z + MCAPI static void + buildSchema(std::shared_ptr< + class JsonUtil::JsonSchemaObjectNode>&); + + // NOLINTEND +}; diff --git a/src/mc/world/actor/boss/WitherBoss.h b/src/mc/world/actor/boss/WitherBoss.h index 2a94a054aa..fe14bb74a6 100644 --- a/src/mc/world/actor/boss/WitherBoss.h +++ b/src/mc/world/actor/boss/WitherBoss.h @@ -58,49 +58,49 @@ class WitherBoss : public ::Monster { // vIndex: 15, symbol: ?getFiringPos@WitherBoss@@UEBA?AVVec3@@XZ virtual class Vec3 getFiringPos() const; - // vIndex: 32, symbol: ?startRiding@WitherBoss@@UEAA_NAEAVActor@@@Z + // vIndex: 31, symbol: ?startRiding@WitherBoss@@UEAA_NAEAVActor@@@Z virtual bool startRiding(class Actor&); - // vIndex: 75, symbol: ?isInvulnerableTo@WitherBoss@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@WitherBoss@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 80, symbol: ?handleEntityEvent@WitherBoss@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@WitherBoss@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 98, symbol: ?canFreeze@WitherBoss@@UEBA_NXZ + // vIndex: 97, symbol: ?canFreeze@WitherBoss@@UEBA_NXZ virtual bool canFreeze() const; - // vIndex: 108, symbol: ?causeFallDamageToActor@WitherBoss@@UEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@WitherBoss@@UEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 121, symbol: ?canBeAffected@WitherBoss@@UEBA_NI@Z + // vIndex: 117, symbol: ?canBeAffected@WitherBoss@@UEBA_NI@Z virtual bool canBeAffected(uint effectId) const; - // vIndex: 122, symbol: ?canBeAffectedByArrow@WitherBoss@@UEBA_NAEBVMobEffectInstance@@@Z + // vIndex: 118, symbol: ?canBeAffectedByArrow@WitherBoss@@UEBA_NAEBVMobEffectInstance@@@Z virtual bool canBeAffectedByArrow(class MobEffectInstance const& effect) const; - // vIndex: 143, symbol: ?die@WitherBoss@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@WitherBoss@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 158, symbol: ?_hurt@WitherBoss@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@WitherBoss@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@WitherBoss@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@WitherBoss@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@WitherBoss@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@WitherBoss@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 170, symbol: ?hurtEffects@WitherBoss@@UEAAXAEBVActorDamageSource@@M_N1@Z + // vIndex: 164, symbol: ?hurtEffects@WitherBoss@@UEAAXAEBVActorDamageSource@@M_N1@Z virtual void hurtEffects(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 171, symbol: ?aiStep@WitherBoss@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@WitherBoss@@UEAAXXZ virtual void aiStep(); - // vIndex: 181, symbol: ?getArmorValue@WitherBoss@@UEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@WitherBoss@@UEBAHXZ virtual int getArmorValue() const; - // vIndex: 201, symbol: ?newServerAiStep@WitherBoss@@UEAAXXZ + // vIndex: 194, symbol: ?newServerAiStep@WitherBoss@@UEAAXXZ virtual void newServerAiStep(); // symbol: ??0WitherBoss@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z @@ -116,8 +116,8 @@ class WitherBoss : public ::Monster { // symbol: ?getHeadPos@WitherBoss@@QEBA?AVVec3@@H@Z MCAPI class Vec3 getHeadPos(int headID) const; - // symbol: ?getHeadRot@WitherBoss@@QEAA?AVVec2@@H@Z - MCAPI class Vec2 getHeadRot(int headID); + // symbol: ?getHeadRot@WitherBoss@@QEBA?AVVec2@@H@Z + MCAPI class Vec2 getHeadRot(int headID) const; // symbol: ?getInvulnerableTicks@WitherBoss@@QEBAHXZ MCAPI int getInvulnerableTicks() const; diff --git a/src/mc/world/actor/common/CameraInstructionSender.h b/src/mc/world/actor/common/CameraInstructionSender.h new file mode 100644 index 0000000000..f72f73d260 --- /dev/null +++ b/src/mc/world/actor/common/CameraInstructionSender.h @@ -0,0 +1,14 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace CameraInstructionSender { +// NOLINTBEGIN +// symbol: ?sendInstruction@CameraInstructionSender@@YAXAEAVPacketSender@@AEAVEntityContext@@AEBUCameraInstruction@@@Z +MCAPI void sendInstruction(class PacketSender&, class EntityContext&, struct CameraInstruction const&); + +// symbol: ?updateCameraComponentsOnEntity@CameraInstructionSender@@YAXAEAVEntityContext@@AEBUCameraInstruction@@@Z +MCAPI void updateCameraComponentsOnEntity(class EntityContext&, struct CameraInstruction const&); +// NOLINTEND + +}; // namespace CameraInstructionSender diff --git a/src/mc/world/actor/common/GameplayUserManager.h b/src/mc/world/actor/common/GameplayUserManager.h index 4103bf514e..31722e0ff5 100644 --- a/src/mc/world/actor/common/GameplayUserManager.h +++ b/src/mc/world/actor/common/GameplayUserManager.h @@ -4,15 +4,13 @@ // auto generated inclusion list #include "mc/common/wrapper/OwnerPtr.h" -#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" // auto generated forward declare list // clang-format off -namespace Bedrock { class EnableNonOwnerReferences; } namespace Bedrock::PubSub { class Subscription; } // clang-format on -class GameplayUserManager : public ::Bedrock::EnableNonOwnerReferences { +class GameplayUserManager { public: // prevent constructor by default GameplayUserManager& operator=(GameplayUserManager const&); @@ -20,9 +18,6 @@ class GameplayUserManager : public ::Bedrock::EnableNonOwnerReferences { public: // NOLINTBEGIN - // vIndex: 0, symbol: ??1GameplayUserManager@@UEAA@XZ - virtual ~GameplayUserManager(); - // symbol: ??0GameplayUserManager@@QEAA@XZ MCAPI GameplayUserManager(); @@ -116,6 +111,9 @@ class GameplayUserManager : public ::Bedrock::EnableNonOwnerReferences { // symbol: ?tickSuspensions@GameplayUserManager@@QEAAXXZ MCAPI void tickSuspensions(); + // symbol: ??1GameplayUserManager@@QEAA@XZ + MCAPI ~GameplayUserManager(); + // NOLINTEND // private: diff --git a/src/mc/world/actor/components/AutonomousActorManager.h b/src/mc/world/actor/components/AutonomousActorManager.h index a54c7af752..127b525e36 100644 --- a/src/mc/world/actor/components/AutonomousActorManager.h +++ b/src/mc/world/actor/components/AutonomousActorManager.h @@ -4,8 +4,8 @@ // auto generated inclusion list #include "mc/common/wrapper/OwnerPtr.h" +#include "mc/common/wrapper/StackRefResult.h" #include "mc/common/wrapper/WeakRef.h" -#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" class AutonomousActorManager { public: @@ -32,17 +32,17 @@ class AutonomousActorManager { MCAPI bool hasOwnedInactiveAutonomousActorWithUniqueID(struct ActorUniqueID actorUniqueID) const; // symbol: - // ?initializeWithActorManager@AutonomousActorManager@@QEAAXV?$not_null@V?$NonOwnerPointer@VActorManager@@@Bedrock@@@gsl@@@Z - MCAPI void initializeWithActorManager(Bedrock::NotNullNonOwnerPtr); + // ?initializeWithActorManager@AutonomousActorManager@@QEAAXAEBV?$not_null@V?$StackRefResult@VActorManager@@@@@gsl@@@Z + MCAPI void initializeWithActorManager(gsl::not_null> const&); // symbol: ?loadAutonomousActorsFromDisk@AutonomousActorManager@@QEAAXAEAVLevelStorage@@AEAVActorFactory@@@Z MCAPI void loadAutonomousActorsFromDisk(class LevelStorage&, class ActorFactory&); - // symbol: ?onChunkDiscarded@AutonomousActorManager@@QEAAXAEAVLevelChunk@@@Z - MCAPI void onChunkDiscarded(class LevelChunk& levelChunk); + // symbol: ?onLevelTearingDown@AutonomousActorManager@@QEAAXXZ + MCAPI void onLevelTearingDown(); - // symbol: ?onChunkLoaded@AutonomousActorManager@@QEAAXAEAVLevelChunk@@@Z - MCAPI void onChunkLoaded(class LevelChunk& levelChunk); + // symbol: ?registerForLevelChunkEvents@AutonomousActorManager@@QEAAXAEAVILevelChunkEventManagerConnector@@@Z + MCAPI void registerForLevelChunkEvents(class ILevelChunkEventManagerConnector&); // symbol: ?registerLevelStorageManagerListener@AutonomousActorManager@@QEAAXAEAVLevelStorageManager@@@Z MCAPI void registerLevelStorageManagerListener(class LevelStorageManager&); @@ -63,6 +63,9 @@ class AutonomousActorManager { // symbol: ?_moveActiveAutonomousActorEntityToInactive@AutonomousActorManager@@AEAAXAEAVActor@@AEAVLevelChunk@@@Z MCAPI void _moveActiveAutonomousActorEntityToInactive(class Actor& actor, class LevelChunk& levelChunk); + // symbol: ?_onChunkDiscarded@AutonomousActorManager@@AEAAXAEAVLevelChunk@@@Z + MCAPI void _onChunkDiscarded(class LevelChunk&); + // symbol: ?_onRemoveActorEntityReferences@AutonomousActorManager@@AEAAXAEAVActor@@@Z MCAPI void _onRemoveActorEntityReferences(class Actor& actor); diff --git a/src/mc/world/actor/components/DeserializeArgs.h b/src/mc/world/actor/components/DeserializeArgs.h new file mode 100644 index 0000000000..544ef110dc --- /dev/null +++ b/src/mc/world/actor/components/DeserializeArgs.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace SynchedActorDataSerializer { + +struct DeserializeArgs { +public: + // prevent constructor by default + DeserializeArgs& operator=(DeserializeArgs const&); + DeserializeArgs(DeserializeArgs const&); + DeserializeArgs(); +}; + +}; // namespace SynchedActorDataSerializer diff --git a/src/mc/world/actor/components/SynchedActorDataAccess.h b/src/mc/world/actor/components/SynchedActorDataAccess.h index 91ccd6c200..19b76f6074 100644 --- a/src/mc/world/actor/components/SynchedActorDataAccess.h +++ b/src/mc/world/actor/components/SynchedActorDataAccess.h @@ -10,6 +10,12 @@ namespace SynchedActorDataAccess { // symbol: ?getActorFlag@SynchedActorDataAccess@@YA_NAEBVEntityContext@@W4ActorFlags@@@Z MCAPI bool getActorFlag(class EntityContext const&, ::ActorFlags); +// symbol: ?getBoundingBoxScale@SynchedActorDataAccess@@YAMAEBVEntityContext@@@Z +MCAPI float getBoundingBoxScale(class EntityContext const&); + +// symbol: ?getBoundingBoxSize@SynchedActorDataAccess@@YA?AVVec2@@AEBVEntityContext@@@Z +MCAPI class Vec2 getBoundingBoxSize(class EntityContext const&); + // symbol: ?getControllingSeatIndex@SynchedActorDataAccess@@YAHAEBVEntityContext@@@Z MCAPI int getControllingSeatIndex(class EntityContext const&); @@ -42,6 +48,18 @@ MCAPI void setActorFlag(struct ActorDataFlagComponent&, struct ActorDataDirtyFla // ?setActorFlags@SynchedActorDataAccess@@YAXAEAUActorDataFlagComponent@@AEAUActorDataDirtyFlagsComponent@@AEBV?$bitset@$0HG@@std@@@Z MCAPI void setActorFlags(struct ActorDataFlagComponent&, struct ActorDataDirtyFlagsComponent&, std::bitset<118> const&); +// symbol: ?setBoundingBoxScale@SynchedActorDataAccess@@YAXAEAVEntityContext@@M@Z +MCAPI void setBoundingBoxScale(class EntityContext&, float); + +// symbol: +// ?setBoundingBoxScale@SynchedActorDataAccess@@YAXAEAUActorDataBoundingBoxComponent@@AEAUActorDataDirtyFlagsComponent@@M@Z +MCAPI void setBoundingBoxScale(struct ActorDataBoundingBoxComponent&, struct ActorDataDirtyFlagsComponent&, float); + +// symbol: +// ?setBoundingBoxSize@SynchedActorDataAccess@@YAXAEAUActorDataBoundingBoxComponent@@AEAUActorDataDirtyFlagsComponent@@MM@Z +MCAPI void +setBoundingBoxSize(struct ActorDataBoundingBoxComponent&, struct ActorDataDirtyFlagsComponent&, float, float); + // symbol: ?setControllingSeatIndex@SynchedActorDataAccess@@YAXAEAVEntityContext@@C@Z MCAPI void setControllingSeatIndex(class EntityContext&, schar); @@ -59,6 +77,19 @@ MCAPI void setJumpDuration(struct ActorDataJumpDurationComponent&, struct ActorD // symbol: // ?setSeatOffset@SynchedActorDataAccess@@YAXAEAUActorDataSeatOffsetComponent@@AEAUActorDataDirtyFlagsComponent@@AEBVVec3@@@Z MCAPI void setSeatOffset(struct ActorDataSeatOffsetComponent&, struct ActorDataDirtyFlagsComponent&, class Vec3 const&); + +// symbol: +// ?setValue@SynchedActorDataAccess@@YAXAEAUActorDataBoundingBoxComponent@@AEAUActorDataDirtyFlagsComponent@@AEBV?$array@M$02@std@@@Z +MCAPI void +setValue(struct ActorDataBoundingBoxComponent&, struct ActorDataDirtyFlagsComponent&, std::array const&); + +// symbol: +// ?setValue@SynchedActorDataAccess@@YAXAEAUActorDataJumpDurationComponent@@AEAUActorDataDirtyFlagsComponent@@C@Z +MCAPI void setValue(struct ActorDataJumpDurationComponent&, struct ActorDataDirtyFlagsComponent&, schar); + +// symbol: +// ?setValue@SynchedActorDataAccess@@YAXAEAUActorDataSeatOffsetComponent@@AEAUActorDataDirtyFlagsComponent@@AEBVVec3@@@Z +MCAPI void setValue(struct ActorDataSeatOffsetComponent&, struct ActorDataDirtyFlagsComponent&, class Vec3 const&); // NOLINTEND }; // namespace SynchedActorDataAccess diff --git a/src/mc/world/actor/components/VersionedActorDamageCause.h b/src/mc/world/actor/components/VersionedActorDamageCause.h index eb58a391d5..12048e3601 100644 --- a/src/mc/world/actor/components/VersionedActorDamageCause.h +++ b/src/mc/world/actor/components/VersionedActorDamageCause.h @@ -19,9 +19,16 @@ class VersionedActorDamageCause { public: // NOLINTBEGIN + // symbol: + // ??0VersionedActorDamageCause@@QEAA@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4ActorDamageCause@@UVersion@Scripting@@V?$optional@E@2@@Z + MCAPI VersionedActorDamageCause(std::string, ::ActorDamageCause, struct Scripting::Version, std::optional); + // symbol: ?getCause@VersionedActorDamageCause@@QEBA?AW4ActorDamageCause@@XZ MCAPI ::ActorDamageCause getCause() const; + // symbol: ?getDeprecatedMajorVersion@VersionedActorDamageCause@@QEBA?AV?$optional@E@std@@XZ + MCAPI std::optional getDeprecatedMajorVersion() const; + // symbol: // ?getName@VersionedActorDamageCause@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCAPI std::string const& getName() const; diff --git a/src/mc/world/actor/global/LightningBolt.h b/src/mc/world/actor/global/LightningBolt.h index f2cca92743..c06574a4e1 100644 --- a/src/mc/world/actor/global/LightningBolt.h +++ b/src/mc/world/actor/global/LightningBolt.h @@ -46,19 +46,19 @@ class LightningBolt : public ::Actor { // vIndex: 10, symbol: __gen_??1LightningBolt@@UEAA@XZ virtual ~LightningBolt() = default; - // vIndex: 29, symbol: ?normalTick@LightningBolt@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@LightningBolt@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@LightningBolt@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@LightningBolt@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@LightningBolt@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@LightningBolt@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@LightningBolt@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@LightningBolt@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?shouldAlwaysRender@LightningBolt@@UEAA_NXZ + // vIndex: 157, symbol: ?shouldAlwaysRender@LightningBolt@@UEAA_NXZ virtual bool shouldAlwaysRender(); // symbol: ??0LightningBolt@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/Balloon.h b/src/mc/world/actor/item/Balloon.h index e1a9027ec6..6e324bab51 100644 --- a/src/mc/world/actor/item/Balloon.h +++ b/src/mc/world/actor/item/Balloon.h @@ -45,10 +45,10 @@ class Balloon : public ::PredictableProjectile { // vIndex: 13, symbol: ?remove@Balloon@@UEAAXXZ virtual void remove(); - // vIndex: 48, symbol: ?isPickable@Balloon@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Balloon@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 158, symbol: ?_hurt@Balloon@@UEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Balloon@@UEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); // symbol: ??0Balloon@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/Boat.h b/src/mc/world/actor/item/Boat.h index 00dd89956c..4f36adadf3 100644 --- a/src/mc/world/actor/item/Boat.h +++ b/src/mc/world/actor/item/Boat.h @@ -15,7 +15,6 @@ #include "mc/enums/InputMode.h" #include "mc/enums/MaterialType.h" #include "mc/enums/NewInteractionModel.h" -#include "mc/enums/Side.h" #include "mc/events/ActorEvent.h" #include "mc/events/LevelSoundEvent.h" #include "mc/server/commands/CommandPermissionLevel.h" @@ -46,38 +45,35 @@ class Boat : public ::Actor { // vIndex: 10, symbol: __gen_??1Boat@@UEAA@XZ virtual ~Boat() = default; - // vIndex: 23, symbol: ?breaksFallingBlocks@Boat@@UEBA_NXZ - virtual bool breaksFallingBlocks() const; - - // vIndex: 29, symbol: ?normalTick@Boat@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Boat@@UEAAXXZ virtual void normalTick(); - // vIndex: 34, symbol: + // vIndex: 33, symbol: // ?getExitTip@Boat@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV23@W4InputMode@@W4NewInteractionModel@@@Z virtual std::string getExitTip(std::string const& kind, ::InputMode mode, ::NewInteractionModel) const; - // vIndex: 41, symbol: ?getShadowRadius@Boat@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Boat@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@Boat@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Boat@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 75, symbol: ?isInvulnerableTo@Boat@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Boat@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 106, symbol: ?getControllingPlayer@Boat@@UEBA?AUActorUniqueID@@XZ + // vIndex: 103, symbol: ?getControllingPlayer@Boat@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getControllingPlayer() const; - // vIndex: 110, symbol: ?canAddPassenger@Boat@@UEBA_NAEAVActor@@@Z + // vIndex: 106, symbol: ?canAddPassenger@Boat@@UEBA_NAEAVActor@@@Z virtual bool canAddPassenger(class Actor&) const; - // vIndex: 133, symbol: ?getPassengerYRotation@Boat@@UEBAMAEBVActor@@@Z + // vIndex: 127, symbol: ?getPassengerYRotation@Boat@@UEBAMAEBVActor@@@Z virtual float getPassengerYRotation(class Actor const&) const; - // vIndex: 158, symbol: ?_hurt@Boat@@EEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Boat@@EEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 163, symbol: ?destroy@Boat@@UEAAXPEAVActor@@@Z + // vIndex: 157, symbol: ?destroy@Boat@@UEAAXPEAVActor@@@Z virtual void destroy(class Actor* source); // symbol: ??0Boat@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z @@ -93,8 +89,5 @@ class Boat : public ::Actor { // symbol: ?postNormalTick@Boat@@QEAAXXZ MCAPI void postNormalTick(); - // symbol: ?setRowingTime@Boat@@QEAAXW4Side@@M@Z - MCAPI void setRowingTime(::Side side, float time); - // NOLINTEND }; diff --git a/src/mc/world/actor/item/BrushableBlock.h b/src/mc/world/actor/item/BrushableBlock.h index 23c3b64411..5a03ffa7b0 100644 --- a/src/mc/world/actor/item/BrushableBlock.h +++ b/src/mc/world/actor/item/BrushableBlock.h @@ -41,32 +41,26 @@ class BrushableBlock : public ::FallingBlock { // vIndex: 81, symbol: ?canBeFertilized@BrushableBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual bool canBeFertilized(class BlockSource&, class BlockPos const&, class Block const& aboveBlock) const; - // vIndex: 96, symbol: ?asItemInstance@BrushableBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BrushableBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const* blockActor) const; - // vIndex: 129, symbol: ?getVariant@BrushableBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BrushableBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 136, symbol: ?init@BrushableBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@BrushableBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 150, symbol: ?tick@BrushableBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BrushableBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 163, symbol: ?getResourceItem@BrushableBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@BrushableBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - - // vIndex: 168, symbol: ?getDustColor@BrushableBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@BrushableBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const&) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@BrushableBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; - // vIndex: 171, symbol: ?onLand@BrushableBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 166, symbol: ?onLand@BrushableBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onLand(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0BrushableBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/actor/item/ChestBoat.h b/src/mc/world/actor/item/ChestBoat.h index 690be090ef..79fde9fc97 100644 --- a/src/mc/world/actor/item/ChestBoat.h +++ b/src/mc/world/actor/item/ChestBoat.h @@ -39,14 +39,14 @@ class ChestBoat : public ::Boat { // vIndex: 10, symbol: __gen_??1ChestBoat@@UEAA@XZ virtual ~ChestBoat() = default; - // vIndex: 35, symbol: + // vIndex: 34, symbol: // ?getEntityLocNameString@ChestBoat@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getEntityLocNameString() const; - // vIndex: 142, symbol: ?kill@ChestBoat@@UEAAXXZ + // vIndex: 136, symbol: ?kill@ChestBoat@@UEAAXXZ virtual void kill(); - // vIndex: 163, symbol: ?destroy@ChestBoat@@UEAAXPEAVActor@@@Z + // vIndex: 157, symbol: ?destroy@ChestBoat@@UEAAXPEAVActor@@@Z virtual void destroy(class Actor* sourceActor); // symbol: ??0ChestBoat@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/ExperienceOrb.h b/src/mc/world/actor/item/ExperienceOrb.h index e1624ec91d..5dd8fe5515 100644 --- a/src/mc/world/actor/item/ExperienceOrb.h +++ b/src/mc/world/actor/item/ExperienceOrb.h @@ -46,28 +46,28 @@ class ExperienceOrb : public ::Actor { // vIndex: 10, symbol: __gen_??1ExperienceOrb@@UEAA@XZ virtual ~ExperienceOrb() = default; - // vIndex: 41, symbol: ?getShadowRadius@ExperienceOrb@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@ExperienceOrb@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 45, symbol: ?playerTouch@ExperienceOrb@@UEAAXAEAVPlayer@@@Z + // vIndex: 44, symbol: ?playerTouch@ExperienceOrb@@UEAAXAEAVPlayer@@@Z virtual void playerTouch(class Player& player); - // vIndex: 75, symbol: ?isInvulnerableTo@ExperienceOrb@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@ExperienceOrb@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 153, symbol: ?doWaterSplashEffect@ExperienceOrb@@MEAAXXZ + // vIndex: 147, symbol: ?doWaterSplashEffect@ExperienceOrb@@MEAAXXZ virtual void doWaterSplashEffect(); - // vIndex: 158, symbol: ?_hurt@ExperienceOrb@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@ExperienceOrb@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@ExperienceOrb@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@ExperienceOrb@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@ExperienceOrb@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@ExperienceOrb@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 161, symbol: ?_playStepSound@ExperienceOrb@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@ExperienceOrb@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); // symbol: ??0ExperienceOrb@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/EyeOfEnder.h b/src/mc/world/actor/item/EyeOfEnder.h index d701cdc64a..e8226fb144 100644 --- a/src/mc/world/actor/item/EyeOfEnder.h +++ b/src/mc/world/actor/item/EyeOfEnder.h @@ -42,13 +42,13 @@ class EyeOfEnder : public ::Actor { // vIndex: 10, symbol: __gen_??1EyeOfEnder@@UEAA@XZ virtual ~EyeOfEnder() = default; - // vIndex: 27, symbol: ?lerpMotion@EyeOfEnder@@UEAAXAEBVVec3@@@Z + // vIndex: 26, symbol: ?lerpMotion@EyeOfEnder@@UEAAXAEBVVec3@@@Z virtual void lerpMotion(class Vec3 const& delta); - // vIndex: 29, symbol: ?normalTick@EyeOfEnder@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@EyeOfEnder@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@EyeOfEnder@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@EyeOfEnder@@UEBAMXZ virtual float getShadowRadius() const; // symbol: ??0EyeOfEnder@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/FallingBlock.h b/src/mc/world/actor/item/FallingBlock.h index e19989df5b..dead6be7b1 100644 --- a/src/mc/world/actor/item/FallingBlock.h +++ b/src/mc/world/actor/item/FallingBlock.h @@ -34,32 +34,32 @@ class FallingBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 147, symbol: ?onPlace@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 168, symbol: ?getDustColor@AnvilBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@AnvilBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const = 0; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@AnvilBlock@@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; - // vIndex: 170, symbol: ?falling@FallingBlock@@UEBA_NXZ + // vIndex: 165, symbol: ?falling@FallingBlock@@UEBA_NXZ virtual bool falling() const; - // vIndex: 171, symbol: ?onLand@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 166, symbol: ?onLand@FallingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onLand(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 172, symbol: ?isFreeToFall@FallingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 167, symbol: ?isFreeToFall@FallingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool isFreeToFall(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 173, symbol: ?startFalling@FallingBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@_N@Z + // vIndex: 168, symbol: ?startFalling@FallingBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@_N@Z virtual void startFalling(class BlockSource& region, class BlockPos const& pos, class Block const& oldBlock, bool creative) const; diff --git a/src/mc/world/actor/item/FireworksRocketActor.h b/src/mc/world/actor/item/FireworksRocketActor.h index 7bce255fc9..a87621df7d 100644 --- a/src/mc/world/actor/item/FireworksRocketActor.h +++ b/src/mc/world/actor/item/FireworksRocketActor.h @@ -39,22 +39,22 @@ class FireworksRocketActor : public ::PredictableProjectile { // vIndex: 10, symbol: __gen_??1FireworksRocketActor@@UEAA@XZ virtual ~FireworksRocketActor() = default; - // vIndex: 27, symbol: ?lerpMotion@FireworksRocketActor@@UEAAXAEBVVec3@@@Z + // vIndex: 26, symbol: ?lerpMotion@FireworksRocketActor@@UEAAXAEBVVec3@@@Z virtual void lerpMotion(class Vec3 const& delta); - // vIndex: 41, symbol: ?getShadowRadius@FireworksRocketActor@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@FireworksRocketActor@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 80, symbol: ?handleEntityEvent@FireworksRocketActor@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@FireworksRocketActor@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent eventId, int data); - // vIndex: 109, symbol: ?onSynchedDataUpdate@FireworksRocketActor@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@FireworksRocketActor@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 159, symbol: ?readAdditionalSaveData@FireworksRocketActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@FireworksRocketActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@FireworksRocketActor@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@FireworksRocketActor@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: diff --git a/src/mc/world/actor/item/ItemActor.h b/src/mc/world/actor/item/ItemActor.h index 686ad0903c..15682cc594 100644 --- a/src/mc/world/actor/item/ItemActor.h +++ b/src/mc/world/actor/item/ItemActor.h @@ -79,32 +79,32 @@ class ItemActor : public ::Actor { // vIndex: 22, symbol: ?isFireImmune@ItemActor@@UEBA_NXZ virtual bool isFireImmune() const; - // vIndex: 28, symbol: + // vIndex: 27, symbol: // ?tryCreateAddActorPacket@ItemActor@@UEAA?AV?$unique_ptr@VAddActorBasePacket@@U?$default_delete@VAddActorBasePacket@@@std@@@std@@XZ virtual std::unique_ptr tryCreateAddActorPacket(); - // vIndex: 45, symbol: ?playerTouch@ItemActor@@UEAAXAEAVPlayer@@@Z + // vIndex: 44, symbol: ?playerTouch@ItemActor@@UEAAXAEAVPlayer@@@Z virtual void playerTouch(class Player& player); - // vIndex: 75, symbol: ?isInvulnerableTo@ItemActor@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@ItemActor@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 80, symbol: ?handleEntityEvent@ItemActor@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@ItemActor@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent eventId, int data); - // vIndex: 97, symbol: ?getSourceUniqueID@ItemActor@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@ItemActor@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 115, symbol: ?canSynchronizeNewEntity@ItemActor@@UEBA_NXZ + // vIndex: 111, symbol: ?canSynchronizeNewEntity@ItemActor@@UEBA_NXZ virtual bool canSynchronizeNewEntity() const; - // vIndex: 158, symbol: ?_hurt@ItemActor@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@ItemActor@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@ItemActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@ItemActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@ItemActor@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@ItemActor@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& entityTag) const; // symbol: ??0ItemActor@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/Minecart.h b/src/mc/world/actor/item/Minecart.h index 651011f1ba..662c0cc1c3 100644 --- a/src/mc/world/actor/item/Minecart.h +++ b/src/mc/world/actor/item/Minecart.h @@ -50,46 +50,46 @@ class Minecart : public ::Actor { // vIndex: 18, symbol: ?getInterpolatedBodyYaw@Minecart@@UEBAMM@Z virtual float getInterpolatedBodyYaw(float a) const; - // vIndex: 41, symbol: ?getShadowRadius@Minecart@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Minecart@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@Minecart@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Minecart@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 75, symbol: ?isInvulnerableTo@Minecart@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Minecart@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 106, symbol: ?getControllingPlayer@Minecart@@UEBA?AUActorUniqueID@@XZ + // vIndex: 103, symbol: ?getControllingPlayer@Minecart@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getControllingPlayer() const; - // vIndex: 142, symbol: ?kill@Minecart@@MEAAXXZ + // vIndex: 136, symbol: ?kill@Minecart@@MEAAXXZ virtual void kill(); - // vIndex: 158, symbol: ?_hurt@Minecart@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Minecart@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@Minecart@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Minecart@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Minecart@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Minecart@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?destroy@Minecart@@UEAAXAEBVActorDamageSource@@_N@Z + // vIndex: 157, symbol: ?destroy@Minecart@@UEAAXAEBVActorDamageSource@@_N@Z virtual void destroy(class ActorDamageSource const& source, bool dropMinecartComponents); - // vIndex: 164, symbol: ?getType@MinecartChest@@UEAA?AW4MinecartType@@XZ + // vIndex: 158, symbol: ?getType@MinecartChest@@UEAA?AW4MinecartType@@XZ virtual ::MinecartType getType() = 0; - // vIndex: 165, symbol: ?getDefaultDisplayBlock@Minecart@@UEBAPEBVBlock@@XZ + // vIndex: 159, symbol: ?getDefaultDisplayBlock@Minecart@@UEBAPEBVBlock@@XZ virtual class Block const* getDefaultDisplayBlock() const; - // vIndex: 166, symbol: ?getDefaultDisplayOffset@Minecart@@UEBAHXZ + // vIndex: 160, symbol: ?getDefaultDisplayOffset@Minecart@@UEBAHXZ virtual int getDefaultDisplayOffset() const; - // vIndex: 167, symbol: ?applyNaturalSlowdown@Minecart@@MEAAXAEAVBlockSource@@@Z + // vIndex: 161, symbol: ?applyNaturalSlowdown@Minecart@@MEAAXAEAVBlockSource@@@Z virtual void applyNaturalSlowdown(class BlockSource& region); - // vIndex: 168, symbol: ?_lazyInitDisplayBlock@Minecart@@EEAAXXZ + // vIndex: 162, symbol: ?_lazyInitDisplayBlock@Minecart@@EEAAXXZ virtual void _lazyInitDisplayBlock(); // symbol: ??0Minecart@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/MinecartChest.h b/src/mc/world/actor/item/MinecartChest.h index 6f093b3a32..c07412714d 100644 --- a/src/mc/world/actor/item/MinecartChest.h +++ b/src/mc/world/actor/item/MinecartChest.h @@ -40,16 +40,16 @@ class MinecartChest : public ::Minecart { // vIndex: 10, symbol: __gen_??1MinecartChest@@UEAA@XZ virtual ~MinecartChest() = default; - // vIndex: 163, symbol: ?destroy@MinecartChest@@UEAAXAEBVActorDamageSource@@_N@Z + // vIndex: 157, symbol: ?destroy@MinecartChest@@UEAAXAEBVActorDamageSource@@_N@Z virtual void destroy(class ActorDamageSource const& source, bool dropMinecartComponents); - // vIndex: 164, symbol: ?getType@MinecartChest@@UEAA?AW4MinecartType@@XZ + // vIndex: 158, symbol: ?getType@MinecartChest@@UEAA?AW4MinecartType@@XZ virtual ::MinecartType getType(); - // vIndex: 165, symbol: ?getDefaultDisplayBlock@MinecartChest@@UEBAPEBVBlock@@XZ + // vIndex: 159, symbol: ?getDefaultDisplayBlock@MinecartChest@@UEBAPEBVBlock@@XZ virtual class Block const* getDefaultDisplayBlock() const; - // vIndex: 167, symbol: ?applyNaturalSlowdown@MinecartChest@@UEAAXAEAVBlockSource@@@Z + // vIndex: 161, symbol: ?applyNaturalSlowdown@MinecartChest@@UEAAXAEAVBlockSource@@@Z virtual void applyNaturalSlowdown(class BlockSource& region); // symbol: ??0MinecartChest@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/MinecartCommandBlock.h b/src/mc/world/actor/item/MinecartCommandBlock.h index dbbc7bc944..9fcae4b2d8 100644 --- a/src/mc/world/actor/item/MinecartCommandBlock.h +++ b/src/mc/world/actor/item/MinecartCommandBlock.h @@ -44,25 +44,25 @@ class MinecartCommandBlock : public ::Minecart { // vIndex: 10, symbol: __gen_??1MinecartCommandBlock@@UEAA@XZ virtual ~MinecartCommandBlock() = default; - // vIndex: 38, symbol: ?canShowNameTag@MinecartCommandBlock@@UEBA_NXZ + // vIndex: 37, symbol: ?canShowNameTag@MinecartCommandBlock@@UEBA_NXZ virtual bool canShowNameTag() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@MinecartCommandBlock@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@MinecartCommandBlock@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@MinecartCommandBlock@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@MinecartCommandBlock@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 164, symbol: ?getType@MinecartCommandBlock@@UEAA?AW4MinecartType@@XZ + // vIndex: 158, symbol: ?getType@MinecartCommandBlock@@UEAA?AW4MinecartType@@XZ virtual ::MinecartType getType(); - // vIndex: 165, symbol: ?getDefaultDisplayBlock@MinecartCommandBlock@@UEBAPEBVBlock@@XZ + // vIndex: 159, symbol: ?getDefaultDisplayBlock@MinecartCommandBlock@@UEBAPEBVBlock@@XZ virtual class Block const* getDefaultDisplayBlock() const; - // vIndex: 167, symbol: ?applyNaturalSlowdown@MinecartCommandBlock@@MEAAXAEAVBlockSource@@@Z + // vIndex: 161, symbol: ?applyNaturalSlowdown@MinecartCommandBlock@@MEAAXAEAVBlockSource@@@Z virtual void applyNaturalSlowdown(class BlockSource& region); - // vIndex: 168, symbol: ?_lazyInitDisplayBlock@MinecartCommandBlock@@EEAAXXZ + // vIndex: 162, symbol: ?_lazyInitDisplayBlock@MinecartCommandBlock@@EEAAXXZ virtual void _lazyInitDisplayBlock(); // symbol: diff --git a/src/mc/world/actor/item/MinecartHopper.h b/src/mc/world/actor/item/MinecartHopper.h index 42124f90a0..416024bcb6 100644 --- a/src/mc/world/actor/item/MinecartHopper.h +++ b/src/mc/world/actor/item/MinecartHopper.h @@ -40,19 +40,19 @@ class MinecartHopper : public ::Minecart { // vIndex: 10, symbol: __gen_??1MinecartHopper@@UEAA@XZ virtual ~MinecartHopper() = default; - // vIndex: 163, symbol: ?destroy@MinecartHopper@@UEAAXAEBVActorDamageSource@@_N@Z + // vIndex: 157, symbol: ?destroy@MinecartHopper@@UEAAXAEBVActorDamageSource@@_N@Z virtual void destroy(class ActorDamageSource const& source, bool dropMinecartComponents); - // vIndex: 164, symbol: ?getType@MinecartHopper@@UEAA?AW4MinecartType@@XZ + // vIndex: 158, symbol: ?getType@MinecartHopper@@UEAA?AW4MinecartType@@XZ virtual ::MinecartType getType(); - // vIndex: 165, symbol: ?getDefaultDisplayBlock@MinecartHopper@@UEBAPEBVBlock@@XZ + // vIndex: 159, symbol: ?getDefaultDisplayBlock@MinecartHopper@@UEBAPEBVBlock@@XZ virtual class Block const* getDefaultDisplayBlock() const; - // vIndex: 166, symbol: ?getDefaultDisplayOffset@MinecartHopper@@UEBAHXZ + // vIndex: 160, symbol: ?getDefaultDisplayOffset@MinecartHopper@@UEBAHXZ virtual int getDefaultDisplayOffset() const; - // vIndex: 167, symbol: ?applyNaturalSlowdown@MinecartHopper@@UEAAXAEAVBlockSource@@@Z + // vIndex: 161, symbol: ?applyNaturalSlowdown@MinecartHopper@@UEAAXAEAVBlockSource@@@Z virtual void applyNaturalSlowdown(class BlockSource& region); // symbol: ??0MinecartHopper@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/MinecartRideable.h b/src/mc/world/actor/item/MinecartRideable.h index a88d9f891b..d076627ea8 100644 --- a/src/mc/world/actor/item/MinecartRideable.h +++ b/src/mc/world/actor/item/MinecartRideable.h @@ -40,7 +40,7 @@ class MinecartRideable : public ::Minecart { // vIndex: 10, symbol: __gen_??1MinecartRideable@@UEAA@XZ virtual ~MinecartRideable() = default; - // vIndex: 164, symbol: ?getType@MinecartRideable@@UEAA?AW4MinecartType@@XZ + // vIndex: 158, symbol: ?getType@MinecartRideable@@UEAA?AW4MinecartType@@XZ virtual ::MinecartType getType(); // symbol: ??0MinecartRideable@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/MinecartTNT.h b/src/mc/world/actor/item/MinecartTNT.h index ae353069ab..7c6b2e3083 100644 --- a/src/mc/world/actor/item/MinecartTNT.h +++ b/src/mc/world/actor/item/MinecartTNT.h @@ -40,25 +40,25 @@ class MinecartTNT : public ::Minecart { // vIndex: 10, symbol: __gen_??1MinecartTNT@@UEAA@XZ virtual ~MinecartTNT() = default; - // vIndex: 29, symbol: ?normalTick@MinecartTNT@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@MinecartTNT@@UEAAXXZ virtual void normalTick(); - // vIndex: 80, symbol: ?handleEntityEvent@MinecartTNT@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@MinecartTNT@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent eventId, int data); - // vIndex: 108, symbol: ?causeFallDamageToActor@MinecartTNT@@MEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@MinecartTNT@@MEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 158, symbol: ?_hurt@MinecartTNT@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@MinecartTNT@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 163, symbol: ?destroy@MinecartTNT@@UEAAXAEBVActorDamageSource@@_N@Z + // vIndex: 157, symbol: ?destroy@MinecartTNT@@UEAAXAEBVActorDamageSource@@_N@Z virtual void destroy(class ActorDamageSource const& source, bool dropMinecartComponents); - // vIndex: 164, symbol: ?getType@MinecartTNT@@UEAA?AW4MinecartType@@XZ + // vIndex: 158, symbol: ?getType@MinecartTNT@@UEAA?AW4MinecartType@@XZ virtual ::MinecartType getType(); - // vIndex: 165, symbol: ?getDefaultDisplayBlock@MinecartTNT@@UEBAPEBVBlock@@XZ + // vIndex: 159, symbol: ?getDefaultDisplayBlock@MinecartTNT@@UEBAPEBVBlock@@XZ virtual class Block const* getDefaultDisplayBlock() const; // symbol: ??0MinecartTNT@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/PrimedTnt.h b/src/mc/world/actor/item/PrimedTnt.h index 994d617dda..c410c4aa1d 100644 --- a/src/mc/world/actor/item/PrimedTnt.h +++ b/src/mc/world/actor/item/PrimedTnt.h @@ -53,28 +53,28 @@ class PrimedTnt : public ::PredictableProjectile { // vIndex: 12, symbol: ?getOwnerEntityType@PrimedTnt@@UEAA?AW4ActorType@@XZ virtual ::ActorType getOwnerEntityType(); - // vIndex: 26, symbol: ?teleportTo@PrimedTnt@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@PrimedTnt@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int sourceEntityType, bool); - // vIndex: 29, symbol: ?normalTick@PrimedTnt@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@PrimedTnt@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@PrimedTnt@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@PrimedTnt@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@PrimedTnt@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@PrimedTnt@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 97, symbol: ?getSourceUniqueID@PrimedTnt@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@PrimedTnt@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 158, symbol: ?_hurt@PrimedTnt@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@PrimedTnt@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@PrimedTnt@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@PrimedTnt@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@PrimedTnt@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@PrimedTnt@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& entityTag) const; // symbol: ??0PrimedTnt@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/item/TripodCamera.h b/src/mc/world/actor/item/TripodCamera.h index cf64cfe43c..67acd96081 100644 --- a/src/mc/world/actor/item/TripodCamera.h +++ b/src/mc/world/actor/item/TripodCamera.h @@ -45,25 +45,22 @@ class TripodCamera : public ::Mob { // vIndex: 13, symbol: ?remove@TripodCamera@@UEAAXXZ virtual void remove(); - // vIndex: 23, symbol: ?breaksFallingBlocks@TripodCamera@@UEBA_NXZ - virtual bool breaksFallingBlocks() const; - - // vIndex: 41, symbol: ?getShadowRadius@TripodCamera@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@TripodCamera@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@TripodCamera@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@TripodCamera@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 57, symbol: ?isTargetable@TripodCamera@@UEBA_NXZ + // vIndex: 56, symbol: ?isTargetable@TripodCamera@@UEBA_NXZ virtual bool isTargetable() const; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@TripodCamera@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@TripodCamera@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@TripodCamera@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@TripodCamera@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 199, symbol: ?canExistWhenDisallowMob@TripodCamera@@UEBA_NXZ + // vIndex: 192, symbol: ?canExistWhenDisallowMob@TripodCamera@@UEBA_NXZ virtual bool canExistWhenDisallowMob() const; // symbol: ??0TripodCamera@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Blaze.h b/src/mc/world/actor/monster/Blaze.h index a1ef3dacf1..7f31425f47 100644 --- a/src/mc/world/actor/monster/Blaze.h +++ b/src/mc/world/actor/monster/Blaze.h @@ -42,19 +42,19 @@ class Blaze : public ::Monster { // vIndex: 10, symbol: __gen_??1Blaze@@UEAA@XZ virtual ~Blaze() = default; - // vIndex: 29, symbol: ?normalTick@Blaze@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Blaze@@UEAAXXZ virtual void normalTick(); - // vIndex: 44, symbol: ?getBrightness@Blaze@@UEBAMMAEBVIConstBlockSource@@@Z + // vIndex: 43, symbol: ?getBrightness@Blaze@@UEBAMMAEBVIConstBlockSource@@@Z virtual float getBrightness(float, class IConstBlockSource const&) const; - // vIndex: 55, symbol: ?isOnFire@Blaze@@UEBA_NXZ + // vIndex: 54, symbol: ?isOnFire@Blaze@@UEBA_NXZ virtual bool isOnFire() const; - // vIndex: 171, symbol: ?aiStep@Blaze@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Blaze@@UEAAXXZ virtual void aiStep(); - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@Blaze@@UEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@Blaze@@UEBA_NXZ virtual bool isDarkEnoughToSpawn() const; // symbol: ??0Blaze@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Breeze.h b/src/mc/world/actor/monster/Breeze.h index a107aac6d8..d84b76a38d 100644 --- a/src/mc/world/actor/monster/Breeze.h +++ b/src/mc/world/actor/monster/Breeze.h @@ -39,7 +39,7 @@ class Breeze : public ::Monster { // vIndex: 10, symbol: __gen_??1Breeze@@UEAA@XZ virtual ~Breeze() = default; - // vIndex: 108, symbol: ?causeFallDamageToActor@Breeze@@UEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@Breeze@@UEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); // symbol: ??0Breeze@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/CaveSpider.h b/src/mc/world/actor/monster/CaveSpider.h index 56894706fc..64164b533a 100644 --- a/src/mc/world/actor/monster/CaveSpider.h +++ b/src/mc/world/actor/monster/CaveSpider.h @@ -39,11 +39,11 @@ class CaveSpider : public ::Spider { // vIndex: 10, symbol: __gen_??1CaveSpider@@UEAA@XZ virtual ~CaveSpider() = default; - // vIndex: 131, symbol: + // vIndex: 125, symbol: // ?getDebugText@CaveSpider@@EEAAXAEAV?$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@@@Z virtual void getDebugText(std::vector& outputInfo); - // vIndex: 205, symbol: ?getModelScale@CaveSpider@@UEBAMXZ + // vIndex: 198, symbol: ?getModelScale@CaveSpider@@UEBAMXZ virtual float getModelScale() const; // symbol: ??0CaveSpider@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Creeper.h b/src/mc/world/actor/monster/Creeper.h index c5f017be82..2c2e582628 100644 --- a/src/mc/world/actor/monster/Creeper.h +++ b/src/mc/world/actor/monster/Creeper.h @@ -39,10 +39,10 @@ class Creeper : public ::Monster { // vIndex: 10, symbol: __gen_??1Creeper@@UEAA@XZ virtual ~Creeper() = default; - // vIndex: 29, symbol: ?normalTick@Creeper@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Creeper@@UEAAXXZ virtual void normalTick(); - // vIndex: 143, symbol: ?die@Creeper@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Creeper@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); // symbol: ??0Creeper@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/EnderDragon.h b/src/mc/world/actor/monster/EnderDragon.h index a06c01c6c3..bc823d94fa 100644 --- a/src/mc/world/actor/monster/EnderDragon.h +++ b/src/mc/world/actor/monster/EnderDragon.h @@ -46,43 +46,43 @@ class EnderDragon : public ::Monster { // vIndex: 13, symbol: ?remove@EnderDragon@@UEAAXXZ virtual void remove(); - // vIndex: 41, symbol: ?getShadowRadius@EnderDragon@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@EnderDragon@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 42, symbol: ?getHeadLookVector@EnderDragon@@UEBA?AVVec3@@M@Z + // vIndex: 41, symbol: ?getHeadLookVector@EnderDragon@@UEBA?AVVec3@@M@Z virtual class Vec3 getHeadLookVector(float a) const; - // vIndex: 46, symbol: ?isImmobile@EnderDragon@@UEBA_NXZ + // vIndex: 45, symbol: ?isImmobile@EnderDragon@@UEBA_NXZ virtual bool isImmobile() const; - // vIndex: 66, symbol: ?setSitting@EnderDragon@@UEAAX_N@Z + // vIndex: 65, symbol: ?setSitting@EnderDragon@@UEAAX_N@Z virtual void setSitting(bool value); - // vIndex: 75, symbol: ?isInvulnerableTo@EnderDragon@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@EnderDragon@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 80, symbol: ?handleEntityEvent@EnderDragon@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@EnderDragon@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@EnderDragon@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@EnderDragon@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 112, symbol: ?canBePulledIntoVehicle@EnderDragon@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@EnderDragon@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 121, symbol: ?canBeAffected@EnderDragon@@UEBA_NI@Z + // vIndex: 117, symbol: ?canBeAffected@EnderDragon@@UEBA_NI@Z virtual bool canBeAffected(uint) const; - // vIndex: 143, symbol: ?die@EnderDragon@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@EnderDragon@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@EnderDragon@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@EnderDragon@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@EnderDragon@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@EnderDragon@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 202, symbol: ?tickDeath@EnderDragon@@MEAAXXZ + // vIndex: 195, symbol: ?tickDeath@EnderDragon@@MEAAXXZ virtual void tickDeath(); // symbol: ??0EnderDragon@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/EnderMan.h b/src/mc/world/actor/monster/EnderMan.h index 69fefce389..e23a7e1861 100644 --- a/src/mc/world/actor/monster/EnderMan.h +++ b/src/mc/world/actor/monster/EnderMan.h @@ -40,31 +40,31 @@ class EnderMan : public ::Monster { // vIndex: 10, symbol: __gen_??1EnderMan@@UEAA@XZ virtual ~EnderMan() = default; - // vIndex: 29, symbol: ?normalTick@EnderMan@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@EnderMan@@UEAAXXZ virtual void normalTick(); - // vIndex: 72, symbol: ?shouldRender@EnderMan@@UEBA_NXZ + // vIndex: 71, symbol: ?shouldRender@EnderMan@@UEBA_NXZ virtual bool shouldRender() const; - // vIndex: 74, symbol: ?getAmbientSound@EnderMan@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 73, symbol: ?getAmbientSound@EnderMan@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getAmbientSound() const; - // vIndex: 122, symbol: ?canBeAffectedByArrow@EnderMan@@UEBA_NAEBVMobEffectInstance@@@Z + // vIndex: 118, symbol: ?canBeAffectedByArrow@EnderMan@@UEBA_NAEBVMobEffectInstance@@@Z virtual bool canBeAffectedByArrow(class MobEffectInstance const& effect) const; - // vIndex: 158, symbol: ?_hurt@EnderMan@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@EnderMan@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@EnderMan@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@EnderMan@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@EnderMan@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@EnderMan@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 170, symbol: ?hurtEffects@EnderMan@@UEAAXAEBVActorDamageSource@@M_N1@Z + // vIndex: 164, symbol: ?hurtEffects@EnderMan@@UEAAXAEBVActorDamageSource@@M_N1@Z virtual void hurtEffects(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 201, symbol: ?newServerAiStep@EnderMan@@UEAAXXZ + // vIndex: 194, symbol: ?newServerAiStep@EnderMan@@UEAAXXZ virtual void newServerAiStep(); // symbol: ??0EnderMan@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Endermite.h b/src/mc/world/actor/monster/Endermite.h index 006caa4e1d..d8c88a487d 100644 --- a/src/mc/world/actor/monster/Endermite.h +++ b/src/mc/world/actor/monster/Endermite.h @@ -39,19 +39,19 @@ class Endermite : public ::Monster { // vIndex: 10, symbol: __gen_??1Endermite@@UEAA@XZ virtual ~Endermite() = default; - // vIndex: 29, symbol: ?normalTick@Endermite@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Endermite@@UEAAXXZ virtual void normalTick(); - // vIndex: 159, symbol: ?readAdditionalSaveData@Endermite@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Endermite@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Endermite@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Endermite@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 171, symbol: ?aiStep@Endermite@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Endermite@@UEAAXXZ virtual void aiStep(); - // vIndex: 173, symbol: ?checkSpawnRules@Endermite@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Endermite@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); // symbol: ??0Endermite@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/EvocationIllager.h b/src/mc/world/actor/monster/EvocationIllager.h index d89bd97d1d..33a1b3a5a0 100644 --- a/src/mc/world/actor/monster/EvocationIllager.h +++ b/src/mc/world/actor/monster/EvocationIllager.h @@ -43,16 +43,16 @@ class EvocationIllager : public ::HumanoidMonster { // vIndex: 10, symbol: __gen_??1EvocationIllager@@UEAA@XZ virtual ~EvocationIllager() = default; - // vIndex: 143, symbol: ?die@EvocationIllager@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@EvocationIllager@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 171, symbol: ?aiStep@EvocationIllager@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@EvocationIllager@@UEAAXXZ virtual void aiStep(); - // vIndex: 179, symbol: ?isAlliedTo@EvocationIllager@@UEAA_NPEAVMob@@@Z + // vIndex: 173, symbol: ?isAlliedTo@EvocationIllager@@UEAA_NPEAVMob@@@Z virtual bool isAlliedTo(class Mob* other); - // vIndex: 181, symbol: ?getArmorValue@EvocationIllager@@MEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@EvocationIllager@@MEBAHXZ virtual int getArmorValue() const; // symbol: ??0EvocationIllager@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Ghast.h b/src/mc/world/actor/monster/Ghast.h index b2b052be55..d11c76efbd 100644 --- a/src/mc/world/actor/monster/Ghast.h +++ b/src/mc/world/actor/monster/Ghast.h @@ -42,16 +42,16 @@ class Ghast : public ::Monster { // vIndex: 10, symbol: __gen_??1Ghast@@UEAA@XZ virtual ~Ghast() = default; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Ghast@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Ghast@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@Ghast@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Ghast@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 198, symbol: ?_getWalkTargetValue@Ghast@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Ghast@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@Ghast@@UEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@Ghast@@UEBA_NXZ virtual bool isDarkEnoughToSpawn() const; // symbol: ??0Ghast@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Guardian.h b/src/mc/world/actor/monster/Guardian.h index be0334cb16..2078e4e685 100644 --- a/src/mc/world/actor/monster/Guardian.h +++ b/src/mc/world/actor/monster/Guardian.h @@ -46,25 +46,25 @@ class Guardian : public ::Monster { // vIndex: 10, symbol: __gen_??1Guardian@@UEAA@XZ virtual ~Guardian() = default; - // vIndex: 61, symbol: ?setTarget@Guardian@@UEAAXPEAVActor@@@Z + // vIndex: 60, symbol: ?setTarget@Guardian@@UEAAXPEAVActor@@@Z virtual void setTarget(class Actor* target); - // vIndex: 158, symbol: ?_hurt@Guardian@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Guardian@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@Guardian@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Guardian@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Guardian@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Guardian@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 173, symbol: ?checkSpawnRules@Guardian@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Guardian@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 178, symbol: ?getMaxHeadXRot@Guardian@@UEAAMXZ + // vIndex: 172, symbol: ?getMaxHeadXRot@Guardian@@UEAAMXZ virtual float getMaxHeadXRot(); - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@Guardian@@MEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@Guardian@@MEBA_NXZ virtual bool isDarkEnoughToSpawn() const; // symbol: ??0Guardian@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/HumanoidMonster.h b/src/mc/world/actor/monster/HumanoidMonster.h index 1b3290526b..d34779913a 100644 --- a/src/mc/world/actor/monster/HumanoidMonster.h +++ b/src/mc/world/actor/monster/HumanoidMonster.h @@ -39,19 +39,19 @@ class HumanoidMonster : public ::Monster { // vIndex: 10, symbol: ??1HumanoidMonster@@UEAA@XZ virtual ~HumanoidMonster(); - // vIndex: 29, symbol: ?normalTick@HumanoidMonster@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@HumanoidMonster@@UEAAXXZ virtual void normalTick(); - // vIndex: 159, symbol: ?readAdditionalSaveData@HumanoidMonster@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@HumanoidMonster@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@HumanoidMonster@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@HumanoidMonster@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 175, symbol: ?getItemUseDuration@HumanoidMonster@@UEBAHXZ + // vIndex: 169, symbol: ?getItemUseDuration@HumanoidMonster@@UEBAHXZ virtual int getItemUseDuration() const; - // vIndex: 180, symbol: ?doHurtTarget@HumanoidMonster@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z + // vIndex: 174, symbol: ?doHurtTarget@HumanoidMonster@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z virtual bool doHurtTarget(class Actor* target, ::ActorDamageCause const& cause); // symbol: ??0HumanoidMonster@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/IllagerBeast.h b/src/mc/world/actor/monster/IllagerBeast.h index edb9a7017e..44ce7b0021 100644 --- a/src/mc/world/actor/monster/IllagerBeast.h +++ b/src/mc/world/actor/monster/IllagerBeast.h @@ -39,7 +39,7 @@ class IllagerBeast : public ::Monster { // vIndex: 10, symbol: __gen_??1IllagerBeast@@UEAA@XZ virtual ~IllagerBeast() = default; - // vIndex: 24, symbol: ?blockedByShield@IllagerBeast@@UEAAXAEBVActorDamageSource@@AEAVActor@@@Z + // vIndex: 23, symbol: ?blockedByShield@IllagerBeast@@UEAAXAEBVActorDamageSource@@AEAVActor@@@Z virtual void blockedByShield(class ActorDamageSource const& source, class Actor& blocker); // symbol: ??0IllagerBeast@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/LavaSlime.h b/src/mc/world/actor/monster/LavaSlime.h index 9d2f7c2a41..a78e6b644f 100644 --- a/src/mc/world/actor/monster/LavaSlime.h +++ b/src/mc/world/actor/monster/LavaSlime.h @@ -43,28 +43,28 @@ class LavaSlime : public ::Slime { // vIndex: 10, symbol: __gen_??1LavaSlime@@UEAA@XZ virtual ~LavaSlime() = default; - // vIndex: 44, symbol: ?getBrightness@LavaSlime@@UEBAMMAEBVIConstBlockSource@@@Z + // vIndex: 43, symbol: ?getBrightness@LavaSlime@@UEBAMMAEBVIConstBlockSource@@@Z virtual float getBrightness(float, class IConstBlockSource const&) const; - // vIndex: 55, symbol: ?isOnFire@LavaSlime@@MEBA_NXZ + // vIndex: 54, symbol: ?isOnFire@LavaSlime@@MEBA_NXZ virtual bool isOnFire() const; - // vIndex: 173, symbol: ?checkSpawnRules@LavaSlime@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@LavaSlime@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 181, symbol: ?getArmorValue@LavaSlime@@UEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@LavaSlime@@UEBAHXZ virtual int getArmorValue() const; - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@LavaSlime@@UEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@LavaSlime@@UEBA_NXZ virtual bool isDarkEnoughToSpawn() const; - // vIndex: 205, symbol: ?doPlayLandSound@LavaSlime@@MEAA_NXZ + // vIndex: 198, symbol: ?doPlayLandSound@LavaSlime@@MEAA_NXZ virtual bool doPlayLandSound(); - // vIndex: 207, symbol: ?decreaseSquish@LavaSlime@@MEAAXXZ + // vIndex: 200, symbol: ?decreaseSquish@LavaSlime@@MEAAXXZ virtual void decreaseSquish(); - // vIndex: 208, symbol: ?createChild@LavaSlime@@MEAA?AV?$OwnerPtr@VEntityContext@@@@H@Z + // vIndex: 201, symbol: ?createChild@LavaSlime@@MEAA?AV?$OwnerPtr@VEntityContext@@@@H@Z virtual class OwnerPtr createChild(int i); // symbol: ??0LavaSlime@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Monster.h b/src/mc/world/actor/monster/Monster.h index b0a2725457..12457f70f6 100644 --- a/src/mc/world/actor/monster/Monster.h +++ b/src/mc/world/actor/monster/Monster.h @@ -39,25 +39,25 @@ class Monster : public ::Mob { // vIndex: 10, symbol: ??1Monster@@UEAA@XZ virtual ~Monster(); - // vIndex: 29, symbol: ?normalTick@Monster@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Monster@@UEAAXXZ virtual void normalTick(); - // vIndex: 158, symbol: ?_hurt@Monster@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Monster@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@Monster@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Monster@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Monster@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Monster@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 173, symbol: ?checkSpawnRules@Monster@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Monster@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 198, symbol: ?_getWalkTargetValue@Monster@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Monster@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@Monster@@UEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@Monster@@UEBA_NXZ virtual bool isDarkEnoughToSpawn() const; // symbol: ??0Monster@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Phantom.h b/src/mc/world/actor/monster/Phantom.h index 8d7ed8859d..1f433e6a5f 100644 --- a/src/mc/world/actor/monster/Phantom.h +++ b/src/mc/world/actor/monster/Phantom.h @@ -39,13 +39,13 @@ class Phantom : public ::Monster { // vIndex: 10, symbol: __gen_??1Phantom@@UEAA@XZ virtual ~Phantom() = default; - // vIndex: 29, symbol: ?normalTick@Phantom@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Phantom@@UEAAXXZ virtual void normalTick(); - // vIndex: 72, symbol: ?shouldRender@Phantom@@UEBA_NXZ + // vIndex: 71, symbol: ?shouldRender@Phantom@@UEBA_NXZ virtual bool shouldRender() const; - // vIndex: 173, symbol: ?checkSpawnRules@Phantom@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Phantom@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); // symbol: ??0Phantom@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/PigZombie.h b/src/mc/world/actor/monster/PigZombie.h index 6b3389ef24..05e30020bd 100644 --- a/src/mc/world/actor/monster/PigZombie.h +++ b/src/mc/world/actor/monster/PigZombie.h @@ -40,24 +40,21 @@ class PigZombie : public ::Zombie { // vIndex: 10, symbol: __gen_??1PigZombie@@UEAA@XZ virtual ~PigZombie() = default; - // vIndex: 29, symbol: ?normalTick@PigZombie@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@PigZombie@@UEAAXXZ virtual void normalTick(); - // vIndex: 158, symbol: ?_hurt@PigZombie@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@PigZombie@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@PigZombie@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@PigZombie@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@PigZombie@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@PigZombie@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& entityTag) const; - // vIndex: 173, symbol: ?checkSpawnRules@PigZombie@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@PigZombie@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 197, symbol: ?getAttackTime@PigZombie@@UEAAHXZ - virtual int getAttackTime(); - // symbol: ??0PigZombie@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z MCAPI PigZombie( class ActorDefinitionGroup* definitions, diff --git a/src/mc/world/actor/monster/Piglin.h b/src/mc/world/actor/monster/Piglin.h index efa6a3a366..66fa0952dd 100644 --- a/src/mc/world/actor/monster/Piglin.h +++ b/src/mc/world/actor/monster/Piglin.h @@ -39,13 +39,13 @@ class Piglin : public ::HumanoidMonster { // vIndex: 10, symbol: __gen_??1Piglin@@UEAA@XZ virtual ~Piglin() = default; - // vIndex: 136, symbol: ?getInteraction@Piglin@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z + // vIndex: 130, symbol: ?getInteraction@Piglin@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z virtual bool getInteraction(class Player& player, class ActorInteraction& interaction, class Vec3 const& location); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Piglin@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Piglin@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@Piglin@@UEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@Piglin@@UEBA_NXZ virtual bool isDarkEnoughToSpawn() const; // symbol: ??0Piglin@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Pillager.h b/src/mc/world/actor/monster/Pillager.h index 06cb07139f..399b353624 100644 --- a/src/mc/world/actor/monster/Pillager.h +++ b/src/mc/world/actor/monster/Pillager.h @@ -39,16 +39,16 @@ class Pillager : public ::HumanoidMonster { // vIndex: 10, symbol: __gen_??1Pillager@@UEAA@XZ virtual ~Pillager() = default; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Pillager@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Pillager@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 159, symbol: ?readAdditionalSaveData@Pillager@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Pillager@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 198, symbol: ?_getWalkTargetValue@Pillager@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Pillager@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@Pillager@@UEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@Pillager@@UEBA_NXZ virtual bool isDarkEnoughToSpawn() const; // symbol: ??0Pillager@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Shulker.h b/src/mc/world/actor/monster/Shulker.h index 3814158b32..7665906b2a 100644 --- a/src/mc/world/actor/monster/Shulker.h +++ b/src/mc/world/actor/monster/Shulker.h @@ -46,49 +46,46 @@ class Shulker : public ::Mob { // vIndex: 10, symbol: __gen_??1Shulker@@UEAA@XZ virtual ~Shulker() = default; - // vIndex: 23, symbol: ?breaksFallingBlocks@Shulker@@UEBA_NXZ - virtual bool breaksFallingBlocks() const; - - // vIndex: 36, symbol: ?isInWall@Shulker@@UEBA_NXZ + // vIndex: 35, symbol: ?isInWall@Shulker@@UEBA_NXZ virtual bool isInWall() const; - // vIndex: 41, symbol: ?getShadowRadius@Shulker@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Shulker@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 60, symbol: ?canAttack@Shulker@@UEBA_NPEAVActor@@_N@Z + // vIndex: 59, symbol: ?canAttack@Shulker@@UEBA_NPEAVActor@@_N@Z virtual bool canAttack(class Actor* actor, bool allowInvulnerable) const; - // vIndex: 72, symbol: ?shouldRender@Shulker@@UEBA_NXZ + // vIndex: 71, symbol: ?shouldRender@Shulker@@UEBA_NXZ virtual bool shouldRender() const; - // vIndex: 75, symbol: ?isInvulnerableTo@Shulker@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Shulker@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 81, symbol: ?getPickRadius@Shulker@@UEAAMXZ + // vIndex: 80, symbol: ?getPickRadius@Shulker@@UEAAMXZ virtual float getPickRadius(); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Shulker@@MEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Shulker@@MEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 158, symbol: ?_hurt@Shulker@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Shulker@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@Shulker@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Shulker@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Shulker@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Shulker@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 173, symbol: ?checkSpawnRules@Shulker@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Shulker@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 178, symbol: ?getMaxHeadXRot@Shulker@@UEAAMXZ + // vIndex: 172, symbol: ?getMaxHeadXRot@Shulker@@UEAAMXZ virtual float getMaxHeadXRot(); - // vIndex: 181, symbol: ?getArmorValue@Shulker@@UEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@Shulker@@UEBAHXZ virtual int getArmorValue() const; - // vIndex: 200, symbol: + // vIndex: 193, symbol: // ?initBodyControl@Shulker@@UEAA?AV?$unique_ptr@VBodyControl@@U?$default_delete@VBodyControl@@@std@@@std@@XZ virtual std::unique_ptr initBodyControl(); diff --git a/src/mc/world/actor/monster/Silverfish.h b/src/mc/world/actor/monster/Silverfish.h index a526281dc3..0c56cc225f 100644 --- a/src/mc/world/actor/monster/Silverfish.h +++ b/src/mc/world/actor/monster/Silverfish.h @@ -39,22 +39,22 @@ class Silverfish : public ::Monster { // vIndex: 10, symbol: __gen_??1Silverfish@@UEAA@XZ virtual ~Silverfish() = default; - // vIndex: 80, symbol: ?handleEntityEvent@Silverfish@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Silverfish@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 161, symbol: ?_playStepSound@Silverfish@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Silverfish@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); - // vIndex: 164, symbol: ?spawnAnim@Silverfish@@UEAAXXZ + // vIndex: 158, symbol: ?spawnAnim@Silverfish@@UEAAXXZ virtual void spawnAnim(); - // vIndex: 173, symbol: ?checkSpawnRules@Silverfish@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Silverfish@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 198, symbol: ?_getWalkTargetValue@Silverfish@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Silverfish@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 204, symbol: ?isDarkEnoughToSpawn@Silverfish@@UEBA_NXZ + // vIndex: 197, symbol: ?isDarkEnoughToSpawn@Silverfish@@UEBA_NXZ virtual bool isDarkEnoughToSpawn() const; // symbol: ??0Silverfish@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Skeleton.h b/src/mc/world/actor/monster/Skeleton.h index 11cdc56da4..9614aa9729 100644 --- a/src/mc/world/actor/monster/Skeleton.h +++ b/src/mc/world/actor/monster/Skeleton.h @@ -40,26 +40,26 @@ class Skeleton : public ::HumanoidMonster { // vIndex: 10, symbol: __gen_??1Skeleton@@UEAA@XZ virtual ~Skeleton() = default; - // vIndex: 29, symbol: ?normalTick@Skeleton@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Skeleton@@UEAAXXZ virtual void normalTick(); - // vIndex: 61, symbol: ?setTarget@Skeleton@@UEAAXPEAVActor@@@Z + // vIndex: 60, symbol: ?setTarget@Skeleton@@UEAAXPEAVActor@@@Z virtual void setTarget(class Actor* target); - // vIndex: 98, symbol: ?canFreeze@Skeleton@@UEBA_NXZ + // vIndex: 97, symbol: ?canFreeze@Skeleton@@UEBA_NXZ virtual bool canFreeze() const; - // vIndex: 121, symbol: ?canBeAffected@Skeleton@@UEBA_NI@Z + // vIndex: 117, symbol: ?canBeAffected@Skeleton@@UEBA_NI@Z virtual bool canBeAffected(uint effectId) const; - // vIndex: 131, symbol: + // vIndex: 125, symbol: // ?getDebugText@Skeleton@@EEAAXAEAV?$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@@@Z virtual void getDebugText(std::vector& outputInfo); - // vIndex: 143, symbol: ?die@Skeleton@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Skeleton@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 180, symbol: ?doHurtTarget@Skeleton@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z + // vIndex: 174, symbol: ?doHurtTarget@Skeleton@@UEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z virtual bool doHurtTarget(class Actor* target, ::ActorDamageCause const& cause); // symbol: ??0Skeleton@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Slime.h b/src/mc/world/actor/monster/Slime.h index cdfd5c1fce..31c6f0bf6c 100644 --- a/src/mc/world/actor/monster/Slime.h +++ b/src/mc/world/actor/monster/Slime.h @@ -46,37 +46,37 @@ class Slime : public ::Monster { // vIndex: 13, symbol: ?remove@Slime@@UEAAXXZ virtual void remove(); - // vIndex: 41, symbol: ?getShadowRadius@Slime@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Slime@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 109, symbol: ?onSynchedDataUpdate@Slime@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Slime@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 159, symbol: ?readAdditionalSaveData@Slime@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Slime@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Slime@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Slime@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 171, symbol: ?aiStep@Slime@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Slime@@UEAAXXZ virtual void aiStep(); - // vIndex: 173, symbol: ?checkSpawnRules@Slime@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Slime@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 198, symbol: ?_getWalkTargetValue@Slime@@MEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@Slime@@MEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); - // vIndex: 205, symbol: ?doPlayLandSound@Slime@@MEAA_NXZ + // vIndex: 198, symbol: ?doPlayLandSound@Slime@@MEAA_NXZ virtual bool doPlayLandSound(); - // vIndex: 206, symbol: ?playJumpSound@Slime@@MEAAXXZ + // vIndex: 199, symbol: ?playJumpSound@Slime@@MEAAXXZ virtual void playJumpSound(); - // vIndex: 207, symbol: ?decreaseSquish@Slime@@MEAAXXZ + // vIndex: 200, symbol: ?decreaseSquish@Slime@@MEAAXXZ virtual void decreaseSquish(); - // vIndex: 208, symbol: ?createChild@Slime@@MEAA?AV?$OwnerPtr@VEntityContext@@@@H@Z + // vIndex: 201, symbol: ?createChild@Slime@@MEAA?AV?$OwnerPtr@VEntityContext@@@@H@Z virtual class OwnerPtr createChild(int i); // symbol: ??0Slime@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Spider.h b/src/mc/world/actor/monster/Spider.h index 2860c6c620..604358344c 100644 --- a/src/mc/world/actor/monster/Spider.h +++ b/src/mc/world/actor/monster/Spider.h @@ -39,19 +39,19 @@ class Spider : public ::Monster { // vIndex: 10, symbol: __gen_??1Spider@@UEAA@XZ virtual ~Spider() = default; - // vIndex: 41, symbol: ?getShadowRadius@Spider@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Spider@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 72, symbol: ?shouldRender@Spider@@UEBA_NXZ + // vIndex: 71, symbol: ?shouldRender@Spider@@UEBA_NXZ virtual bool shouldRender() const; - // vIndex: 121, symbol: ?canBeAffected@Spider@@UEBA_NI@Z + // vIndex: 117, symbol: ?canBeAffected@Spider@@UEBA_NI@Z virtual bool canBeAffected(uint effectId) const; - // vIndex: 161, symbol: ?_playStepSound@Spider@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 155, symbol: ?_playStepSound@Spider@@MEAAXAEBVBlockPos@@AEBVBlock@@@Z virtual void _playStepSound(class BlockPos const& pos, class Block const& onBlock); - // vIndex: 205, symbol: ?getModelScale@Spider@@UEBAMXZ + // vIndex: 198, symbol: ?getModelScale@Spider@@UEBAMXZ virtual float getModelScale() const; // symbol: ??0Spider@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Vex.h b/src/mc/world/actor/monster/Vex.h index 678a09807f..bb4eaa7ee8 100644 --- a/src/mc/world/actor/monster/Vex.h +++ b/src/mc/world/actor/monster/Vex.h @@ -45,13 +45,13 @@ class Vex : public ::Monster { // vIndex: 10, symbol: __gen_??1Vex@@UEAA@XZ virtual ~Vex() = default; - // vIndex: 36, symbol: ?isInWall@Vex@@UEBA_NXZ + // vIndex: 35, symbol: ?isInWall@Vex@@UEBA_NXZ virtual bool isInWall() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@Vex@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Vex@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Vex@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Vex@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0Vex@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/VindicationIllager.h b/src/mc/world/actor/monster/VindicationIllager.h index 62e2cbf41f..25e7d7fc5c 100644 --- a/src/mc/world/actor/monster/VindicationIllager.h +++ b/src/mc/world/actor/monster/VindicationIllager.h @@ -39,7 +39,7 @@ class VindicationIllager : public ::HumanoidMonster { // vIndex: 10, symbol: __gen_??1VindicationIllager@@UEAA@XZ virtual ~VindicationIllager() = default; - // vIndex: 198, symbol: ?_getWalkTargetValue@VindicationIllager@@UEAAMAEBVBlockPos@@@Z + // vIndex: 191, symbol: ?_getWalkTargetValue@VindicationIllager@@UEAAMAEBVBlockPos@@@Z virtual float _getWalkTargetValue(class BlockPos const& pos); // symbol: diff --git a/src/mc/world/actor/monster/Warden.h b/src/mc/world/actor/monster/Warden.h index 84904514f6..4e07d9c80e 100644 --- a/src/mc/world/actor/monster/Warden.h +++ b/src/mc/world/actor/monster/Warden.h @@ -39,34 +39,34 @@ class Warden : public ::Monster { // vIndex: 10, symbol: __gen_??1Warden@@UEAA@XZ virtual ~Warden() = default; - // vIndex: 25, symbol: ?canDisableShield@Warden@@UEAA_NXZ + // vIndex: 24, symbol: ?canDisableShield@Warden@@UEAA_NXZ virtual bool canDisableShield(); - // vIndex: 29, symbol: ?normalTick@Warden@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Warden@@UEAAXXZ virtual void normalTick(); - // vIndex: 61, symbol: ?setTarget@Warden@@UEAAXPEAVActor@@@Z + // vIndex: 60, symbol: ?setTarget@Warden@@UEAAXPEAVActor@@@Z virtual void setTarget(class Actor* target); - // vIndex: 75, symbol: ?isInvulnerableTo@Warden@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Warden@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 109, symbol: ?onSynchedDataUpdate@Warden@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Warden@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 147, symbol: ?onPush@Warden@@UEAAXAEAVActor@@@Z + // vIndex: 141, symbol: ?onPush@Warden@@UEAAXAEAVActor@@@Z virtual void onPush(class Actor& source); - // vIndex: 158, symbol: ?_hurt@Warden@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Warden@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 173, symbol: ?checkSpawnRules@Warden@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Warden@@UEAA_N_N@Z virtual bool checkSpawnRules(bool); - // vIndex: 174, symbol: ?checkSpawnObstruction@Warden@@UEBA_NXZ + // vIndex: 168, symbol: ?checkSpawnObstruction@Warden@@UEBA_NXZ virtual bool checkSpawnObstruction() const; - // vIndex: 180, symbol: ?doHurtTarget@Warden@@MEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z + // vIndex: 174, symbol: ?doHurtTarget@Warden@@MEAA_NPEAVActor@@AEBW4ActorDamageCause@@@Z virtual bool doHurtTarget(class Actor* target, ::ActorDamageCause const& cause); // symbol: ??0Warden@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Witch.h b/src/mc/world/actor/monster/Witch.h index 1dec933364..b93d02f1ab 100644 --- a/src/mc/world/actor/monster/Witch.h +++ b/src/mc/world/actor/monster/Witch.h @@ -42,16 +42,16 @@ class Witch : public ::HumanoidMonster { // vIndex: 15, symbol: ?getFiringPos@Witch@@UEBA?AVVec3@@XZ virtual class Vec3 getFiringPos() const; - // vIndex: 60, symbol: ?canAttack@Witch@@UEBA_NPEAVActor@@_N@Z + // vIndex: 59, symbol: ?canAttack@Witch@@UEBA_NPEAVActor@@_N@Z virtual bool canAttack(class Actor* actor, bool allowInvulnerable) const; - // vIndex: 80, symbol: ?handleEntityEvent@Witch@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Witch@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@Witch@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@Witch@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 192, symbol: ?getDamageAfterEnchantReduction@Witch@@MEBAMAEBVActorDamageSource@@M@Z + // vIndex: 186, symbol: ?getDamageAfterEnchantReduction@Witch@@MEBAMAEBVActorDamageSource@@M@Z virtual float getDamageAfterEnchantReduction(class ActorDamageSource const& source, float damage) const; // symbol: ??0Witch@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/Zombie.h b/src/mc/world/actor/monster/Zombie.h index 14394c8f42..c7438559e4 100644 --- a/src/mc/world/actor/monster/Zombie.h +++ b/src/mc/world/actor/monster/Zombie.h @@ -47,13 +47,13 @@ class Zombie : public ::HumanoidMonster { // vIndex: 10, symbol: ??1Zombie@@UEAA@XZ virtual ~Zombie(); - // vIndex: 111, symbol: ?canPickupItem@Zombie@@UEBA_NAEBVItemStack@@@Z + // vIndex: 107, symbol: ?canPickupItem@Zombie@@UEBA_NAEBVItemStack@@@Z virtual bool canPickupItem(class ItemStack const& item) const; - // vIndex: 173, symbol: ?checkSpawnRules@Zombie@@UEAA_N_N@Z + // vIndex: 167, symbol: ?checkSpawnRules@Zombie@@UEAA_N_N@Z virtual bool checkSpawnRules(bool fromSpawner); - // vIndex: 181, symbol: ?getArmorValue@Zombie@@MEBAHXZ + // vIndex: 175, symbol: ?getArmorValue@Zombie@@MEBAHXZ virtual int getArmorValue() const; // symbol: ??0Zombie@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/monster/ZombieVillager.h b/src/mc/world/actor/monster/ZombieVillager.h index f2248d2944..bf2f59523d 100644 --- a/src/mc/world/actor/monster/ZombieVillager.h +++ b/src/mc/world/actor/monster/ZombieVillager.h @@ -43,13 +43,13 @@ class ZombieVillager : public ::Zombie { // vIndex: 10, symbol: __gen_??1ZombieVillager@@UEAA@XZ virtual ~ZombieVillager() = default; - // vIndex: 80, symbol: ?handleEntityEvent@ZombieVillager@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@ZombieVillager@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 159, symbol: ?readAdditionalSaveData@ZombieVillager@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@ZombieVillager@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@ZombieVillager@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@ZombieVillager@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0ZombieVillager@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/npc/Villager.h b/src/mc/world/actor/npc/Villager.h index dd3ff1e93f..ad99eb568d 100644 --- a/src/mc/world/actor/npc/Villager.h +++ b/src/mc/world/actor/npc/Villager.h @@ -42,7 +42,7 @@ class Villager : public ::VillagerBase { // vIndex: 10, symbol: __gen_??1Villager@@UEAA@XZ virtual ~Villager() = default; - // vIndex: 118, symbol: + // vIndex: 114, symbol: // ?buildDebugInfo@Villager@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void buildDebugInfo(std::string& out) const; diff --git a/src/mc/world/actor/npc/VillagerBase.h b/src/mc/world/actor/npc/VillagerBase.h index 3adb1f8a9f..1de7aeea79 100644 --- a/src/mc/world/actor/npc/VillagerBase.h +++ b/src/mc/world/actor/npc/VillagerBase.h @@ -40,16 +40,16 @@ class VillagerBase : public ::Mob { // vIndex: 10, symbol: ??1VillagerBase@@UEAA@XZ virtual ~VillagerBase(); - // vIndex: 78, symbol: ?onLightningHit@VillagerBase@@UEAAXXZ + // vIndex: 77, symbol: ?onLightningHit@VillagerBase@@UEAAXXZ virtual void onLightningHit(); - // vIndex: 80, symbol: ?handleEntityEvent@VillagerBase@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@VillagerBase@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent event, int data); - // vIndex: 159, symbol: ?readAdditionalSaveData@VillagerBase@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@VillagerBase@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@VillagerBase@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@VillagerBase@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0VillagerBase@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/npc/VillagerV2.h b/src/mc/world/actor/npc/VillagerV2.h index 315f3fa2c0..6112c10e55 100644 --- a/src/mc/world/actor/npc/VillagerV2.h +++ b/src/mc/world/actor/npc/VillagerV2.h @@ -48,20 +48,20 @@ class VillagerV2 : public ::VillagerBase { // vIndex: 14, symbol: ?isRuntimePredictedMovementEnabled@VillagerV2@@UEBA_NXZ virtual bool isRuntimePredictedMovementEnabled() const; - // vIndex: 118, symbol: + // vIndex: 114, symbol: // ?buildDebugInfo@VillagerV2@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void buildDebugInfo(std::string& out) const; - // vIndex: 136, symbol: ?getInteraction@VillagerV2@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z + // vIndex: 130, symbol: ?getInteraction@VillagerV2@@UEAA_NAEAVPlayer@@AEAVActorInteraction@@AEBVVec3@@@Z virtual bool getInteraction(class Player& player, class ActorInteraction& interaction, class Vec3 const& location); - // vIndex: 143, symbol: ?die@VillagerV2@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@VillagerV2@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@VillagerV2@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@VillagerV2@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); - // vIndex: 201, symbol: ?newServerAiStep@VillagerV2@@UEAAXXZ + // vIndex: 194, symbol: ?newServerAiStep@VillagerV2@@UEAAXXZ virtual void newServerAiStep(); // symbol: ??0VillagerV2@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/npc/WanderingTrader.h b/src/mc/world/actor/npc/WanderingTrader.h index 9de8a439b4..03d2d5aa8d 100644 --- a/src/mc/world/actor/npc/WanderingTrader.h +++ b/src/mc/world/actor/npc/WanderingTrader.h @@ -39,7 +39,7 @@ class WanderingTrader : public ::Mob { // vIndex: 10, symbol: __gen_??1WanderingTrader@@UEAA@XZ virtual ~WanderingTrader() = default; - // vIndex: 156, symbol: ?updateEntitySpecificMolangVariables@WanderingTrader@@UEAAXAEAVRenderParams@@@Z + // vIndex: 150, symbol: ?updateEntitySpecificMolangVariables@WanderingTrader@@UEAAXAEAVRenderParams@@@Z virtual void updateEntitySpecificMolangVariables(class RenderParams& renderParams); // symbol: ??0WanderingTrader@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/npc/npc.h b/src/mc/world/actor/npc/npc.h index 81244ee4dd..edb357eb18 100644 --- a/src/mc/world/actor/npc/npc.h +++ b/src/mc/world/actor/npc/npc.h @@ -45,41 +45,38 @@ class Npc : public ::Mob { // vIndex: 10, symbol: __gen_??1Npc@@UEAA@XZ virtual ~Npc() = default; - // vIndex: 23, symbol: ?breaksFallingBlocks@Npc@@UEBA_NXZ - virtual bool breaksFallingBlocks() const; - - // vIndex: 38, symbol: ?canShowNameTag@Npc@@UEBA_NXZ + // vIndex: 37, symbol: ?canShowNameTag@Npc@@UEBA_NXZ virtual bool canShowNameTag() const; - // vIndex: 40, symbol: ?getNameTagTextColor@Npc@@UEBA?AVColor@mce@@XZ + // vIndex: 39, symbol: ?getNameTagTextColor@Npc@@UEBA?AVColor@mce@@XZ virtual class mce::Color getNameTagTextColor() const; - // vIndex: 57, symbol: ?isTargetable@Npc@@UEBA_NXZ + // vIndex: 56, symbol: ?isTargetable@Npc@@UEBA_NXZ virtual bool isTargetable() const; - // vIndex: 112, symbol: ?canBePulledIntoVehicle@Npc@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@Npc@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 118, symbol: + // vIndex: 114, symbol: // ?buildDebugInfo@Npc@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void buildDebugInfo(std::string& out) const; - // vIndex: 121, symbol: ?canBeAffected@Npc@@UEBA_NI@Z + // vIndex: 117, symbol: ?canBeAffected@Npc@@UEBA_NI@Z virtual bool canBeAffected(uint) const; - // vIndex: 143, symbol: ?die@Npc@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Npc@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const&); - // vIndex: 158, symbol: ?_hurt@Npc@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Npc@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float, bool, bool); - // vIndex: 163, symbol: ?knockback@Npc@@UEAAXPEAVActor@@HMMMMM@Z + // vIndex: 157, symbol: ?knockback@Npc@@UEAAXPEAVActor@@HMMMMM@Z virtual void knockback(class Actor*, int, float, float, float, float, float); - // vIndex: 199, symbol: ?canExistWhenDisallowMob@Npc@@UEBA_NXZ + // vIndex: 192, symbol: ?canExistWhenDisallowMob@Npc@@UEBA_NXZ virtual bool canExistWhenDisallowMob() const; - // vIndex: 201, symbol: ?newServerAiStep@Npc@@UEAAXXZ + // vIndex: 194, symbol: ?newServerAiStep@Npc@@UEAAXXZ virtual void newServerAiStep(); // symbol: ??0Npc@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/player/Player.h b/src/mc/world/actor/player/Player.h index 6583866766..3e7fc3b5d0 100644 --- a/src/mc/world/actor/player/Player.h +++ b/src/mc/world/actor/player/Player.h @@ -23,6 +23,8 @@ #include "mc/enums/BuildPlatform.h" #include "mc/enums/GameType.h" #include "mc/enums/HandSlot.h" +#include "mc/enums/HudElement.h" +#include "mc/enums/HudVisibility.h" #include "mc/enums/InputMode.h" #include "mc/enums/MaterialType.h" #include "mc/enums/MobSpawnMethod.h" @@ -197,304 +199,298 @@ class Player : public ::Mob { // vIndex: 22, symbol: ?isFireImmune@Player@@UEBA_NXZ virtual bool isFireImmune() const; - // vIndex: 26, symbol: ?teleportTo@Player@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@Player@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int sourceEntityType, bool); - // vIndex: 28, symbol: + // vIndex: 27, symbol: // ?tryCreateAddActorPacket@Player@@UEAA?AV?$unique_ptr@VAddActorBasePacket@@U?$default_delete@VAddActorBasePacket@@@std@@@std@@XZ virtual std::unique_ptr tryCreateAddActorPacket(); - // vIndex: 29, symbol: ?normalTick@Player@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Player@@UEAAXXZ virtual void normalTick(); - // vIndex: 31, symbol: ?passengerTick@Player@@UEAAXXZ + // vIndex: 30, symbol: ?passengerTick@Player@@UEAAXXZ virtual void passengerTick(); - // vIndex: 40, symbol: ?getNameTagTextColor@Player@@UEBA?AVColor@mce@@XZ + // vIndex: 39, symbol: ?getNameTagTextColor@Player@@UEBA?AVColor@mce@@XZ virtual class mce::Color getNameTagTextColor() const; - // vIndex: 41, symbol: ?getShadowRadius@Player@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@Player@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 43, symbol: ?canInteractWithOtherEntitiesInGame@Player@@UEBA_NXZ + // vIndex: 42, symbol: ?canInteractWithOtherEntitiesInGame@Player@@UEBA_NXZ virtual bool canInteractWithOtherEntitiesInGame() const; - // vIndex: 46, symbol: ?isImmobile@Player@@UEBA_NXZ + // vIndex: 45, symbol: ?isImmobile@Player@@UEBA_NXZ virtual bool isImmobile() const; - // vIndex: 47, symbol: ?isSilentObserver@Player@@UEBA_NXZ + // vIndex: 46, symbol: ?isSilentObserver@Player@@UEBA_NXZ virtual bool isSilentObserver() const; - // vIndex: 49, symbol: ?isSleeping@Player@@UEBA_NXZ + // vIndex: 48, symbol: ?isSleeping@Player@@UEBA_NXZ virtual bool isSleeping() const; - // vIndex: 50, symbol: ?setSleeping@Player@@UEAAX_N@Z + // vIndex: 49, symbol: ?setSleeping@Player@@UEAAX_N@Z virtual void setSleeping(bool val); - // vIndex: 52, symbol: ?isBlocking@Player@@UEBA_NXZ + // vIndex: 51, symbol: ?isBlocking@Player@@UEBA_NXZ virtual bool isBlocking() const; - // vIndex: 53, symbol: ?isDamageBlocked@Player@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 52, symbol: ?isDamageBlocked@Player@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isDamageBlocked(class ActorDamageSource const& source) const; - // vIndex: 59, symbol: ?isPlayer@Player@@UEBA_NXZ + // vIndex: 58, symbol: ?isPlayer@Player@@UEBA_NXZ virtual bool isPlayer() const; - // vIndex: 63, symbol: ?attack@Player@@UEAA_NAEAVActor@@AEBW4ActorDamageCause@@@Z + // vIndex: 62, symbol: ?attack@Player@@UEAA_NAEAVActor@@AEBW4ActorDamageCause@@@Z virtual bool attack(class Actor& actor, ::ActorDamageCause const& cause); - // vIndex: 75, symbol: ?isInvulnerableTo@Player@@UEBA_NAEBVActorDamageSource@@@Z + // vIndex: 74, symbol: ?isInvulnerableTo@Player@@UEBA_NAEBVActorDamageSource@@@Z virtual bool isInvulnerableTo(class ActorDamageSource const& source) const; - // vIndex: 79, symbol: ?feed@Player@@UEAAXH@Z + // vIndex: 78, symbol: ?feed@Player@@UEAAXH@Z virtual void feed(int itemId); - // vIndex: 80, symbol: ?handleEntityEvent@Player@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@Player@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 82, symbol: ?getActorRendererId@Player@@UEBAAEBVHashedString@@XZ + // vIndex: 81, symbol: ?getActorRendererId@Player@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getActorRendererId() const; - // vIndex: 84, symbol: ?setArmor@Player@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z + // vIndex: 83, symbol: ?setArmor@Player@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z virtual void setArmor(::ArmorSlot slot, class ItemStack const& item); - // vIndex: 89, symbol: ?setCarriedItem@Player@@UEAAXAEBVItemStack@@@Z + // vIndex: 88, symbol: ?setCarriedItem@Player@@UEAAXAEBVItemStack@@@Z virtual void setCarriedItem(class ItemStack const& item); - // vIndex: 90, symbol: ?getCarriedItem@Player@@UEBAAEBVItemStack@@XZ + // vIndex: 89, symbol: ?getCarriedItem@Player@@UEBAAEBVItemStack@@XZ virtual class ItemStack const& getCarriedItem() const; - // vIndex: 91, symbol: ?setOffhandSlot@Player@@UEAAXAEBVItemStack@@@Z + // vIndex: 90, symbol: ?setOffhandSlot@Player@@UEAAXAEBVItemStack@@@Z virtual void setOffhandSlot(class ItemStack const& item); - // vIndex: 92, symbol: ?getEquippedTotem@Player@@UEBAAEBVItemStack@@XZ + // vIndex: 91, symbol: ?getEquippedTotem@Player@@UEBAAEBVItemStack@@XZ virtual class ItemStack const& getEquippedTotem() const; - // vIndex: 93, symbol: ?consumeTotem@Player@@UEAA_NXZ + // vIndex: 92, symbol: ?consumeTotem@Player@@UEAA_NXZ virtual bool consumeTotem(); - // vIndex: 98, symbol: ?canFreeze@Player@@UEBA_NXZ + // vIndex: 97, symbol: ?canFreeze@Player@@UEBA_NXZ virtual bool canFreeze() const; - // vIndex: 101, symbol: ?getPortalCooldown@Player@@UEBAHXZ - virtual int getPortalCooldown() const; - - // vIndex: 102, symbol: ?getPortalWaitTime@Player@@UEBAHXZ - virtual int getPortalWaitTime() const; - - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@Player@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@Player@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 108, symbol: ?causeFallDamageToActor@Player@@UEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@Player@@UEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 109, symbol: ?onSynchedDataUpdate@Player@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@Player@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 110, symbol: ?canAddPassenger@Player@@UEBA_NAEAVActor@@@Z + // vIndex: 106, symbol: ?canAddPassenger@Player@@UEBA_NAEAVActor@@@Z virtual bool canAddPassenger(class Actor&) const; - // vIndex: 112, symbol: ?canBePulledIntoVehicle@Player@@UEBA_NXZ + // vIndex: 108, symbol: ?canBePulledIntoVehicle@Player@@UEBA_NXZ virtual bool canBePulledIntoVehicle() const; - // vIndex: 114, symbol: ?sendMotionPacketIfNeeded@Player@@UEAAXAEBUPlayerMovementSettings@@@Z + // vIndex: 110, symbol: ?sendMotionPacketIfNeeded@Player@@UEAAXAEBUPlayerMovementSettings@@@Z virtual void sendMotionPacketIfNeeded(struct PlayerMovementSettings const&); - // vIndex: 116, symbol: ?startSwimming@Player@@UEAAXXZ + // vIndex: 112, symbol: ?startSwimming@Player@@UEAAXXZ virtual void startSwimming(); - // vIndex: 117, symbol: ?stopSwimming@Player@@UEAAXXZ + // vIndex: 113, symbol: ?stopSwimming@Player@@UEAAXXZ virtual void stopSwimming(); - // vIndex: 119, symbol: ?getCommandPermissionLevel@Player@@UEBA?AW4CommandPermissionLevel@@XZ + // vIndex: 115, symbol: ?getCommandPermissionLevel@Player@@UEBA?AW4CommandPermissionLevel@@XZ virtual ::CommandPermissionLevel getCommandPermissionLevel() const; - // vIndex: 126, symbol: ?canObstructSpawningAndBlockPlacement@Player@@UEBA_NXZ + // vIndex: 120, symbol: ?canObstructSpawningAndBlockPlacement@Player@@UEBA_NXZ virtual bool canObstructSpawningAndBlockPlacement() const; - // vIndex: 127, symbol: ?getAnimationComponent@Player@@UEAAAEAVAnimationComponent@@XZ + // vIndex: 121, symbol: ?getAnimationComponent@Player@@UEAAAEAVAnimationComponent@@XZ virtual class AnimationComponent& getAnimationComponent(); - // vIndex: 130, symbol: ?useItem@Player@@UEAAXAEAVItemStackBase@@W4ItemUseMethod@@_N@Z + // vIndex: 124, symbol: ?useItem@Player@@UEAAXAEAVItemStackBase@@W4ItemUseMethod@@_N@Z virtual void useItem(class ItemStackBase& instance, ::ItemUseMethod itemUseMethod, bool consumeItem); - // vIndex: 132, symbol: ?getMapDecorationRotation@Player@@UEBAMXZ + // vIndex: 126, symbol: ?getMapDecorationRotation@Player@@UEBAMXZ virtual float getMapDecorationRotation() const; - // vIndex: 134, symbol: ?add@Player@@UEAA_NAEAVItemStack@@@Z + // vIndex: 128, symbol: ?add@Player@@UEAA_NAEAVItemStack@@@Z virtual bool add(class ItemStack& item); - // vIndex: 135, symbol: ?drop@Player@@UEAA_NAEBVItemStack@@_N@Z + // vIndex: 129, symbol: ?drop@Player@@UEAA_NAEBVItemStack@@_N@Z virtual bool drop(class ItemStack const& item, bool randomly); - // vIndex: 139, symbol: ?startSpinAttack@Player@@UEAAXXZ + // vIndex: 133, symbol: ?startSpinAttack@Player@@UEAAXXZ virtual void startSpinAttack(); - // vIndex: 140, symbol: ?stopSpinAttack@Player@@UEAAXXZ + // vIndex: 134, symbol: ?stopSpinAttack@Player@@UEAAXXZ virtual void stopSpinAttack(); - // vIndex: 143, symbol: ?die@Player@@UEAAXAEBVActorDamageSource@@@Z + // vIndex: 137, symbol: ?die@Player@@UEAAXAEBVActorDamageSource@@@Z virtual void die(class ActorDamageSource const& source); - // vIndex: 144, symbol: ?shouldDropDeathLoot@Player@@UEBA_NXZ + // vIndex: 138, symbol: ?shouldDropDeathLoot@Player@@UEBA_NXZ virtual bool shouldDropDeathLoot() const; - // vIndex: 148, symbol: ?getLastDeathPos@Player@@UEBA?AV?$optional@VBlockPos@@@std@@XZ + // vIndex: 142, symbol: ?getLastDeathPos@Player@@UEBA?AV?$optional@VBlockPos@@@std@@XZ virtual std::optional getLastDeathPos() const; - // vIndex: 149, symbol: ?getLastDeathDimension@Player@@UEBA?AV?$optional@V?$AutomaticID@VDimension@@H@@@std@@XZ + // vIndex: 143, symbol: ?getLastDeathDimension@Player@@UEBA?AV?$optional@V?$AutomaticID@VDimension@@H@@@std@@XZ virtual std::optional getLastDeathDimension() const; - // vIndex: 150, symbol: ?hasDiedBefore@Player@@UEBA_NXZ + // vIndex: 144, symbol: ?hasDiedBefore@Player@@UEBA_NXZ virtual bool hasDiedBefore() const; - // vIndex: 151, symbol: ?doEnterWaterSplashEffect@Player@@UEAAXXZ + // vIndex: 145, symbol: ?doEnterWaterSplashEffect@Player@@UEAAXXZ virtual void doEnterWaterSplashEffect(); - // vIndex: 152, symbol: ?doExitWaterSplashEffect@Player@@UEAAXXZ + // vIndex: 146, symbol: ?doExitWaterSplashEffect@Player@@UEAAXXZ virtual void doExitWaterSplashEffect(); - // vIndex: 154, symbol: ?_shouldProvideFeedbackOnHandContainerItemSet@Player@@MEBA_NW4HandSlot@@AEBVItemStack@@@Z + // vIndex: 148, symbol: ?_shouldProvideFeedbackOnHandContainerItemSet@Player@@MEBA_NW4HandSlot@@AEBVItemStack@@@Z virtual bool _shouldProvideFeedbackOnHandContainerItemSet(::HandSlot, class ItemStack const&) const; - // vIndex: 155, symbol: ?_shouldProvideFeedbackOnArmorSet@Player@@MEBA_NW4ArmorSlot@@AEBVItemStack@@@Z + // vIndex: 149, symbol: ?_shouldProvideFeedbackOnArmorSet@Player@@MEBA_NW4ArmorSlot@@AEBVItemStack@@@Z virtual bool _shouldProvideFeedbackOnArmorSet(::ArmorSlot slot, class ItemStack const& item) const; - // vIndex: 158, symbol: ?_hurt@Player@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@Player@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@Player@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Player@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Player@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Player@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& entityTag) const; - // vIndex: 168, symbol: ?getSpeed@Player@@UEBAMXZ + // vIndex: 162, symbol: ?getSpeed@Player@@UEBAMXZ virtual float getSpeed() const; - // vIndex: 169, symbol: ?setSpeed@Player@@UEAAXM@Z + // vIndex: 163, symbol: ?setSpeed@Player@@UEAAXM@Z virtual void setSpeed(float _speed); - // vIndex: 171, symbol: ?aiStep@Player@@UEAAXXZ + // vIndex: 165, symbol: ?aiStep@Player@@UEAAXXZ virtual void aiStep(); - // vIndex: 175, symbol: ?getItemUseDuration@Player@@UEBAHXZ + // vIndex: 169, symbol: ?getItemUseDuration@Player@@UEBAHXZ virtual int getItemUseDuration() const; - // vIndex: 176, symbol: ?getItemUseStartupProgress@Player@@UEBAMXZ + // vIndex: 170, symbol: ?getItemUseStartupProgress@Player@@UEBAMXZ virtual float getItemUseStartupProgress() const; - // vIndex: 177, symbol: ?getItemUseIntervalProgress@Player@@UEBAMXZ + // vIndex: 171, symbol: ?getItemUseIntervalProgress@Player@@UEBAMXZ virtual float getItemUseIntervalProgress() const; - // vIndex: 186, symbol: + // vIndex: 180, symbol: // ?getAllHand@Player@@UEBA?AV?$vector@PEBVItemStack@@V?$allocator@PEBVItemStack@@@std@@@std@@XZ virtual std::vector getAllHand() const; - // vIndex: 187, symbol: + // vIndex: 181, symbol: // ?getAllEquipment@Player@@UEBA?AV?$vector@PEBVItemStack@@V?$allocator@PEBVItemStack@@@std@@@std@@XZ virtual std::vector getAllEquipment() const; - // vIndex: 188, symbol: ?dropEquipmentOnDeath@Player@@UEAAXAEBVActorDamageSource@@H@Z + // vIndex: 182, symbol: ?dropEquipmentOnDeath@Player@@UEAAXAEBVActorDamageSource@@H@Z virtual void dropEquipmentOnDeath(class ActorDamageSource const& source, int lootBonusLevel); - // vIndex: 189, symbol: ?dropEquipmentOnDeath@Player@@UEAAXXZ + // vIndex: 183, symbol: ?dropEquipmentOnDeath@Player@@UEAAXXZ virtual void dropEquipmentOnDeath(); - // vIndex: 190, symbol: ?clearVanishEnchantedItemsOnDeath@Player@@UEAAXXZ + // vIndex: 184, symbol: ?clearVanishEnchantedItemsOnDeath@Player@@UEAAXXZ virtual void clearVanishEnchantedItemsOnDeath(); - // vIndex: 191, symbol: ?sendInventory@Player@@UEAAX_N@Z + // vIndex: 185, symbol: ?sendInventory@Player@@UEAAX_N@Z virtual void sendInventory(bool shouldSelectSlot); - // vIndex: 199, symbol: ?canExistWhenDisallowMob@Player@@UEBA_NXZ + // vIndex: 192, symbol: ?canExistWhenDisallowMob@Player@@UEBA_NXZ virtual bool canExistWhenDisallowMob() const; - // vIndex: 200, symbol: + // vIndex: 193, symbol: // ?initBodyControl@Player@@EEAA?AV?$unique_ptr@VBodyControl@@U?$default_delete@VBodyControl@@@std@@@std@@XZ virtual std::unique_ptr initBodyControl(); - // vIndex: 204, symbol: ?prepareRegion@Player@@UEAAXAEAVChunkSource@@@Z + // vIndex: 197, symbol: ?prepareRegion@Player@@UEAAXAEAVChunkSource@@@Z virtual void prepareRegion(class ChunkSource& mainChunkSource); - // vIndex: 205, symbol: ?destroyRegion@Player@@UEAAXXZ + // vIndex: 198, symbol: ?destroyRegion@Player@@UEAAXXZ virtual void destroyRegion(); - // vIndex: 206, symbol: ?suspendRegion@Player@@UEAAXXZ + // vIndex: 199, symbol: ?suspendRegion@Player@@UEAAXXZ virtual void suspendRegion(); - // vIndex: 207, symbol: ?_fireDimensionChanged@Player@@UEAAXXZ + // vIndex: 200, symbol: ?_fireDimensionChanged@Player@@UEAAXXZ virtual void _fireDimensionChanged(); - // vIndex: 208, symbol: ?changeDimensionWithCredits@Player@@UEAAXV?$AutomaticID@VDimension@@H@@@Z + // vIndex: 201, symbol: ?changeDimensionWithCredits@Player@@UEAAXV?$AutomaticID@VDimension@@H@@@Z virtual void changeDimensionWithCredits(DimensionType dimension); - // vIndex: 209, symbol: ?tickWorld@Player@@UEAAXAEBUTick@@@Z + // vIndex: 202, symbol: ?tickWorld@Player@@UEAAXAEBUTick@@@Z virtual void tickWorld(struct Tick const&); - // vIndex: 210, symbol: ?frameUpdate@ServerPlayer@@UEAAXAEAVFrameUpdateContextBase@@@Z + // vIndex: 203, symbol: ?frameUpdate@ServerPlayer@@UEAAXAEAVFrameUpdateContextBase@@@Z virtual void frameUpdate(class FrameUpdateContextBase&) = 0; - // vIndex: 211, symbol: + // vIndex: 204, symbol: // ?getTickingOffsets@Player@@UEBAAEBV?$vector@VChunkPos@@V?$allocator@VChunkPos@@@std@@@std@@XZ virtual std::vector const& getTickingOffsets() const; - // vIndex: 212, symbol: ?moveView@Player@@UEAAXXZ + // vIndex: 205, symbol: ?moveView@Player@@UEAAXXZ virtual void moveView(); - // vIndex: 213, symbol: ?moveSpawnView@Player@@UEAAXAEBVVec3@@V?$AutomaticID@VDimension@@H@@@Z + // vIndex: 206, symbol: ?moveSpawnView@Player@@UEAAXAEBVVec3@@V?$AutomaticID@VDimension@@H@@@Z virtual void moveSpawnView(class Vec3 const& spawnPosition, DimensionType dimensionType); - // vIndex: 214, symbol: ?checkMovementStats@Player@@UEAAXAEBVVec3@@@Z + // vIndex: 207, symbol: ?checkMovementStats@Player@@UEAAXAEBVVec3@@@Z virtual void checkMovementStats(class Vec3 const& d); - // vIndex: 215, symbol: ?getCurrentStructureFeature@Player@@UEBA?AW4StructureFeatureType@@XZ + // vIndex: 208, symbol: ?getCurrentStructureFeature@Player@@UEBA?AW4StructureFeatureType@@XZ virtual ::StructureFeatureType getCurrentStructureFeature() const; - // vIndex: 216, symbol: ?isAutoJumpEnabled@Player@@UEBA_NXZ + // vIndex: 209, symbol: ?isAutoJumpEnabled@Player@@UEBA_NXZ virtual bool isAutoJumpEnabled() const; - // vIndex: 217, symbol: ?respawn@Player@@UEAAXXZ + // vIndex: 210, symbol: ?respawn@Player@@UEAAXXZ virtual void respawn(); - // vIndex: 218, symbol: ?resetRot@Player@@UEAAXXZ + // vIndex: 211, symbol: ?resetRot@Player@@UEAAXXZ virtual void resetRot(); - // vIndex: 219, symbol: ?isInTrialMode@Player@@UEAA_NXZ + // vIndex: 212, symbol: ?isInTrialMode@Player@@UEAA_NXZ virtual bool isInTrialMode(); - // vIndex: 220, symbol: ?openPortfolio@Player@@UEAAXXZ + // vIndex: 213, symbol: ?openPortfolio@Player@@UEAAXXZ virtual void openPortfolio(); - // vIndex: 221, symbol: ?openBook@Player@@UEAAXH_NHPEAVBlockActor@@@Z + // vIndex: 214, symbol: ?openBook@Player@@UEAAXH_NHPEAVBlockActor@@@Z virtual void openBook(int bookSlot, bool editable, int page, class BlockActor* lectern); - // vIndex: 222, symbol: ?openTrading@Player@@UEAAXAEBUActorUniqueID@@_N@Z + // vIndex: 215, symbol: ?openTrading@Player@@UEAAXAEBUActorUniqueID@@_N@Z virtual void openTrading(struct ActorUniqueID const& uniqueID, bool useNewScreen); - // vIndex: 223, symbol: ?openChalkboard@Player@@UEAAXAEAVChalkboardBlockActor@@_N@Z + // vIndex: 216, symbol: ?openChalkboard@Player@@UEAAXAEAVChalkboardBlockActor@@_N@Z virtual void openChalkboard(class ChalkboardBlockActor& chalkboard, bool showLockToggle); - // vIndex: 224, symbol: ?openNpcInteractScreen@Player@@UEAAXV?$shared_ptr@UINpcDialogueData@@@std@@@Z + // vIndex: 217, symbol: ?openNpcInteractScreen@Player@@UEAAXV?$shared_ptr@UINpcDialogueData@@@std@@@Z virtual void openNpcInteractScreen(std::shared_ptr npc); - // vIndex: 225, symbol: ?openInventory@Player@@UEAAXXZ + // vIndex: 218, symbol: ?openInventory@Player@@UEAAXXZ virtual void openInventory(); - // vIndex: 226, symbol: + // vIndex: 219, symbol: // ?displayChatMessage@Player@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z virtual void displayChatMessage(std::string const& author, std::string const& message); - // vIndex: 227, symbol: + // vIndex: 220, symbol: // ?displayClientMessage@Player@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void displayClientMessage(std::string const& message); - // vIndex: 228, symbol: + // vIndex: 221, symbol: // ?displayTextObjectMessage@Player@@UEAAXAEBVTextObjectRoot@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@1@Z virtual void displayTextObjectMessage(class TextObjectRoot const& textObject, std::string const&, std::string const&); - // vIndex: 229, symbol: + // vIndex: 222, symbol: // ?displayTextObjectWhisperMessage@Player@@UEAAXAEBVResolvedTextObject@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@1@Z virtual void displayTextObjectWhisperMessage( class ResolvedTextObject const&, @@ -502,12 +498,12 @@ class Player : public ::Mob { std::string const& platformId ); - // vIndex: 230, symbol: + // vIndex: 223, symbol: // ?displayTextObjectWhisperMessage@Player@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z virtual void displayTextObjectWhisperMessage(std::string const& message, std::string const& xuid, std::string const& platformId); - // vIndex: 231, symbol: + // vIndex: 224, symbol: // ?displayWhisperMessage@Player@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000@Z virtual void displayWhisperMessage( std::string const& author, @@ -516,56 +512,56 @@ class Player : public ::Mob { std::string const& platformId ); - // vIndex: 232, symbol: ?startSleepInBed@Player@@UEAA?AW4BedSleepingResult@@AEBVBlockPos@@@Z + // vIndex: 225, symbol: ?startSleepInBed@Player@@UEAA?AW4BedSleepingResult@@AEBVBlockPos@@@Z virtual ::BedSleepingResult startSleepInBed(class BlockPos const&); - // vIndex: 233, symbol: ?stopSleepInBed@Player@@UEAAX_N0@Z + // vIndex: 226, symbol: ?stopSleepInBed@Player@@UEAAX_N0@Z virtual void stopSleepInBed(bool forcefulWakeUp, bool updateLevelList); - // vIndex: 234, symbol: ?canStartSleepInBed@Player@@UEAA_NXZ + // vIndex: 227, symbol: ?canStartSleepInBed@Player@@UEAA_NXZ virtual bool canStartSleepInBed(); - // vIndex: 235, symbol: ?openSign@Player@@UEAAXAEBVBlockPos@@_N@Z + // vIndex: 228, symbol: ?openSign@Player@@UEAAXAEBVBlockPos@@_N@Z virtual void openSign(class BlockPos const&, bool); - // vIndex: 236, symbol: + // vIndex: 229, symbol: // ?playEmote@Player@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@Z virtual void playEmote(std::string const& pieceId, bool); - // vIndex: 237, symbol: ?isLoading@Player@@UEBA_NXZ + // vIndex: 230, symbol: ?isLoading@Player@@UEBA_NXZ virtual bool isLoading() const; - // vIndex: 238, symbol: ?isPlayerInitialized@Player@@UEBA_NXZ + // vIndex: 231, symbol: ?isPlayerInitialized@Player@@UEBA_NXZ virtual bool isPlayerInitialized() const; - // vIndex: 239, symbol: ?stopLoading@Player@@UEAAXXZ + // vIndex: 232, symbol: ?stopLoading@Player@@UEAAXXZ virtual void stopLoading(); - // vIndex: 240, symbol: ?setPlayerGameType@Player@@UEAAXW4GameType@@@Z + // vIndex: 233, symbol: ?setPlayerGameType@Player@@UEAAXW4GameType@@@Z virtual void setPlayerGameType(::GameType gameType); - // vIndex: 241, symbol: ?initHUDContainerManager@Player@@UEAAXXZ + // vIndex: 234, symbol: ?initHUDContainerManager@Player@@UEAAXXZ virtual void initHUDContainerManager(); - // vIndex: 242, symbol: ?_crit@Player@@UEAAXAEAVActor@@@Z + // vIndex: 235, symbol: ?_crit@Player@@UEAAXAEAVActor@@@Z virtual void _crit(class Actor& actor); - // vIndex: 243, symbol: ?getEventing@Player@@UEBAPEAVIMinecraftEventing@@XZ + // vIndex: 236, symbol: ?getEventing@Player@@UEBAPEAVIMinecraftEventing@@XZ virtual class IMinecraftEventing* getEventing() const; - // vIndex: 244, symbol: ?getUserId@Player@@UEBAIXZ + // vIndex: 237, symbol: ?getUserId@Player@@UEBAIXZ virtual uint getUserId() const; - // vIndex: 245, symbol: ?addExperience@Player@@UEAAXH@Z + // vIndex: 238, symbol: ?addExperience@Player@@UEAAXH@Z virtual void addExperience(int xp); - // vIndex: 246, symbol: ?addLevels@Player@@UEAAXH@Z + // vIndex: 239, symbol: ?addLevels@Player@@UEAAXH@Z virtual void addLevels(int levels); - // vIndex: 247, symbol: ?setContainerData@ServerPlayer@@UEAAXAEAVIContainerManager@@HH@Z + // vIndex: 240, symbol: ?setContainerData@ServerPlayer@@UEAAXAEAVIContainerManager@@HH@Z virtual void setContainerData(class IContainerManager& menu, int id, int value) = 0; - // vIndex: 248, symbol: ?slotChanged@ServerPlayer@@UEAAXAEAVIContainerManager@@AEAVContainer@@HAEBVItemStack@@2_N@Z + // vIndex: 241, symbol: ?slotChanged@ServerPlayer@@UEAAXAEAVIContainerManager@@AEAVContainer@@HAEBVItemStack@@2_N@Z virtual void slotChanged( class IContainerManager& menu, class Container& container, @@ -575,66 +571,66 @@ class Player : public ::Mob { bool isResultSlot ) = 0; - // vIndex: 249, symbol: ?refreshContainer@ServerPlayer@@UEAAXAEAVIContainerManager@@@Z + // vIndex: 242, symbol: ?refreshContainer@ServerPlayer@@UEAAXAEAVIContainerManager@@@Z virtual void refreshContainer(class IContainerManager& menu) = 0; - // vIndex: 250, symbol: ?deleteContainerManager@Player@@UEAAXXZ + // vIndex: 243, symbol: ?deleteContainerManager@Player@@UEAAXXZ virtual void deleteContainerManager(); - // vIndex: 251, symbol: ?isActorRelevant@Player@@UEAA_NAEBVActor@@@Z + // vIndex: 244, symbol: ?isActorRelevant@Player@@UEAA_NAEBVActor@@@Z virtual bool isActorRelevant(class Actor const& actor); - // vIndex: 252, symbol: ?isTeacher@ServerPlayer@@UEBA_NXZ + // vIndex: 245, symbol: ?isTeacher@ServerPlayer@@UEBA_NXZ virtual bool isTeacher() const = 0; - // vIndex: 253, symbol: ?onSuspension@Player@@UEAAXXZ + // vIndex: 246, symbol: ?onSuspension@Player@@UEAAXXZ virtual void onSuspension(); - // vIndex: 254, symbol: ?onLinkedSlotsChanged@Player@@UEAAXXZ + // vIndex: 247, symbol: ?onLinkedSlotsChanged@Player@@UEAAXXZ virtual void onLinkedSlotsChanged(); - // vIndex: 255, symbol: ?sendInventoryTransaction@ServerPlayer@@UEBAXAEBVInventoryTransaction@@@Z + // vIndex: 248, symbol: ?sendInventoryTransaction@ServerPlayer@@UEBAXAEBVInventoryTransaction@@@Z virtual void sendInventoryTransaction(class InventoryTransaction const& transaction) const = 0; - // vIndex: 256, symbol: + // vIndex: 249, symbol: // ?sendComplexInventoryTransaction@ServerPlayer@@UEBAXV?$unique_ptr@VComplexInventoryTransaction@@U?$default_delete@VComplexInventoryTransaction@@@std@@@std@@@Z virtual void sendComplexInventoryTransaction(std::unique_ptr transaction ) const = 0; - // vIndex: 257, symbol: ?sendNetworkPacket@Player@@UEBAXAEAVPacket@@@Z + // vIndex: 250, symbol: ?sendNetworkPacket@Player@@UEBAXAEAVPacket@@@Z virtual void sendNetworkPacket(class Packet& packet) const; - // vIndex: 258, symbol: ?getPlayerEventCoordinator@ServerPlayer@@UEAAAEAVPlayerEventCoordinator@@XZ + // vIndex: 251, symbol: ?getPlayerEventCoordinator@ServerPlayer@@UEAAAEAVPlayerEventCoordinator@@XZ virtual class PlayerEventCoordinator& getPlayerEventCoordinator() = 0; - // vIndex: 259, symbol: ?isSimulated@Player@@UEBA_NXZ + // vIndex: 252, symbol: ?isSimulated@Player@@UEBA_NXZ virtual bool isSimulated() const; - // vIndex: 260, symbol: ?getXuid@Player@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + // vIndex: 253, symbol: ?getXuid@Player@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getXuid() const; - // vIndex: 261, symbol: ?getMovementSettings@Player@@UEBAAEBUPlayerMovementSettings@@XZ + // vIndex: 254, symbol: ?getMovementSettings@Player@@UEBAAEBUPlayerMovementSettings@@XZ virtual struct PlayerMovementSettings const& getMovementSettings() const; - // vIndex: 262, symbol: ?requestMissingSubChunk@Player@@UEAAXAEBVSubChunkPos@@@Z + // vIndex: 255, symbol: ?requestMissingSubChunk@Player@@UEAAXAEBVSubChunkPos@@@Z virtual void requestMissingSubChunk(class SubChunkPos const&); - // vIndex: 263, symbol: ?getMaxChunkBuildRadius@Player@@UEBAEXZ + // vIndex: 256, symbol: ?getMaxChunkBuildRadius@Player@@UEBAEXZ virtual uchar getMaxChunkBuildRadius() const; - // vIndex: 264, symbol: ?onMovePlayerPacketNormal@Player@@MEAAXAEBVVec3@@AEBVVec2@@M@Z + // vIndex: 257, symbol: ?onMovePlayerPacketNormal@Player@@MEAAXAEBVVec3@@AEBVVec2@@M@Z virtual void onMovePlayerPacketNormal(class Vec3 const& pos, class Vec2 const& rot, float yHeadRot); - // vIndex: 265, symbol: ?_createChunkSource@Player@@MEAA?AV?$shared_ptr@VChunkViewSource@@@std@@AEAVChunkSource@@@Z + // vIndex: 258, symbol: ?_createChunkSource@Player@@MEAA?AV?$shared_ptr@VChunkViewSource@@@std@@AEAVChunkSource@@@Z virtual std::shared_ptr _createChunkSource(class ChunkSource& mainChunkSource); - // vIndex: 266, symbol: ?setAbilities@Player@@UEAAXAEBVLayeredAbilities@@@Z + // vIndex: 259, symbol: ?setAbilities@Player@@UEAAXAEBVLayeredAbilities@@@Z virtual void setAbilities(class LayeredAbilities const&); - // vIndex: 267, symbol: ?getEditorPlayer@ServerPlayer@@UEBA?AV?$NonOwnerPointer@VIEditorPlayer@Editor@@@Bedrock@@XZ + // vIndex: 260, symbol: ?getEditorPlayer@ServerPlayer@@UEBA?AV?$NonOwnerPointer@VIEditorPlayer@Editor@@@Bedrock@@XZ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const = 0; - // vIndex: 268, symbol: ?destroyEditorPlayer@ServerPlayer@@UEAAXXZ + // vIndex: 261, symbol: ?destroyEditorPlayer@ServerPlayer@@UEAAXXZ virtual void destroyEditorPlayer() = 0; // symbol: @@ -762,6 +758,9 @@ class Player : public ::Mob { // symbol: ?getGameMode@Player@@QEBAAEAVGameMode@@XZ MCAPI class GameMode& getGameMode() const; + // symbol: ?getHudVisibilityState@Player@@QEBAAEBV?$array@W4HudVisibility@@$0L@@std@@XZ + MCAPI std::array<::HudVisibility, 11> const& getHudVisibilityState() const; + // symbol: ?getInteractText@Player@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCAPI std::string getInteractText() const; @@ -901,6 +900,10 @@ class Player : public ::Mob { // symbol: ?hasRespawnPosition@Player@@QEBA_NXZ MCAPI bool hasRespawnPosition() const; + // symbol: + // ?hideAllExcept@Player@@QEAAXAEBV?$optional@V?$vector@W4HudElement@@V?$allocator@W4HudElement@@@std@@@std@@@std@@@Z + MCAPI void hideAllExcept(std::optional> const&); + // symbol: ?interact@Player@@QEAA_NAEAVActor@@AEBVVec3@@@Z MCAPI bool interact(class Actor& actor, class Vec3 const& location); @@ -1044,6 +1047,10 @@ class Player : public ::Mob { // symbol: ?setHasSeenCredits@Player@@QEAAX_N@Z MCAPI void setHasSeenCredits(bool value); + // symbol: + // ?setHudVisibilityState@Player@@QEAAXW4HudVisibility@@AEBV?$optional@V?$vector@W4HudElement@@V?$allocator@W4HudElement@@@std@@@std@@@std@@@Z + MCAPI void setHudVisibilityState(::HudVisibility, std::optional> const&); + // symbol: ?setInventoryOptions@Player@@QEAAXAEBUInventoryOptions@@@Z MCAPI void setInventoryOptions(struct InventoryOptions const&); @@ -1123,6 +1130,9 @@ class Player : public ::Mob { // symbol: ?take@Player@@QEAA_NAEAVActor@@HH@Z MCAPI bool take(class Actor& actor, int orgCount, int favoredSlot); + // symbol: ?tryDisableShield@Player@@QEAAXXZ + MCAPI void tryDisableShield(); + // symbol: ?tryStartGliding@Player@@QEAA_NXZ MCAPI bool tryStartGliding(); @@ -1348,6 +1358,9 @@ class Player : public ::Mob { int slot ); + // symbol: ?_setPlayerGameType@Player@@AEAAXW4GameType@@@Z + MCAPI void _setPlayerGameType(::GameType); + // symbol: ?_shouldCrit@Player@@AEBA_NAEBVActor@@@Z MCAPI bool _shouldCrit(class Actor const& target) const; diff --git a/src/mc/world/actor/player/PlayerAbilitiesManager.h b/src/mc/world/actor/player/PlayerAbilitiesManager.h index d4e9b3a811..5eea62bdfc 100644 --- a/src/mc/world/actor/player/PlayerAbilitiesManager.h +++ b/src/mc/world/actor/player/PlayerAbilitiesManager.h @@ -14,8 +14,8 @@ class PlayerAbilitiesManager { public: // NOLINTBEGIN - // symbol: ??0PlayerAbilitiesManager@@QEAA@AEBV?$StackRefResult@VGameplayUserManager@@@@@Z - MCAPI explicit PlayerAbilitiesManager(class StackRefResult const&); + // symbol: ??0PlayerAbilitiesManager@@QEAA@AEBV?$not_null@V?$StackRefResult@VGameplayUserManager@@@@@gsl@@@Z + MCAPI explicit PlayerAbilitiesManager(gsl::not_null> const&); // symbol: ?getPlayerAbilities@PlayerAbilitiesManager@@QEAAPEAVLayeredAbilities@@AEBUActorUniqueID@@@Z MCAPI class LayeredAbilities* getPlayerAbilities(struct ActorUniqueID const&); diff --git a/src/mc/world/actor/player/PlayerDeathManager.h b/src/mc/world/actor/player/PlayerDeathManager.h index 9f89cfdc8b..8418cdf6a6 100644 --- a/src/mc/world/actor/player/PlayerDeathManager.h +++ b/src/mc/world/actor/player/PlayerDeathManager.h @@ -35,11 +35,4 @@ class PlayerDeathManager { MCAPI ~PlayerDeathManager(); // NOLINTEND - - // private: - // NOLINTBEGIN - // symbol: ?_getPlayerDeathManagerProxy@PlayerDeathManager@@AEBAAEAVIPlayerDeathManagerProxy@@XZ - MCAPI class IPlayerDeathManagerProxy& _getPlayerDeathManagerProxy() const; - - // NOLINTEND }; diff --git a/src/mc/world/actor/player/PlayerDimensionTransferManager.h b/src/mc/world/actor/player/PlayerDimensionTransferManager.h index 6679eab078..6d5d814681 100644 --- a/src/mc/world/actor/player/PlayerDimensionTransferManager.h +++ b/src/mc/world/actor/player/PlayerDimensionTransferManager.h @@ -15,8 +15,8 @@ class PlayerDimensionTransferManager { public: // NOLINTBEGIN // symbol: - // ??0PlayerDimensionTransferManager@@QEAA@V?$unique_ptr@VPlayerLimboActorManager@@U?$default_delete@VPlayerLimboActorManager@@@std@@@std@@V?$unique_ptr@VIPlayerDimensionTransferer@@U?$default_delete@VIPlayerDimensionTransferer@@@std@@@2@AEBV?$StackRefResult@VDimensionManager@@@@AEBV?$StackRefResult@VGameplayUserManager@@@@AEBV?$StackRefResult@VEntityRegistry@@@@V?$unique_ptr@VILevelCrashDumpManager@@U?$default_delete@VILevelCrashDumpManager@@@std@@@2@@Z - MCAPI PlayerDimensionTransferManager(std::unique_ptr, std::unique_ptr, class StackRefResult const&, class StackRefResult const&, class StackRefResult const&, std::unique_ptr); + // ??0PlayerDimensionTransferManager@@QEAA@V?$unique_ptr@VPlayerLimboActorManager@@U?$default_delete@VPlayerLimboActorManager@@@std@@@std@@V?$unique_ptr@VIPlayerDimensionTransferer@@U?$default_delete@VIPlayerDimensionTransferer@@@std@@@2@AEBV?$not_null@V?$StackRefResult@VDimensionManager@@@@@gsl@@AEBV?$not_null@V?$StackRefResult@VGameplayUserManager@@@@@5@AEBV?$not_null@V?$StackRefResult@VEntityRegistry@@@@@5@V?$unique_ptr@VILevelCrashDumpManager@@U?$default_delete@VILevelCrashDumpManager@@@std@@@2@@Z + MCAPI PlayerDimensionTransferManager(std::unique_ptr, std::unique_ptr, gsl::not_null> const&, gsl::not_null> const&, gsl::not_null> const&, std::unique_ptr); // symbol: // ?getPlayerDimensionTransferConnector@PlayerDimensionTransferManager@@QEAAAEAVIPlayerDimensionTransferConnector@@XZ diff --git a/src/mc/world/actor/player/PlayerDimensionTransferer.h b/src/mc/world/actor/player/PlayerDimensionTransferer.h index b8e853c9b8..a3b163507a 100644 --- a/src/mc/world/actor/player/PlayerDimensionTransferer.h +++ b/src/mc/world/actor/player/PlayerDimensionTransferer.h @@ -87,9 +87,9 @@ class PlayerDimensionTransferer : public ::IPlayerDimensionTransferer { virtual void setPacketSender(class PacketSender&); // symbol: - // ??0PlayerDimensionTransferer@@QEAA@V?$unique_ptr@VIPlayerDimensionTransferProxy@@U?$default_delete@VIPlayerDimensionTransferProxy@@@std@@@std@@_NAEBV?$StackRefResult@VPortalForcer@@@@V?$unique_ptr@VISharedSpawnGetter@@U?$default_delete@VISharedSpawnGetter@@@std@@@2@AEBV?$StackRefResult@VLevelStorage@@@@@Z + // ??0PlayerDimensionTransferer@@QEAA@V?$unique_ptr@VIPlayerDimensionTransferProxy@@U?$default_delete@VIPlayerDimensionTransferProxy@@@std@@@std@@_NAEBV?$not_null@V?$StackRefResult@VPortalForcer@@@@@gsl@@V?$unique_ptr@VISharedSpawnGetter@@U?$default_delete@VISharedSpawnGetter@@@std@@@2@AEBV?$StackRefResult@VLevelStorage@@@@@Z MCAPI - PlayerDimensionTransferer(std::unique_ptr, bool, class StackRefResult const&, std::unique_ptr, class StackRefResult const&); + PlayerDimensionTransferer(std::unique_ptr, bool, gsl::not_null> const&, std::unique_ptr, class StackRefResult const&); // NOLINTEND diff --git a/src/mc/world/actor/player/PlayerTickManager.h b/src/mc/world/actor/player/PlayerTickManager.h index a49e437dbc..f583d1be95 100644 --- a/src/mc/world/actor/player/PlayerTickManager.h +++ b/src/mc/world/actor/player/PlayerTickManager.h @@ -15,10 +15,10 @@ class PlayerTickManager { public: // NOLINTBEGIN // symbol: - // ??0PlayerTickManager@@QEAA@V?$StackRefResult@VDimensionManager@@@@V?$StackRefResult@VGameplayUserManager@@@@V?$unique_ptr@VIPlayerTickProxy@@U?$default_delete@VIPlayerTickProxy@@@std@@@std@@_N@Z + // ??0PlayerTickManager@@QEAA@AEBV?$not_null@V?$StackRefResult@VDimensionManager@@@@@gsl@@AEBV?$not_null@V?$StackRefResult@VGameplayUserManager@@@@@2@V?$unique_ptr@VIPlayerTickProxy@@U?$default_delete@VIPlayerTickProxy@@@std@@@std@@_N@Z MCAPI PlayerTickManager( - class StackRefResult, - class StackRefResult, + gsl::not_null> const&, + gsl::not_null> const&, std::unique_ptr, bool ); diff --git a/src/mc/world/actor/player/ServerPlayerSleepManager.h b/src/mc/world/actor/player/ServerPlayerSleepManager.h index 91fb41d926..31a0051193 100644 --- a/src/mc/world/actor/player/ServerPlayerSleepManager.h +++ b/src/mc/world/actor/player/ServerPlayerSleepManager.h @@ -3,7 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list -#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" +#include "mc/common/wrapper/StackRefResult.h" #include "mc/world/actor/player/PlayerSleepManager.h" class ServerPlayerSleepManager : public ::PlayerSleepManager { @@ -22,9 +22,9 @@ class ServerPlayerSleepManager : public ::PlayerSleepManager { virtual void updateSleepingPlayerList(); // symbol: - // ??0ServerPlayerSleepManager@@QEAA@V?$not_null@V?$NonOwnerPointer@VGameplayUserManager@@@Bedrock@@@gsl@@V?$unique_ptr@VIPlayerSleepPercentageGetter@@U?$default_delete@VIPlayerSleepPercentageGetter@@@std@@@std@@@Z + // ??0ServerPlayerSleepManager@@QEAA@AEBV?$not_null@V?$StackRefResult@VGameplayUserManager@@@@@gsl@@V?$unique_ptr@VIPlayerSleepPercentageGetter@@U?$default_delete@VIPlayerSleepPercentageGetter@@@std@@@std@@@Z MCAPI - ServerPlayerSleepManager(Bedrock::NotNullNonOwnerPtr, std::unique_ptr); + ServerPlayerSleepManager(gsl::not_null> const&, std::unique_ptr); // symbol: ?enoughPlayersDeepSleeping@ServerPlayerSleepManager@@QEBA_NXZ MCAPI bool enoughPlayersDeepSleeping() const; diff --git a/src/mc/world/actor/projectile/AbstractArrow.h b/src/mc/world/actor/projectile/AbstractArrow.h index 125e9ead5f..240280e0b0 100644 --- a/src/mc/world/actor/projectile/AbstractArrow.h +++ b/src/mc/world/actor/projectile/AbstractArrow.h @@ -46,31 +46,31 @@ class AbstractArrow : public ::PredictableProjectile { // vIndex: 10, symbol: ??1AbstractArrow@@UEAA@XZ virtual ~AbstractArrow(); - // vIndex: 27, symbol: ?lerpMotion@AbstractArrow@@UEAAXAEBVVec3@@@Z + // vIndex: 26, symbol: ?lerpMotion@AbstractArrow@@UEAAXAEBVVec3@@@Z virtual void lerpMotion(class Vec3 const& delta); - // vIndex: 41, symbol: ?getShadowRadius@AbstractArrow@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@AbstractArrow@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 45, symbol: ?playerTouch@AbstractArrow@@UEAAXAEAVPlayer@@@Z + // vIndex: 44, symbol: ?playerTouch@AbstractArrow@@UEAAXAEAVPlayer@@@Z virtual void playerTouch(class Player& player); - // vIndex: 97, symbol: ?getSourceUniqueID@AbstractArrow@@MEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@AbstractArrow@@MEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@AbstractArrow@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@AbstractArrow@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@AbstractArrow@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@AbstractArrow@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@AbstractArrow@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@AbstractArrow@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?shoot@AbstractArrow@@UEAAXAEBVVec3@@MM0@Z + // vIndex: 157, symbol: ?shoot@AbstractArrow@@UEAAXAEBVVec3@@MM0@Z virtual void shoot(class Vec3 const& dir, float pow, float uncertainty, class Vec3 const& baseSpeed); - // vIndex: 164, symbol: ?_getPickupItem@Arrow@@MEBA?AVItemStack@@XZ + // vIndex: 158, symbol: ?_getPickupItem@Arrow@@MEBA?AVItemStack@@XZ virtual class ItemStack _getPickupItem() const = 0; // symbol: ??0AbstractArrow@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/Arrow.h b/src/mc/world/actor/projectile/Arrow.h index a46a02c020..250b21c64d 100644 --- a/src/mc/world/actor/projectile/Arrow.h +++ b/src/mc/world/actor/projectile/Arrow.h @@ -42,31 +42,31 @@ class Arrow : public ::AbstractArrow { // vIndex: 10, symbol: __gen_??1Arrow@@UEAA@XZ virtual ~Arrow() = default; - // vIndex: 29, symbol: ?normalTick@Arrow@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Arrow@@UEAAXXZ virtual void normalTick(); - // vIndex: 45, symbol: ?playerTouch@Arrow@@UEAAXAEAVPlayer@@@Z + // vIndex: 44, symbol: ?playerTouch@Arrow@@UEAAXAEAVPlayer@@@Z virtual void playerTouch(class Player& player); - // vIndex: 138, symbol: ?setAuxValue@Arrow@@UEAAXH@Z + // vIndex: 132, symbol: ?setAuxValue@Arrow@@UEAAXH@Z virtual void setAuxValue(int aux); - // vIndex: 159, symbol: ?readAdditionalSaveData@Arrow@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Arrow@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Arrow@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Arrow@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?shoot@Arrow@@UEAAXAEBVVec3@@MM0@Z + // vIndex: 157, symbol: ?shoot@Arrow@@UEAAXAEBVVec3@@MM0@Z virtual void shoot(class Vec3 const& dir, float pow, float uncertainty, class Vec3 const& baseSpeed); - // vIndex: 164, symbol: ?_getPickupItem@Arrow@@MEBA?AVItemStack@@XZ + // vIndex: 158, symbol: ?_getPickupItem@Arrow@@MEBA?AVItemStack@@XZ virtual class ItemStack _getPickupItem() const; - // vIndex: 165, symbol: ?applyParticleColor@Arrow@@MEAAXPEAVParticle@@@Z + // vIndex: 159, symbol: ?applyParticleColor@Arrow@@MEAAXPEAVParticle@@@Z virtual void applyParticleColor(class Particle* p); - // vIndex: 166, symbol: ?getEffectColor@Arrow@@MEAA?AVColor@mce@@XZ + // vIndex: 160, symbol: ?getEffectColor@Arrow@@MEAA?AVColor@mce@@XZ virtual class mce::Color getEffectColor(); // symbol: ??0Arrow@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/DragonFireball.h b/src/mc/world/actor/projectile/DragonFireball.h index e9eaee130b..ca8832bca9 100644 --- a/src/mc/world/actor/projectile/DragonFireball.h +++ b/src/mc/world/actor/projectile/DragonFireball.h @@ -40,16 +40,16 @@ class DragonFireball : public ::Fireball { // vIndex: 10, symbol: __gen_??1DragonFireball@@UEAA@XZ virtual ~DragonFireball() = default; - // vIndex: 48, symbol: ?isPickable@DragonFireball@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@DragonFireball@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 158, symbol: ?_hurt@DragonFireball@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@DragonFireball@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 164, symbol: ?getTrailParticle@DragonFireball@@MEAA?AW4ParticleType@@XZ + // vIndex: 158, symbol: ?getTrailParticle@DragonFireball@@MEAA?AW4ParticleType@@XZ virtual ::ParticleType getTrailParticle(); - // vIndex: 165, symbol: ?shouldBurn@DragonFireball@@MEAA_NXZ + // vIndex: 159, symbol: ?shouldBurn@DragonFireball@@MEAA_NXZ virtual bool shouldBurn(); // symbol: ??0DragonFireball@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/EvocationFang.h b/src/mc/world/actor/projectile/EvocationFang.h index ea0ef9212f..e371f03d42 100644 --- a/src/mc/world/actor/projectile/EvocationFang.h +++ b/src/mc/world/actor/projectile/EvocationFang.h @@ -39,16 +39,16 @@ class EvocationFang : public ::Actor { // vIndex: 10, symbol: __gen_??1EvocationFang@@UEAA@XZ virtual ~EvocationFang() = default; - // vIndex: 29, symbol: ?normalTick@EvocationFang@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@EvocationFang@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@EvocationFang@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@EvocationFang@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 80, symbol: ?handleEntityEvent@EvocationFang@@UEAAXW4ActorEvent@@H@Z + // vIndex: 79, symbol: ?handleEntityEvent@EvocationFang@@UEAAXW4ActorEvent@@H@Z virtual void handleEntityEvent(::ActorEvent id, int data); - // vIndex: 97, symbol: ?getSourceUniqueID@EvocationFang@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@EvocationFang@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; // symbol: ??0EvocationFang@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/ExperiencePotion.h b/src/mc/world/actor/projectile/ExperiencePotion.h index 0a33666030..ac86d1bc45 100644 --- a/src/mc/world/actor/projectile/ExperiencePotion.h +++ b/src/mc/world/actor/projectile/ExperiencePotion.h @@ -39,13 +39,13 @@ class ExperiencePotion : public ::Throwable { // vIndex: 10, symbol: __gen_??1ExperiencePotion@@UEAA@XZ virtual ~ExperiencePotion() = default; - // vIndex: 163, symbol: ?getThrowPower@ExperiencePotion@@MEAAMXZ + // vIndex: 157, symbol: ?getThrowPower@ExperiencePotion@@MEAAMXZ virtual float getThrowPower(); - // vIndex: 164, symbol: ?getThrowUpAngleOffset@ExperiencePotion@@MEAAMXZ + // vIndex: 158, symbol: ?getThrowUpAngleOffset@ExperiencePotion@@MEAAMXZ virtual float getThrowUpAngleOffset(); - // vIndex: 165, symbol: ?getGravity@ExperiencePotion@@MEAAMXZ + // vIndex: 159, symbol: ?getGravity@ExperiencePotion@@MEAAMXZ virtual float getGravity(); // symbol: ??0ExperiencePotion@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/FallingBlockActor.h b/src/mc/world/actor/projectile/FallingBlockActor.h index 3fa834105f..a11d095f9f 100644 --- a/src/mc/world/actor/projectile/FallingBlockActor.h +++ b/src/mc/world/actor/projectile/FallingBlockActor.h @@ -43,34 +43,34 @@ class FallingBlockActor : public ::PredictableProjectile { // vIndex: 10, symbol: __gen_??1FallingBlockActor@@UEAA@XZ virtual ~FallingBlockActor() = default; - // vIndex: 26, symbol: ?teleportTo@FallingBlockActor@@UEAAXAEBVVec3@@_NHH1@Z + // vIndex: 25, symbol: ?teleportTo@FallingBlockActor@@UEAAXAEBVVec3@@_NHH1@Z virtual void teleportTo(class Vec3 const& pos, bool shouldStopRiding, int cause, int sourceEntityType, bool); - // vIndex: 29, symbol: ?normalTick@FallingBlockActor@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@FallingBlockActor@@UEAAXXZ virtual void normalTick(); - // vIndex: 41, symbol: ?getShadowRadius@FallingBlockActor@@UEBAMXZ + // vIndex: 40, symbol: ?getShadowRadius@FallingBlockActor@@UEBAMXZ virtual float getShadowRadius() const; - // vIndex: 48, symbol: ?isPickable@FallingBlockActor@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@FallingBlockActor@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@FallingBlockActor@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@FallingBlockActor@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 108, symbol: ?causeFallDamageToActor@FallingBlockActor@@UEAAMMMVActorDamageSource@@@Z + // vIndex: 104, symbol: ?causeFallDamageToActor@FallingBlockActor@@UEAAMMMVActorDamageSource@@@Z virtual float causeFallDamageToActor(float, float, class ActorDamageSource); - // vIndex: 109, symbol: ?onSynchedDataUpdate@FallingBlockActor@@UEAAXH@Z + // vIndex: 105, symbol: ?onSynchedDataUpdate@FallingBlockActor@@UEAAXH@Z virtual void onSynchedDataUpdate(int dataId); - // vIndex: 158, symbol: ?_hurt@FallingBlockActor@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@FallingBlockActor@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const&, float, bool, bool); - // vIndex: 159, symbol: ?readAdditionalSaveData@FallingBlockActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@FallingBlockActor@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@FallingBlockActor@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@FallingBlockActor@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0FallingBlockActor@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/Fireball.h b/src/mc/world/actor/projectile/Fireball.h index d72d48dd2b..481bb24f43 100644 --- a/src/mc/world/actor/projectile/Fireball.h +++ b/src/mc/world/actor/projectile/Fireball.h @@ -40,37 +40,37 @@ class Fireball : public ::PredictableProjectile { // vIndex: 10, symbol: ??1Fireball@@UEAA@XZ virtual ~Fireball(); - // vIndex: 29, symbol: ?normalTick@Fireball@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@Fireball@@UEAAXXZ virtual void normalTick(); - // vIndex: 44, symbol: ?getBrightness@Fireball@@UEBAMMAEBVIConstBlockSource@@@Z + // vIndex: 43, symbol: ?getBrightness@Fireball@@UEBAMMAEBVIConstBlockSource@@@Z virtual float getBrightness(float, class IConstBlockSource const&) const; - // vIndex: 48, symbol: ?isPickable@Fireball@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@Fireball@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 81, symbol: ?getPickRadius@Fireball@@UEAAMXZ + // vIndex: 80, symbol: ?getPickRadius@Fireball@@UEAAMXZ virtual float getPickRadius(); - // vIndex: 97, symbol: ?getSourceUniqueID@Fireball@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@Fireball@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 103, symbol: ?canChangeDimensionsUsingPortal@Fireball@@UEBA_NXZ + // vIndex: 100, symbol: ?canChangeDimensionsUsingPortal@Fireball@@UEBA_NXZ virtual bool canChangeDimensionsUsingPortal() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@Fireball@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Fireball@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Fireball@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Fireball@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?getInertia@Fireball@@MEAAMXZ + // vIndex: 157, symbol: ?getInertia@Fireball@@MEAAMXZ virtual float getInertia(); - // vIndex: 164, symbol: ?getTrailParticle@Fireball@@MEAA?AW4ParticleType@@XZ + // vIndex: 158, symbol: ?getTrailParticle@Fireball@@MEAA?AW4ParticleType@@XZ virtual ::ParticleType getTrailParticle(); - // vIndex: 165, symbol: ?shouldBurn@Fireball@@MEAA_NXZ + // vIndex: 159, symbol: ?shouldBurn@Fireball@@MEAA_NXZ virtual bool shouldBurn(); // symbol: ??0Fireball@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/LlamaSpit.h b/src/mc/world/actor/projectile/LlamaSpit.h index f9ae26308d..b8bcb18300 100644 --- a/src/mc/world/actor/projectile/LlamaSpit.h +++ b/src/mc/world/actor/projectile/LlamaSpit.h @@ -39,19 +39,19 @@ class LlamaSpit : public ::PredictableProjectile { // vIndex: 10, symbol: __gen_??1LlamaSpit@@UEAA@XZ virtual ~LlamaSpit() = default; - // vIndex: 29, symbol: ?normalTick@LlamaSpit@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@LlamaSpit@@UEAAXXZ virtual void normalTick(); - // vIndex: 44, symbol: ?getBrightness@LlamaSpit@@UEBAMMAEBVIConstBlockSource@@@Z + // vIndex: 43, symbol: ?getBrightness@LlamaSpit@@UEBAMMAEBVIConstBlockSource@@@Z virtual float getBrightness(float, class IConstBlockSource const&) const; - // vIndex: 48, symbol: ?isPickable@LlamaSpit@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@LlamaSpit@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 81, symbol: ?getPickRadius@LlamaSpit@@UEAAMXZ + // vIndex: 80, symbol: ?getPickRadius@LlamaSpit@@UEAAMXZ virtual float getPickRadius(); - // vIndex: 97, symbol: ?getSourceUniqueID@LlamaSpit@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@LlamaSpit@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; // symbol: ??0LlamaSpit@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/ShulkerBullet.h b/src/mc/world/actor/projectile/ShulkerBullet.h index ecb30b0385..312e5aa471 100644 --- a/src/mc/world/actor/projectile/ShulkerBullet.h +++ b/src/mc/world/actor/projectile/ShulkerBullet.h @@ -42,22 +42,22 @@ class ShulkerBullet : public ::PredictableProjectile { // vIndex: 10, symbol: __gen_??1ShulkerBullet@@UEAA@XZ virtual ~ShulkerBullet() = default; - // vIndex: 29, symbol: ?normalTick@ShulkerBullet@@UEAAXXZ + // vIndex: 28, symbol: ?normalTick@ShulkerBullet@@UEAAXXZ virtual void normalTick(); - // vIndex: 48, symbol: ?isPickable@ShulkerBullet@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@ShulkerBullet@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 55, symbol: ?isOnFire@ShulkerBullet@@UEBA_NXZ + // vIndex: 54, symbol: ?isOnFire@ShulkerBullet@@UEBA_NXZ virtual bool isOnFire() const; - // vIndex: 97, symbol: ?getSourceUniqueID@ShulkerBullet@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@ShulkerBullet@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@ShulkerBullet@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@ShulkerBullet@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@ShulkerBullet@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@ShulkerBullet@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0ShulkerBullet@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/SmallFireball.h b/src/mc/world/actor/projectile/SmallFireball.h index 9cba4b499e..478a1ad9e6 100644 --- a/src/mc/world/actor/projectile/SmallFireball.h +++ b/src/mc/world/actor/projectile/SmallFireball.h @@ -40,10 +40,10 @@ class SmallFireball : public ::Fireball { // vIndex: 10, symbol: __gen_??1SmallFireball@@UEAA@XZ virtual ~SmallFireball() = default; - // vIndex: 48, symbol: ?isPickable@SmallFireball@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@SmallFireball@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 158, symbol: ?_hurt@SmallFireball@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@SmallFireball@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); // symbol: ??0SmallFireball@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/Throwable.h b/src/mc/world/actor/projectile/Throwable.h index 7f4522b612..f346b3120a 100644 --- a/src/mc/world/actor/projectile/Throwable.h +++ b/src/mc/world/actor/projectile/Throwable.h @@ -43,25 +43,25 @@ class Throwable : public ::PredictableProjectile { // vIndex: 10, symbol: ??1Throwable@@UEAA@XZ virtual ~Throwable(); - // vIndex: 27, symbol: ?lerpMotion@Throwable@@UEAAXAEBVVec3@@@Z + // vIndex: 26, symbol: ?lerpMotion@Throwable@@UEAAXAEBVVec3@@@Z virtual void lerpMotion(class Vec3 const& delta); - // vIndex: 97, symbol: ?getSourceUniqueID@Throwable@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@Throwable@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@Throwable@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@Throwable@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@Throwable@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@Throwable@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?getThrowPower@Throwable@@UEAAMXZ + // vIndex: 157, symbol: ?getThrowPower@Throwable@@UEAAMXZ virtual float getThrowPower(); - // vIndex: 164, symbol: ?getThrowUpAngleOffset@Throwable@@MEAAMXZ + // vIndex: 158, symbol: ?getThrowUpAngleOffset@Throwable@@MEAAMXZ virtual float getThrowUpAngleOffset(); - // vIndex: 165, symbol: ?getGravity@Throwable@@MEAAMXZ + // vIndex: 159, symbol: ?getGravity@Throwable@@MEAAMXZ virtual float getGravity(); // symbol: ??0Throwable@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/ThrownPotion.h b/src/mc/world/actor/projectile/ThrownPotion.h index 92a1ca387d..ab09b8645f 100644 --- a/src/mc/world/actor/projectile/ThrownPotion.h +++ b/src/mc/world/actor/projectile/ThrownPotion.h @@ -43,16 +43,16 @@ class ThrownPotion : public ::Throwable { // vIndex: 10, symbol: __gen_??1ThrownPotion@@UEAA@XZ virtual ~ThrownPotion() = default; - // vIndex: 96, symbol: ?queryEntityRenderer@ThrownPotion@@UEBAAEBVHashedString@@XZ + // vIndex: 95, symbol: ?queryEntityRenderer@ThrownPotion@@UEBAAEBVHashedString@@XZ virtual class HashedString const& queryEntityRenderer() const; - // vIndex: 138, symbol: ?setAuxValue@ThrownPotion@@UEAAXH@Z + // vIndex: 132, symbol: ?setAuxValue@ThrownPotion@@UEAAXH@Z virtual void setAuxValue(int aux); - // vIndex: 159, symbol: ?readAdditionalSaveData@ThrownPotion@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@ThrownPotion@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@ThrownPotion@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@ThrownPotion@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; // symbol: ??0ThrownPotion@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/ThrownTrident.h b/src/mc/world/actor/projectile/ThrownTrident.h index 738a10843b..b34237c42c 100644 --- a/src/mc/world/actor/projectile/ThrownTrident.h +++ b/src/mc/world/actor/projectile/ThrownTrident.h @@ -45,28 +45,28 @@ class ThrownTrident : public ::AbstractArrow { // vIndex: 10, symbol: __gen_??1ThrownTrident@@UEAA@XZ virtual ~ThrownTrident() = default; - // vIndex: 45, symbol: ?playerTouch@ThrownTrident@@UEAAXAEAVPlayer@@@Z + // vIndex: 44, symbol: ?playerTouch@ThrownTrident@@UEAAXAEAVPlayer@@@Z virtual void playerTouch(class Player& player); - // vIndex: 71, symbol: ?isEnchanted@ThrownTrident@@UEBA_NXZ + // vIndex: 70, symbol: ?isEnchanted@ThrownTrident@@UEBA_NXZ virtual bool isEnchanted() const; - // vIndex: 83, symbol: ?despawn@ThrownTrident@@UEAAXXZ + // vIndex: 82, symbol: ?despawn@ThrownTrident@@UEAAXXZ virtual void despawn(); - // vIndex: 158, symbol: ?_hurt@ThrownTrident@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@ThrownTrident@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 159, symbol: ?readAdditionalSaveData@ThrownTrident@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@ThrownTrident@@MEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const& tag, class DataLoadHelper& dataLoadHelper); - // vIndex: 160, symbol: ?addAdditionalSaveData@ThrownTrident@@MEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@ThrownTrident@@MEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag& tag) const; - // vIndex: 163, symbol: ?shoot@ThrownTrident@@UEAAXAEBVVec3@@MM0@Z + // vIndex: 157, symbol: ?shoot@ThrownTrident@@UEAAXAEBVVec3@@MM0@Z virtual void shoot(class Vec3 const& dir, float pow, float uncertainty, class Vec3 const& baseSpeed); - // vIndex: 164, symbol: ?_getPickupItem@ThrownTrident@@MEBA?AVItemStack@@XZ + // vIndex: 158, symbol: ?_getPickupItem@ThrownTrident@@MEBA?AVItemStack@@XZ virtual class ItemStack _getPickupItem() const; // symbol: ??0ThrownTrident@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/projectile/WindChargeProjectile.h b/src/mc/world/actor/projectile/WindChargeProjectile.h index d849faa2ad..011ff449ca 100644 --- a/src/mc/world/actor/projectile/WindChargeProjectile.h +++ b/src/mc/world/actor/projectile/WindChargeProjectile.h @@ -50,19 +50,13 @@ class WindChargeProjectile : public ::PredictableProjectile { // vIndex: 13, symbol: ?remove@WindChargeProjectile@@UEAAXXZ virtual void remove(); - // vIndex: 48, symbol: ?isPickable@WindChargeProjectile@@UEAA_NXZ - virtual bool isPickable(); - - // vIndex: 81, symbol: ?getPickRadius@WindChargeProjectile@@UEAAMXZ - virtual float getPickRadius(); - - // vIndex: 97, symbol: ?getSourceUniqueID@WindChargeProjectile@@UEBA?AUActorUniqueID@@XZ + // vIndex: 96, symbol: ?getSourceUniqueID@WindChargeProjectile@@UEBA?AUActorUniqueID@@XZ virtual struct ActorUniqueID getSourceUniqueID() const; - // vIndex: 159, symbol: ?readAdditionalSaveData@WindChargeProjectile@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z + // vIndex: 153, symbol: ?readAdditionalSaveData@WindChargeProjectile@@UEAAXAEBVCompoundTag@@AEAVDataLoadHelper@@@Z virtual void readAdditionalSaveData(class CompoundTag const&, class DataLoadHelper&); - // vIndex: 160, symbol: ?addAdditionalSaveData@WindChargeProjectile@@UEBAXAEAVCompoundTag@@@Z + // vIndex: 154, symbol: ?addAdditionalSaveData@WindChargeProjectile@@UEBAXAEAVCompoundTag@@@Z virtual void addAdditionalSaveData(class CompoundTag&) const; // symbol: @@ -70,8 +64,5 @@ class WindChargeProjectile : public ::PredictableProjectile { MCAPI WindChargeProjectile(class ActorDefinitionGroup*, struct ActorDefinitionIdentifier const&, class EntityContext&); - // symbol: ?calculateKnockback@WindChargeProjectile@@SA?AVVec3@@AEBVExplosion@@AEBVActor@@M@Z - MCAPI static class Vec3 calculateKnockback(class Explosion const&, class Actor const&, float); - // NOLINTEND }; diff --git a/src/mc/world/actor/projectile/WitherSkull.h b/src/mc/world/actor/projectile/WitherSkull.h index 8b5d64c5c9..a33a52b622 100644 --- a/src/mc/world/actor/projectile/WitherSkull.h +++ b/src/mc/world/actor/projectile/WitherSkull.h @@ -44,22 +44,22 @@ class WitherSkull : public ::Fireball { // vIndex: 10, symbol: __gen_??1WitherSkull@@UEAA@XZ virtual ~WitherSkull() = default; - // vIndex: 48, symbol: ?isPickable@WitherSkull@@UEAA_NXZ + // vIndex: 47, symbol: ?isPickable@WitherSkull@@UEAA_NXZ virtual bool isPickable(); - // vIndex: 55, symbol: ?isOnFire@WitherSkull@@UEBA_NXZ + // vIndex: 54, symbol: ?isOnFire@WitherSkull@@UEBA_NXZ virtual bool isOnFire() const; - // vIndex: 137, symbol: ?canDestroyBlock@WitherSkull@@UEBA_NAEBVBlock@@@Z + // vIndex: 131, symbol: ?canDestroyBlock@WitherSkull@@UEBA_NAEBVBlock@@@Z virtual bool canDestroyBlock(class Block const& block) const; - // vIndex: 158, symbol: ?_hurt@WitherSkull@@MEAA_NAEBVActorDamageSource@@M_N1@Z + // vIndex: 152, symbol: ?_hurt@WitherSkull@@MEAA_NAEBVActorDamageSource@@M_N1@Z virtual bool _hurt(class ActorDamageSource const& source, float damage, bool knock, bool ignite); - // vIndex: 163, symbol: ?getInertia@WitherSkull@@MEAAMXZ + // vIndex: 157, symbol: ?getInertia@WitherSkull@@MEAAMXZ virtual float getInertia(); - // vIndex: 165, symbol: ?shouldBurn@WitherSkull@@UEAA_NXZ + // vIndex: 159, symbol: ?shouldBurn@WitherSkull@@UEAA_NXZ virtual bool shouldBurn(); // symbol: ??0WitherSkull@@QEAA@PEAVActorDefinitionGroup@@AEBUActorDefinitionIdentifier@@AEAVEntityContext@@@Z diff --git a/src/mc/world/actor/selectors/HasItemFilter.h b/src/mc/world/actor/selectors/HasItemFilter.h index 91ccae88e2..2e7e925cfd 100644 --- a/src/mc/world/actor/selectors/HasItemFilter.h +++ b/src/mc/world/actor/selectors/HasItemFilter.h @@ -11,9 +11,6 @@ struct HasItemFilter { public: // NOLINTBEGIN - // symbol: ??0HasItemFilter@@QEAA@$$QEAU0@@Z - MCAPI HasItemFilter(struct HasItemFilter&&); - // symbol: ??1HasItemFilter@@QEAA@XZ MCAPI ~HasItemFilter(); diff --git a/src/mc/world/actor/selectors/HasPropertyFilter.h b/src/mc/world/actor/selectors/HasPropertyFilter.h new file mode 100644 index 0000000000..c189f5682f --- /dev/null +++ b/src/mc/world/actor/selectors/HasPropertyFilter.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct HasPropertyFilter { +public: + // prevent constructor by default + HasPropertyFilter& operator=(HasPropertyFilter const&); + HasPropertyFilter(HasPropertyFilter const&); + HasPropertyFilter(); + +public: + // NOLINTBEGIN + // symbol: ??1HasPropertyFilter@@QEAA@XZ + MCAPI ~HasPropertyFilter(); + + // NOLINTEND +}; diff --git a/src/mc/world/attribute/AttributeData.h b/src/mc/world/attribute/AttributeData.h new file mode 100644 index 0000000000..fdc95892c1 --- /dev/null +++ b/src/mc/world/attribute/AttributeData.h @@ -0,0 +1,34 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/Result.h" + +struct AttributeData { +public: + // prevent constructor by default + AttributeData& operator=(AttributeData const&); + +public: + // NOLINTBEGIN + // symbol: ??0AttributeData@@QEAA@XZ + MCAPI AttributeData(); + + // symbol: ??0AttributeData@@QEAA@AEBVAttributeInstance@@@Z + MCAPI explicit AttributeData(class AttributeInstance const&); + + // symbol: ??0AttributeData@@QEAA@AEBU0@@Z + MCAPI AttributeData(struct AttributeData const&); + + // symbol: ?read@AttributeData@@QEAA?AV?$Result@XVerror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z + MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream&); + + // symbol: ?write@AttributeData@@QEBAXAEAVBinaryStream@@@Z + MCAPI void write(class BinaryStream&) const; + + // symbol: ??1AttributeData@@QEAA@XZ + MCAPI ~AttributeData(); + + // NOLINTEND +}; diff --git a/src/mc/world/components/AABBRelativeSizeUpdateComponent.h b/src/mc/world/components/AABBRelativeSizeUpdateComponent.h index 64f8bcc528..41fe6468e0 100644 --- a/src/mc/world/components/AABBRelativeSizeUpdateComponent.h +++ b/src/mc/world/components/AABBRelativeSizeUpdateComponent.h @@ -8,4 +8,11 @@ struct AABBRelativeSizeUpdateComponent { AABBRelativeSizeUpdateComponent& operator=(AABBRelativeSizeUpdateComponent const&); AABBRelativeSizeUpdateComponent(AABBRelativeSizeUpdateComponent const&); AABBRelativeSizeUpdateComponent(); + +public: + // NOLINTBEGIN + // symbol: ??4AABBRelativeSizeUpdateComponent@@QEAAAEAU0@$$QEAU0@@Z + MCAPI struct AABBRelativeSizeUpdateComponent& operator=(struct AABBRelativeSizeUpdateComponent&&); + + // NOLINTEND }; diff --git a/src/mc/world/components/ActorDataBoundingBoxComponent.h b/src/mc/world/components/ActorDataBoundingBoxComponent.h new file mode 100644 index 0000000000..7068dbf02b --- /dev/null +++ b/src/mc/world/components/ActorDataBoundingBoxComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct ActorDataBoundingBoxComponent { +public: + // prevent constructor by default + ActorDataBoundingBoxComponent& operator=(ActorDataBoundingBoxComponent const&); + ActorDataBoundingBoxComponent(ActorDataBoundingBoxComponent const&); + ActorDataBoundingBoxComponent(); +}; diff --git a/src/mc/world/components/ActorDataFlagComponent.h b/src/mc/world/components/ActorDataFlagComponent.h index eef5b1775a..f6352f0856 100644 --- a/src/mc/world/components/ActorDataFlagComponent.h +++ b/src/mc/world/components/ActorDataFlagComponent.h @@ -20,6 +20,9 @@ struct ActorDataFlagComponent { // symbol: ?getStatusFlag@ActorDataFlagComponent@@QEBA_NW4ActorFlags@@@Z MCAPI bool getStatusFlag(::ActorFlags) const; + // symbol: ?getFlags@ActorDataFlagComponent@@SA_KAEBV?$bitset@$0HG@@std@@H@Z + MCAPI static uint64 getFlags(std::bitset<118> const&, int); + // symbol: ?ALL_HIGHER_ONES@ActorDataFlagComponent@@2V?$bitset@$0HG@@std@@B MCAPI static std::bitset<118> const ALL_HIGHER_ONES; @@ -36,5 +39,8 @@ struct ActorDataFlagComponent { // symbol: ?setStatusFlag@ActorDataFlagComponent@@IEAAXW4ActorFlags@@_N@Z MCAPI void setStatusFlag(::ActorFlags, bool); + // symbol: ?setFlags@ActorDataFlagComponent@@KA?AV?$optional@V?$bitset@$0HG@@std@@@std@@AEAV?$bitset@$0HG@@3@_KH@Z + MCAPI static std::optional> setFlags(std::bitset<118>&, uint64, int); + // NOLINTEND }; diff --git a/src/mc/world/components/ApplyReplayStateTrackerRequestComponent.h b/src/mc/world/components/ApplyReplayStateTrackerRequestComponent.h new file mode 100644 index 0000000000..3f1186202d --- /dev/null +++ b/src/mc/world/components/ApplyReplayStateTrackerRequestComponent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace ClientRewind { + +struct ApplyReplayStateTrackerRequestComponent { +public: + // prevent constructor by default + ApplyReplayStateTrackerRequestComponent& operator=(ApplyReplayStateTrackerRequestComponent const&); + ApplyReplayStateTrackerRequestComponent(ApplyReplayStateTrackerRequestComponent const&); + ApplyReplayStateTrackerRequestComponent(); +}; + +}; // namespace ClientRewind diff --git a/src/mc/world/components/AttachedRocketsBoostRequestComponent.h b/src/mc/world/components/AttachedRocketsBoostRequestComponent.h deleted file mode 100644 index 87f43d970d..0000000000 --- a/src/mc/world/components/AttachedRocketsBoostRequestComponent.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct AttachedRocketsBoostRequestComponent { -public: - // prevent constructor by default - AttachedRocketsBoostRequestComponent& operator=(AttachedRocketsBoostRequestComponent const&); - AttachedRocketsBoostRequestComponent(AttachedRocketsBoostRequestComponent const&); - AttachedRocketsBoostRequestComponent(); -}; diff --git a/src/mc/world/components/BiomeTagComponent.h b/src/mc/world/components/BiomeTagComponent.h new file mode 100644 index 0000000000..2d27b6c95d --- /dev/null +++ b/src/mc/world/components/BiomeTagComponent.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct BiomeTagComponent { +public: + // prevent constructor by default + BiomeTagComponent& operator=(BiomeTagComponent const&); + BiomeTagComponent(BiomeTagComponent const&); + BiomeTagComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BiomeTagComponent@@UEAA@XZ + virtual ~BiomeTagComponent() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/components/ServerCameraStatesComponent.h b/src/mc/world/components/ServerCameraStatesComponent.h new file mode 100644 index 0000000000..2a2b383ad0 --- /dev/null +++ b/src/mc/world/components/ServerCameraStatesComponent.h @@ -0,0 +1,23 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct ServerCameraStatesComponent { +public: + // prevent constructor by default + ServerCameraStatesComponent& operator=(ServerCameraStatesComponent const&); + ServerCameraStatesComponent(ServerCameraStatesComponent const&); + +public: + // NOLINTBEGIN + // symbol: ??0ServerCameraStatesComponent@@QEAA@XZ + MCAPI ServerCameraStatesComponent(); + + // symbol: ??0ServerCameraStatesComponent@@QEAA@AEBVCameraPresets@@@Z + MCAPI explicit ServerCameraStatesComponent(class CameraPresets const&); + + // symbol: ??4ServerCameraStatesComponent@@QEAAAEAU0@$$QEAU0@@Z + MCAPI struct ServerCameraStatesComponent& operator=(struct ServerCameraStatesComponent&&); + + // NOLINTEND +}; diff --git a/src/mc/world/components/ServerPlayerInteractComponent.h b/src/mc/world/components/ServerPlayerInteractComponent.h new file mode 100644 index 0000000000..bb848d2fab --- /dev/null +++ b/src/mc/world/components/ServerPlayerInteractComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct ServerPlayerInteractComponent { +public: + // prevent constructor by default + ServerPlayerInteractComponent& operator=(ServerPlayerInteractComponent const&); + ServerPlayerInteractComponent(ServerPlayerInteractComponent const&); + ServerPlayerInteractComponent(); +}; diff --git a/src/mc/world/components/WindBurstComponent.h b/src/mc/world/components/WindBurstComponent.h new file mode 100644 index 0000000000..115c09c509 --- /dev/null +++ b/src/mc/world/components/WindBurstComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct WindBurstComponent { +public: + // prevent constructor by default + WindBurstComponent& operator=(WindBurstComponent const&); + WindBurstComponent(WindBurstComponent const&); + WindBurstComponent(); +}; diff --git a/src/mc/world/components/WindChargeKnockbackComponent.h b/src/mc/world/components/WindChargeKnockbackComponent.h new file mode 100644 index 0000000000..69c2d500ee --- /dev/null +++ b/src/mc/world/components/WindChargeKnockbackComponent.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct WindChargeKnockbackComponent { +public: + // prevent constructor by default + WindChargeKnockbackComponent& operator=(WindChargeKnockbackComponent const&); + WindChargeKnockbackComponent(WindChargeKnockbackComponent const&); + WindChargeKnockbackComponent(); +}; diff --git a/src/mc/world/containers/managers/models/HorseContainerManagerModel.h b/src/mc/world/containers/managers/models/HorseContainerManagerModel.h index c1e4ba740a..ff94860b06 100644 --- a/src/mc/world/containers/managers/models/HorseContainerManagerModel.h +++ b/src/mc/world/containers/managers/models/HorseContainerManagerModel.h @@ -36,5 +36,8 @@ class HorseContainerManagerModel : public ::LevelContainerManagerModel { MCAPI HorseContainerManagerModel(::ContainerID containerId, class Player& player, struct ActorUniqueID const& uniqueId); + // symbol: ?getEntity@HorseContainerManagerModel@@QEBAPEAVActor@@XZ + MCAPI class Actor* getEntity() const; + // NOLINTEND }; diff --git a/src/mc/world/effect/MobEffect.h b/src/mc/world/effect/MobEffect.h index 41b9c1d94b..fe35197ae2 100644 --- a/src/mc/world/effect/MobEffect.h +++ b/src/mc/world/effect/MobEffect.h @@ -166,9 +166,8 @@ class MobEffect { // symbol: ?getNameById@MobEffect@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@I@Z MCAPI static std::string getNameById(uint); - // symbol: ?initEffects@MobEffect@@SAXPEAVResourcePackManager@@AEBVBaseGameVersion@@AEBVExperiments@@@Z - MCAPI static void - initEffects(class ResourcePackManager*, class BaseGameVersion const& baseGameVersion, class Experiments const&); + // symbol: ?initEffects@MobEffect@@SAXAEBVBaseGameVersion@@@Z + MCAPI static void initEffects(class BaseGameVersion const&); // symbol: ?shutdownEffects@MobEffect@@SAXXZ MCAPI static void shutdownEffects(); diff --git a/src/mc/world/effect/MobEffectInstance.h b/src/mc/world/effect/MobEffectInstance.h index 1e040bd161..f4451eb2e6 100644 --- a/src/mc/world/effect/MobEffectInstance.h +++ b/src/mc/world/effect/MobEffectInstance.h @@ -126,8 +126,8 @@ class MobEffectInstance { // symbol: ?setDuration@MobEffectInstance@@QEAAXH@Z MCAPI void setDuration(int dur); - // symbol: ?tick@MobEffectInstance@@QEAA_NPEAVActor@@@Z - MCAPI bool tick(class Actor* target); + // symbol: ?tick@MobEffectInstance@@QEAA_NXZ + MCAPI bool tick(); // symbol: ?tryInitializeMobEffectData@MobEffectInstance@@QEAAXXZ MCAPI void tryInitializeMobEffectData(); diff --git a/src/mc/world/events/ILevelChunkEventManagerConnector.h b/src/mc/world/events/ILevelChunkEventManagerConnector.h new file mode 100644 index 0000000000..033aa2393e --- /dev/null +++ b/src/mc/world/events/ILevelChunkEventManagerConnector.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class ILevelChunkEventManagerConnector { +public: + // prevent constructor by default + ILevelChunkEventManagerConnector& operator=(ILevelChunkEventManagerConnector const&); + ILevelChunkEventManagerConnector(ILevelChunkEventManagerConnector const&); + ILevelChunkEventManagerConnector(); +}; diff --git a/src/mc/world/events/ILevelChunkEventManagerProxy.h b/src/mc/world/events/ILevelChunkEventManagerProxy.h new file mode 100644 index 0000000000..24a2d35de7 --- /dev/null +++ b/src/mc/world/events/ILevelChunkEventManagerProxy.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class ILevelChunkEventManagerProxy { +public: + // prevent constructor by default + ILevelChunkEventManagerProxy& operator=(ILevelChunkEventManagerProxy const&); + ILevelChunkEventManagerProxy(ILevelChunkEventManagerProxy const&); + ILevelChunkEventManagerProxy(); +}; diff --git a/src/mc/world/events/LevelChunkEventManager.h b/src/mc/world/events/LevelChunkEventManager.h new file mode 100644 index 0000000000..5b139bff37 --- /dev/null +++ b/src/mc/world/events/LevelChunkEventManager.h @@ -0,0 +1,49 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/pubsub/Connector.h" +#include "mc/world/events/ILevelChunkEventManagerConnector.h" + +class LevelChunkEventManager : public ::ILevelChunkEventManagerConnector { +public: + // prevent constructor by default + LevelChunkEventManager& operator=(LevelChunkEventManager const&); + LevelChunkEventManager(LevelChunkEventManager const&); + LevelChunkEventManager(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1LevelChunkEventManager@@UEAA@XZ + virtual ~LevelChunkEventManager() = default; + + // vIndex: 1, symbol: + // ?getOnChunkLoadedConnector@LevelChunkEventManager@@UEAAAEAV?$Connector@$$A6AXAEAVChunkSource@@AEAVLevelChunk@@H@Z@PubSub@Bedrock@@XZ + virtual class Bedrock::PubSub::Connector& + getOnChunkLoadedConnector(); + + // vIndex: 2, symbol: + // ?getOnChunkReloadedConnector@LevelChunkEventManager@@UEAAAEAV?$Connector@$$A6AXAEAVChunkSource@@AEAVLevelChunk@@@Z@PubSub@Bedrock@@XZ + virtual class Bedrock::PubSub::Connector& + getOnChunkReloadedConnector(); + + // vIndex: 3, symbol: + // ?getOnChunkDiscardedConnector@LevelChunkEventManager@@UEAAAEAV?$Connector@$$A6AXAEAVLevelChunk@@@Z@PubSub@Bedrock@@XZ + virtual class Bedrock::PubSub::Connector& getOnChunkDiscardedConnector(); + + // symbol: + // ??0LevelChunkEventManager@@QEAA@V?$unique_ptr@VILevelChunkEventManagerProxy@@U?$default_delete@VILevelChunkEventManagerProxy@@@std@@@std@@@Z + MCAPI explicit LevelChunkEventManager(std::unique_ptr); + + // symbol: ?onChunkDiscarded@LevelChunkEventManager@@QEAAXAEAVLevelChunk@@@Z + MCAPI void onChunkDiscarded(class LevelChunk&); + + // symbol: ?onChunkLoaded@LevelChunkEventManager@@QEAAXAEAVChunkSource@@AEAVLevelChunk@@@Z + MCAPI void onChunkLoaded(class ChunkSource&, class LevelChunk&); + + // symbol: ?onChunkReloaded@LevelChunkEventManager@@QEAAXAEAVChunkSource@@AEAVLevelChunk@@@Z + MCAPI void onChunkReloaded(class ChunkSource&, class LevelChunk&); + + // NOLINTEND +}; diff --git a/src/mc/world/events/LevelChunkEventManagerProxy.h b/src/mc/world/events/LevelChunkEventManagerProxy.h new file mode 100644 index 0000000000..87202f8d99 --- /dev/null +++ b/src/mc/world/events/LevelChunkEventManagerProxy.h @@ -0,0 +1,42 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/events/ILevelChunkEventManagerProxy.h" + +class LevelChunkEventManagerProxy : public ::ILevelChunkEventManagerProxy { +public: + // prevent constructor by default + LevelChunkEventManagerProxy& operator=(LevelChunkEventManagerProxy const&); + LevelChunkEventManagerProxy(LevelChunkEventManagerProxy const&); + LevelChunkEventManagerProxy(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1LevelChunkEventManagerProxy@@UEAA@XZ + virtual ~LevelChunkEventManagerProxy() = default; + + // vIndex: 1, symbol: ?isReadOnly@LevelChunkEventManagerProxy@@UEBA_NAEBVLevelChunk@@@Z + virtual bool isReadOnly(class LevelChunk const&) const; + + // vIndex: 2, symbol: ?setOnChunkLoadedCalled@LevelChunkEventManagerProxy@@UEAA_NAEAVLevelChunk@@@Z + virtual bool setOnChunkLoadedCalled(class LevelChunk&); + + // vIndex: 3, symbol: ?onTickingStarted@LevelChunkEventManagerProxy@@UEAAXAEAVLevelChunk@@@Z + virtual void onTickingStarted(class LevelChunk&); + + // vIndex: 4, symbol: ?setupRedstoneCircuit@LevelChunkEventManagerProxy@@UEAAXAEAVChunkSource@@AEAVLevelChunk@@@Z + virtual void setupRedstoneCircuit(class ChunkSource&, class LevelChunk&); + + // vIndex: 5, symbol: ?getClosestPlayerDistanceSquared@LevelChunkEventManagerProxy@@UEBAHAEBVLevelChunk@@@Z + virtual int getClosestPlayerDistanceSquared(class LevelChunk const&) const; + + // vIndex: 6, symbol: ?isOwnedByTickingThread@LevelChunkEventManagerProxy@@UEBA_NAEBVLevelChunk@@@Z + virtual bool isOwnedByTickingThread(class LevelChunk const&) const; + + // vIndex: 7, symbol: ?onTickingStopped@LevelChunkEventManagerProxy@@UEAAXAEAVLevelChunk@@@Z + virtual void onTickingStopped(class LevelChunk&); + + // NOLINTEND +}; diff --git a/src/mc/world/events/LevelEventListener.h b/src/mc/world/events/LevelEventListener.h index b44d3f7ebd..fcf540ee8a 100644 --- a/src/mc/world/events/LevelEventListener.h +++ b/src/mc/world/events/LevelEventListener.h @@ -36,8 +36,8 @@ class LevelEventListener { MCVAPI ::EventResult onLevelTickStart(class Level&); // symbol: - // ?onLevelWeatherChange@LevelEventListener@@UEAA?AW4EventResult@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N1@Z - MCVAPI ::EventResult onLevelWeatherChange(std::string const& dimension, bool raining, bool lightning); + // ?onLevelWeatherChange@LevelEventListener@@UEAA?AW4EventResult@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N111@Z + MCVAPI ::EventResult onLevelWeatherChange(std::string const&, bool, bool, bool, bool); // NOLINTEND }; diff --git a/src/mc/world/events/PlayerEventCoordinator.h b/src/mc/world/events/PlayerEventCoordinator.h index 8dcb6a4c4c..589d2fd944 100644 --- a/src/mc/world/events/PlayerEventCoordinator.h +++ b/src/mc/world/events/PlayerEventCoordinator.h @@ -5,6 +5,7 @@ // auto generated inclusion list #include "mc/common/wrapper/CoordinatorResult.h" #include "mc/events/MinecraftEventing.h" +#include "mc/events/MutablePlayerGameplayEvent.h" #include "mc/events/PlayerGameplayEvent.h" #include "mc/world/AutomaticID.h" #include "mc/world/events/EventRef.h" @@ -28,6 +29,10 @@ class PlayerEventCoordinator { // ?registerPlayerGameplayHandler@PlayerEventCoordinator@@QEAAX$$QEAV?$unique_ptr@VPlayerGameplayHandler@@U?$default_delete@VPlayerGameplayHandler@@@std@@@std@@@Z MCAPI void registerPlayerGameplayHandler(std::unique_ptr&& handler); + // symbol: + // ?sendEvent@PlayerEventCoordinator@@QEAA?AW4CoordinatorResult@@V?$EventRef@U?$MutablePlayerGameplayEvent@W4CoordinatorResult@@@@@@@Z + MCAPI ::CoordinatorResult sendEvent(class EventRef> event); + // symbol: // ?sendEvent@PlayerEventCoordinator@@QEAA?AW4CoordinatorResult@@AEBV?$EventRef@U?$PlayerGameplayEvent@W4CoordinatorResult@@@@@@@Z MCAPI ::CoordinatorResult sendEvent(class EventRef> const& event); @@ -58,9 +63,15 @@ class PlayerEventCoordinator { // symbol: ?sendPlayerMove@PlayerEventCoordinator@@QEAAXAEAVPlayer@@@Z MCAPI void sendPlayerMove(class Player& player); + // symbol: ?sendPlayerPortalBuilt@PlayerEventCoordinator@@QEAAXAEAVPlayer@@V?$AutomaticID@VDimension@@H@@@Z + MCAPI void sendPlayerPortalBuilt(class Player& player, DimensionType dimensionBuiltIn); + // symbol: ?sendPlayerPortalUsed@PlayerEventCoordinator@@QEAAXAEAVPlayer@@V?$AutomaticID@VDimension@@H@@1@Z MCAPI void sendPlayerPortalUsed(class Player& player, DimensionType fromDimension, DimensionType toDimension); + // symbol: ?sendPlayerPoweredBeacon@PlayerEventCoordinator@@QEAAXAEBVPlayer@@H@Z + MCAPI void sendPlayerPoweredBeacon(class Player const&, int); + // symbol: ?sendPlayerSlide@PlayerEventCoordinator@@QEAAXAEAVPlayer@@@Z MCAPI void sendPlayerSlide(class Player& player); diff --git a/src/mc/world/events/PlayerEventListener.h b/src/mc/world/events/PlayerEventListener.h index b1b9c8d333..6cee0dec85 100644 --- a/src/mc/world/events/PlayerEventListener.h +++ b/src/mc/world/events/PlayerEventListener.h @@ -123,9 +123,6 @@ class PlayerEventListener { // symbol: ?onPlayerNamedItem@PlayerEventListener@@UEAA?AW4EventResult@@AEAVPlayer@@AEBVItemDescriptor@@@Z MCVAPI ::EventResult onPlayerNamedItem(class Player& player, class ItemDescriptor const& item); - // symbol: ?onPlayerOnGround@PlayerEventListener@@UEAA?AW4EventResult@@AEAVPlayer@@@Z - MCVAPI ::EventResult onPlayerOnGround(class Player& player); - // symbol: // ?onPlayerPiglinBarter@PlayerEventListener@@UEAA?AW4EventResult@@AEAVPlayer@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@Z MCVAPI ::EventResult @@ -140,6 +137,9 @@ class PlayerEventListener { MCVAPI ::EventResult onPlayerPortalUsed(class Player& player, DimensionType fromDimension, DimensionType toDimension); + // symbol: ?onPlayerPoweredBeacon@PlayerEventListener@@UEAA?AW4EventResult@@AEBVPlayer@@H@Z + MCVAPI ::EventResult onPlayerPoweredBeacon(class Player const&, int); + // symbol: ?onPlayerSaved@PlayerEventListener@@UEAA?AW4EventResult@@AEAVPlayer@@@Z MCVAPI ::EventResult onPlayerSaved(class Player& player); diff --git a/src/mc/world/events/ProgressListener.h b/src/mc/world/events/ProgressListener.h deleted file mode 100644 index 2edddf2ec6..0000000000 --- a/src/mc/world/events/ProgressListener.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -class ProgressListener { -public: - // prevent constructor by default - ProgressListener& operator=(ProgressListener const&); - ProgressListener(ProgressListener const&); - ProgressListener(); -}; diff --git a/src/mc/world/events/RealmEventForPlayer.h b/src/mc/world/events/RealmEventForPlayer.h new file mode 100644 index 0000000000..ed1f0b19f5 --- /dev/null +++ b/src/mc/world/events/RealmEventForPlayer.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct RealmEventForPlayer { +public: + // prevent constructor by default + RealmEventForPlayer& operator=(RealmEventForPlayer const&); + RealmEventForPlayer(RealmEventForPlayer const&); + RealmEventForPlayer(); + +public: + // NOLINTBEGIN + // symbol: ??1RealmEventForPlayer@@QEAA@XZ + MCAPI ~RealmEventForPlayer(); + + // NOLINTEND +}; diff --git a/src/mc/world/events/RealmsEventId.h b/src/mc/world/events/RealmEventId.h similarity index 65% rename from src/mc/world/events/RealmsEventId.h rename to src/mc/world/events/RealmEventId.h index fba90d6ba3..20d4a81a10 100644 --- a/src/mc/world/events/RealmsEventId.h +++ b/src/mc/world/events/RealmEventId.h @@ -2,4 +2,4 @@ #include "mc/_HeaderOutputPredefine.h" -enum class RealmsEventId {}; +enum class RealmEventId {}; diff --git a/src/mc/world/events/RealmsEventForPlayer.h b/src/mc/world/events/RealmsEventForPlayer.h deleted file mode 100644 index bc700cb43f..0000000000 --- a/src/mc/world/events/RealmsEventForPlayer.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -struct RealmsEventForPlayer { -public: - // prevent constructor by default - RealmsEventForPlayer& operator=(RealmsEventForPlayer const&); - RealmsEventForPlayer(RealmsEventForPlayer const&); - RealmsEventForPlayer(); - -public: - // NOLINTBEGIN - // symbol: ??1RealmsEventForPlayer@@QEAA@XZ - MCAPI ~RealmsEventForPlayer(); - - // NOLINTEND -}; diff --git a/src/mc/world/events/RealmsStoriesGameplayEventListener.h b/src/mc/world/events/RealmsStoriesGameplayEventListener.h index b2efc443ab..3b99596519 100644 --- a/src/mc/world/events/RealmsStoriesGameplayEventListener.h +++ b/src/mc/world/events/RealmsStoriesGameplayEventListener.h @@ -5,7 +5,7 @@ // auto generated inclusion list #include "mc/world/AutomaticID.h" #include "mc/world/events/EventResult.h" -#include "mc/world/events/RealmsEventId.h" +#include "mc/world/events/RealmEventId.h" class RealmsStoriesGameplayEventListener { public: @@ -25,10 +25,17 @@ class RealmsStoriesGameplayEventListener { // symbol: ?onPlayerMove@RealmsStoriesGameplayEventListener@@UEAA?AW4EventResult@@AEAVPlayer@@@Z MCVAPI ::EventResult onPlayerMove(class Player&); + // symbol: + // ?onPlayerPortalBuilt@RealmsStoriesGameplayEventListener@@UEAA?AW4EventResult@@AEAVPlayer@@V?$AutomaticID@VDimension@@H@@@Z + MCVAPI ::EventResult onPlayerPortalBuilt(class Player&, DimensionType); + // symbol: // ?onPlayerPortalUsed@RealmsStoriesGameplayEventListener@@UEAA?AW4EventResult@@AEAVPlayer@@V?$AutomaticID@VDimension@@H@@1@Z MCVAPI ::EventResult onPlayerPortalUsed(class Player&, DimensionType, DimensionType); + // symbol: ?onPlayerPoweredBeacon@RealmsStoriesGameplayEventListener@@UEAA?AW4EventResult@@AEBVPlayer@@H@Z + MCVAPI ::EventResult onPlayerPoweredBeacon(class Player const&, int); + // symbol: ??0RealmsStoriesGameplayEventListener@@QEAA@AEAVLevelStorage@@@Z MCAPI explicit RealmsStoriesGameplayEventListener(class LevelStorage&); @@ -40,16 +47,20 @@ class RealmsStoriesGameplayEventListener { MCAPI void _handlePillagerKilledEvent(class Actor const&, struct ActorKilledEvent const&); // symbol: - // ?_publishLocationWorldEventIfFirstTime@RealmsStoriesGameplayEventListener@@AEAAXW4RealmsEventId@@AEBVPlayer@@@Z - MCAPI void _publishLocationWorldEventIfFirstTime(::RealmsEventId, class Player const&); + // ?_publishEventForRealmsService@RealmsStoriesGameplayEventListener@@AEAAXW4RealmEventId@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI void _publishEventForRealmsService(::RealmEventId, std::string const&); + + // symbol: + // ?_publishLocationWorldEventIfFirstTime@RealmsStoriesGameplayEventListener@@AEAAXW4RealmEventId@@AEBVPlayer@@@Z + MCAPI void _publishLocationWorldEventIfFirstTime(::RealmEventId, class Player const&); // symbol: - // ?_publishMobKilledEventForRealmsService@RealmsStoriesGameplayEventListener@@AEAAXW4RealmsEventId@@AEBV?$set@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$less@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@Z - MCAPI void _publishMobKilledEventForRealmsService(::RealmsEventId, std::set const&); + // ?_getXuidsInKillProximity@RealmsStoriesGameplayEventListener@@CA?AV?$set@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$less@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@AEBVActor@@MM@Z + MCAPI static std::set _getXuidsInKillProximity(class Actor const&, float, float); // symbol: - // ?_addXuidsInKillProximity@RealmsStoriesGameplayEventListener@@CAXAEBVActor@@MMAEAV?$set@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$less@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@Z - MCAPI static void _addXuidsInKillProximity(class Actor const&, float, float, std::set&); + // ?_playerXuidsToString@RealmsStoriesGameplayEventListener@@CA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$set@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@U?$less@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@3@@Z + MCAPI static std::string _playerXuidsToString(std::set const&); // NOLINTEND }; diff --git a/src/mc/world/filters/ActorOnLadderTest.h b/src/mc/world/filters/ActorOnLadderTest.h index 5fd69ce457..0cac810aec 100644 --- a/src/mc/world/filters/ActorOnLadderTest.h +++ b/src/mc/world/filters/ActorOnLadderTest.h @@ -16,6 +16,7 @@ class ActorOnLadderTest : public ::SimpleBoolFilterTest { // prevent constructor by default ActorOnLadderTest& operator=(ActorOnLadderTest const&); ActorOnLadderTest(ActorOnLadderTest const&); + ActorOnLadderTest(); public: // NOLINTBEGIN @@ -28,8 +29,5 @@ class ActorOnLadderTest : public ::SimpleBoolFilterTest { // vIndex: 4, symbol: ?getName@ActorOnLadderTest@@UEBA?AV?$basic_string_view@DU?$char_traits@D@std@@@std@@XZ virtual std::string_view getName() const; - // symbol: ??0ActorOnLadderTest@@QEAA@XZ - MCAPI ActorOnLadderTest(); - // NOLINTEND }; diff --git a/src/mc/world/filters/ActorWasLastHurtByTest.h b/src/mc/world/filters/ActorWasLastHurtByTest.h new file mode 100644 index 0000000000..7360e5300f --- /dev/null +++ b/src/mc/world/filters/ActorWasLastHurtByTest.h @@ -0,0 +1,33 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/filters/FilterTest.h" +#include "mc/world/filters/SimpleBoolFilterTest.h" + +// auto generated forward declare list +// clang-format off +namespace Json { class Value; } +// clang-format on + +class ActorWasLastHurtByTest : public ::SimpleBoolFilterTest { +public: + // prevent constructor by default + ActorWasLastHurtByTest& operator=(ActorWasLastHurtByTest const&); + ActorWasLastHurtByTest(ActorWasLastHurtByTest const&); + ActorWasLastHurtByTest(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ActorWasLastHurtByTest@@UEAA@XZ + virtual ~ActorWasLastHurtByTest() = default; + + // vIndex: 2, symbol: ?evaluate@ActorWasLastHurtByTest@@UEBA_NAEBUFilterContext@@@Z + virtual bool evaluate(struct FilterContext const&) const; + + // vIndex: 4, symbol: ?getName@ActorWasLastHurtByTest@@UEBA?AV?$basic_string_view@DU?$char_traits@D@std@@@std@@XZ + virtual std::string_view getName() const; + + // NOLINTEND +}; diff --git a/src/mc/world/gamemode/GameMode.h b/src/mc/world/gamemode/GameMode.h index edeac808e1..8e9cd46c13 100644 --- a/src/mc/world/gamemode/GameMode.h +++ b/src/mc/world/gamemode/GameMode.h @@ -251,6 +251,14 @@ class GameMode { // symbol: ?_enableBlockBreakDelay@GameMode@@AEBA_NXZ MCAPI bool _enableBlockBreakDelay() const; + // symbol: ?_sendPlayerInteractWithBlockAfterEvent@GameMode@@AEAAXAEAVPlayer@@AEBVBlockPos@@EAEBVVec3@@@Z + MCAPI void _sendPlayerInteractWithBlockAfterEvent(class Player&, class BlockPos const&, uchar, class Vec3 const&); + + // symbol: + // ?_sendTryDestroyBlockEvent@GameMode@@AEBA?AV?$optional@VItemStack@@@std@@AEBVBlock@@AEBVBlockPos@@VItemStack@@@Z + MCAPI std::optional + _sendTryDestroyBlockEvent(class Block const&, class BlockPos const&, class ItemStack) const; + // symbol: ?_sendUseItemOnEvents@GameMode@@AEBA?AVInteractionResult@@AEAVItemStack@@AEBVBlockPos@@EAEBVVec3@@@Z MCAPI class InteractionResult _sendUseItemOnEvents(class ItemStack&, class BlockPos const&, uchar, class Vec3 const&) const; diff --git a/src/mc/world/item/AbstractCompassItem.h b/src/mc/world/item/AbstractCompassItem.h index ca91ac6cb5..71be826baa 100644 --- a/src/mc/world/item/AbstractCompassItem.h +++ b/src/mc/world/item/AbstractCompassItem.h @@ -32,10 +32,10 @@ class AbstractCompassItem : public ::Item { // vIndex: 49, symbol: ?getEnchantSlot@AbstractCompassItem@@UEBAHXZ virtual int getEnchantSlot() const; - // vIndex: 104, symbol: ?getIconInfo@AbstractCompassItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@AbstractCompassItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 106, symbol: ?getAnimationFrameFor@AbstractCompassItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@AbstractCompassItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob* holder, bool asItemEntity, class ItemStack const* item, bool shouldAnimate) const; diff --git a/src/mc/world/item/ActorPlacerItem.h b/src/mc/world/item/ActorPlacerItem.h index dc80115012..b1f6ebae02 100644 --- a/src/mc/world/item/ActorPlacerItem.h +++ b/src/mc/world/item/ActorPlacerItem.h @@ -60,14 +60,14 @@ class ActorPlacerItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@ActorPlacerItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 104, symbol: ?getIconInfo@ActorPlacerItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@ActorPlacerItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const&, int, bool) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@ActorPlacerItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/ArmorItem.h b/src/mc/world/item/ArmorItem.h index 1c47ab725b..695646e5f8 100644 --- a/src/mc/world/item/ArmorItem.h +++ b/src/mc/world/item/ArmorItem.h @@ -110,19 +110,19 @@ class ArmorItem : public ::Item { // vIndex: 76, symbol: ?hurtActor@ArmorItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack&, class Actor&, class Mob&) const; - // vIndex: 80, symbol: ?mineBlock@ArmorItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@ArmorItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack&, class Block const&, int, int, int, class Actor*) const; - // vIndex: 97, symbol: ?getEquipLocation@ArmorItem@@UEBA?AW4ActorLocation@@XZ + // vIndex: 96, symbol: ?getEquipLocation@ArmorItem@@UEBA?AW4ActorLocation@@XZ virtual ::ActorLocation getEquipLocation() const; - // vIndex: 98, symbol: ?getEquipSound@ArmorItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 97, symbol: ?getEquipSound@ArmorItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getEquipSound() const; - // vIndex: 104, symbol: ?getIconInfo@ArmorItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@ArmorItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 119, symbol: ?getArmorKnockbackResistance@ArmorItem@@UEBAMXZ + // vIndex: 118, symbol: ?getArmorKnockbackResistance@ArmorItem@@UEBAMXZ virtual float getArmorKnockbackResistance() const; // symbol: diff --git a/src/mc/world/item/ArmorStandItem.h b/src/mc/world/item/ArmorStandItem.h index 03f2ca8ce0..c320bfbdf8 100644 --- a/src/mc/world/item/ArmorStandItem.h +++ b/src/mc/world/item/ArmorStandItem.h @@ -29,7 +29,7 @@ class ArmorStandItem : public ::Item { // vIndex: 0, symbol: __gen_??1ArmorStandItem@@UEAA@XZ virtual ~ArmorStandItem() = default; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@ArmorStandItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor&, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; diff --git a/src/mc/world/item/ArrowItem.h b/src/mc/world/item/ArrowItem.h index 6615afd0ff..b03c9cdbb5 100644 --- a/src/mc/world/item/ArrowItem.h +++ b/src/mc/world/item/ArrowItem.h @@ -46,19 +46,19 @@ class ArrowItem : public ::ComponentItem { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@ArrowItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 83, symbol: + // vIndex: 82, symbol: // ?buildEffectDescriptionName@ArrowItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemStackBase@@@Z virtual std::string buildEffectDescriptionName(class ItemStackBase const&) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@ArrowItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@ArrowItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@ArrowItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; // symbol: diff --git a/src/mc/world/item/AuxDataBlockItem.h b/src/mc/world/item/AuxDataBlockItem.h index 782d5de1b3..e09b524229 100644 --- a/src/mc/world/item/AuxDataBlockItem.h +++ b/src/mc/world/item/AuxDataBlockItem.h @@ -32,7 +32,7 @@ class AuxDataBlockItem : public ::BlockItem { // vIndex: 32, symbol: ?getLevelDataForAuxValue@AuxDataBlockItem@@UEBAHH@Z virtual int getLevelDataForAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@AuxDataBlockItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; diff --git a/src/mc/world/item/BalloonItem.h b/src/mc/world/item/BalloonItem.h index 34b7a7aec0..606e86ba06 100644 --- a/src/mc/world/item/BalloonItem.h +++ b/src/mc/world/item/BalloonItem.h @@ -35,11 +35,11 @@ class BalloonItem : public ::ChemistryItem { // vIndex: 60, symbol: ?getColor@BalloonItem@@UEBA?AVColor@mce@@PEBVCompoundTag@@AEBVItemDescriptor@@@Z virtual class mce::Color getColor(class CompoundTag const* userData, class ItemDescriptor const& instance) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BalloonItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BalloonItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor&, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; @@ -48,4 +48,12 @@ class BalloonItem : public ::ChemistryItem { MCAPI BalloonItem(std::string const& name, int id); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: ?_createKnot@BalloonItem@@AEBAPEAVLeashFenceKnotActor@@AEAVBlockSource@@VBlockPos@@AEBVItemInstance@@@Z + MCAPI class LeashFenceKnotActor* + _createKnot(class BlockSource& region, class BlockPos pos, class ItemInstance const& item) const; + + // NOLINTEND }; diff --git a/src/mc/world/item/BambooItem.h b/src/mc/world/item/BambooItem.h index c9cbcbac0d..d5b8bf2b0f 100644 --- a/src/mc/world/item/BambooItem.h +++ b/src/mc/world/item/BambooItem.h @@ -32,7 +32,7 @@ class BambooItem : public ::BlockItem { // vIndex: 32, symbol: ?getLevelDataForAuxValue@BambooItem@@UEBAHH@Z virtual int getLevelDataForAuxValue(int auxValue) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BambooItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/BannerItem.h b/src/mc/world/item/BannerItem.h index 981f3571ce..4f8ccdda73 100644 --- a/src/mc/world/item/BannerItem.h +++ b/src/mc/world/item/BannerItem.h @@ -44,14 +44,14 @@ class BannerItem : public ::Item { // vIndex: 54, symbol: ?isValidAuxValue@BannerItem@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BannerItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 91, symbol: ?fixupCommon@BannerItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@BannerItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase&) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BannerItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/BannerPatternItem.h b/src/mc/world/item/BannerPatternItem.h index 3709685c7a..c1ac29865b 100644 --- a/src/mc/world/item/BannerPatternItem.h +++ b/src/mc/world/item/BannerPatternItem.h @@ -48,7 +48,7 @@ class BannerPatternItem : public ::Item { bool showCategory ) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BannerPatternItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; diff --git a/src/mc/world/item/BedItem.h b/src/mc/world/item/BedItem.h index b4f0f18f25..c80db53c9e 100644 --- a/src/mc/world/item/BedItem.h +++ b/src/mc/world/item/BedItem.h @@ -32,19 +32,19 @@ class BedItem : public ::Item { // vIndex: 54, symbol: ?isValidAuxValue@BedItem@@UEBA_NH@Z virtual bool isValidAuxValue(int value) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BedItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 104, symbol: ?getIconInfo@BedItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@BedItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool) const; - // vIndex: 115, symbol: ?_checkUseOnPermissions@BedItem@@EEBA_NAEAVActor@@AEAVItemStackBase@@AEBEAEBVBlockPos@@@Z + // vIndex: 114, symbol: ?_checkUseOnPermissions@BedItem@@EEBA_NAEAVActor@@AEAVItemStackBase@@AEBEAEBVBlockPos@@@Z virtual bool _checkUseOnPermissions(class Actor& entity, class ItemStackBase& item, uchar const& face, class BlockPos const& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BedItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/BellBlockItem.h b/src/mc/world/item/BellBlockItem.h index b1645b6c75..3522ff3faa 100644 --- a/src/mc/world/item/BellBlockItem.h +++ b/src/mc/world/item/BellBlockItem.h @@ -29,7 +29,7 @@ class BellBlockItem : public ::BlockItem { // vIndex: 0, symbol: __gen_??1BellBlockItem@@UEAA@XZ virtual ~BellBlockItem() = default; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BellBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/BlockItem.h b/src/mc/world/item/BlockItem.h index 9809410cbc..0feb752e1c 100644 --- a/src/mc/world/item/BlockItem.h +++ b/src/mc/world/item/BlockItem.h @@ -35,24 +35,24 @@ class BlockItem : public ::Item { // vIndex: 54, symbol: ?isValidAuxValue@BlockItem@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BlockItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 104, symbol: ?getIconInfo@BlockItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@BlockItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool) const; - // vIndex: 108, symbol: ?getLightEmission@BlockItem@@UEBA?AUBrightness@@H@Z + // vIndex: 107, symbol: ?getLightEmission@BlockItem@@UEBA?AUBrightness@@H@Z virtual struct Brightness getLightEmission(int data) const; - // vIndex: 109, symbol: ?getIconYOffset@BlockItem@@UEBAHXZ + // vIndex: 108, symbol: ?getIconYOffset@BlockItem@@UEBAHXZ virtual int getIconYOffset() const; - // vIndex: 116, symbol: ?_calculatePlacePos@BlockItem@@MEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 115, symbol: ?_calculatePlacePos@BlockItem@@MEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BlockItem@@MEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/BlockPlanterItem.h b/src/mc/world/item/BlockPlanterItem.h index c021849344..42fae8d485 100644 --- a/src/mc/world/item/BlockPlanterItem.h +++ b/src/mc/world/item/BlockPlanterItem.h @@ -34,15 +34,15 @@ class BlockPlanterItem : public ::ComponentItem { // ?setDescriptionId@BlockPlanterItem@@UEAAAEAV1@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual class BlockPlanterItem& setDescriptionId(std::string const&); - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BlockPlanterItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@BlockPlanterItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@BlockPlanterItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@BlockPlanterItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; // symbol: diff --git a/src/mc/world/item/BoatItem.h b/src/mc/world/item/BoatItem.h index 8d8ab50059..fe49327021 100644 --- a/src/mc/world/item/BoatItem.h +++ b/src/mc/world/item/BoatItem.h @@ -43,19 +43,19 @@ class BoatItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BoatItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 104, symbol: ?getIconInfo@BoatItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@BoatItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const&, int, bool) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BoatItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& item, class Actor&, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; - // vIndex: 119, symbol: ?_getActorType@BoatItem@@EEBA?AW4ActorType@@XZ + // vIndex: 118, symbol: ?_getActorType@BoatItem@@EEBA?AW4ActorType@@XZ virtual ::ActorType _getActorType() const; // symbol: ??0BoatItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HH@Z diff --git a/src/mc/world/item/BoneMealItem.h b/src/mc/world/item/BoneMealItem.h index 59de939070..a31701ec74 100644 --- a/src/mc/world/item/BoneMealItem.h +++ b/src/mc/world/item/BoneMealItem.h @@ -38,11 +38,11 @@ class BoneMealItem : public ::FertilizerItem { // vIndex: 54, symbol: ?isValidAuxValue@BoneMealItem@@UEBA_NH@Z virtual bool isValidAuxValue(int) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BoneMealItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@BoneMealItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const&, int); diff --git a/src/mc/world/item/BottleItem.h b/src/mc/world/item/BottleItem.h index d946791767..d867865e9a 100644 --- a/src/mc/world/item/BottleItem.h +++ b/src/mc/world/item/BottleItem.h @@ -36,7 +36,7 @@ class BottleItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BottleItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/BowItem.h b/src/mc/world/item/BowItem.h index fe02a4074c..c1559bc50a 100644 --- a/src/mc/world/item/BowItem.h +++ b/src/mc/world/item/BowItem.h @@ -32,14 +32,14 @@ class BowItem : public ::RangedWeaponItem { // vIndex: 49, symbol: ?getEnchantSlot@BowItem@@UEBAHXZ virtual int getEnchantSlot() const; - // vIndex: 96, symbol: ?enchantProjectile@BowItem@@UEBAXAEBVItemStackBase@@AEAVActor@@@Z + // vIndex: 95, symbol: ?enchantProjectile@BowItem@@UEBAXAEBVItemStackBase@@AEAVActor@@@Z virtual void enchantProjectile(class ItemStackBase const&, class Actor& projectile) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@BowItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@BowItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@BowItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; // symbol: ??0BowItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/BrushItem.h b/src/mc/world/item/BrushItem.h index 008ed9d72b..ae382d2366 100644 --- a/src/mc/world/item/BrushItem.h +++ b/src/mc/world/item/BrushItem.h @@ -38,16 +38,13 @@ class BrushItem : public ::Item { // vIndex: 76, symbol: ?hurtActor@BrushItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack&, class Actor&, class Mob&) const; - // vIndex: 79, symbol: ?mineBlock@BrushItem@@UEBA_NAEAVItemInstance@@AEBVBlock@@HHHPEAVActor@@@Z - virtual bool mineBlock(class ItemInstance&, class Block const&, int, int, int, class Actor*) const; - - // vIndex: 80, symbol: ?mineBlock@BrushItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@BrushItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack&, class Block const&, int, int, int, class Actor*) const; - // vIndex: 100, symbol: ?useInterruptedByAttacking@BrushItem@@UEBA_NXZ + // vIndex: 99, symbol: ?useInterruptedByAttacking@BrushItem@@UEBA_NXZ virtual bool useInterruptedByAttacking() const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BrushItem@@MEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& item, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/BucketItem.h b/src/mc/world/item/BucketItem.h index 00e183d6cf..1d302b88cf 100644 --- a/src/mc/world/item/BucketItem.h +++ b/src/mc/world/item/BucketItem.h @@ -63,28 +63,28 @@ class BucketItem : public ::Item { // vIndex: 74, symbol: ?releaseUsing@BucketItem@@UEBAXAEAVItemStack@@PEAVPlayer@@H@Z virtual void releaseUsing(class ItemStack& inoutInstance, class Player* player, int durationLeft) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@BucketItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 86, symbol: ?getMaxStackSize@BucketItem@@UEBAEAEBVItemDescriptor@@@Z + // vIndex: 85, symbol: ?getMaxStackSize@BucketItem@@UEBAEAEBVItemDescriptor@@@Z virtual uchar getMaxStackSize(class ItemDescriptor const&) const; - // vIndex: 95, symbol: ?validFishInteraction@BucketItem@@UEBA_NH@Z + // vIndex: 94, symbol: ?validFishInteraction@BucketItem@@UEBA_NH@Z virtual bool validFishInteraction(int auxValue) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@BucketItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 108, symbol: ?getLightEmission@BucketItem@@UEBA?AUBrightness@@H@Z + // vIndex: 107, symbol: ?getLightEmission@BucketItem@@UEBA?AUBrightness@@H@Z virtual struct Brightness getLightEmission(int auxValue) const; - // vIndex: 113, symbol: + // vIndex: 112, symbol: // ?getAuxValuesDescription@BucketItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getAuxValuesDescription() const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@BucketItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/CandleBlockItem.h b/src/mc/world/item/CandleBlockItem.h index 6dd5690556..6c8754368c 100644 --- a/src/mc/world/item/CandleBlockItem.h +++ b/src/mc/world/item/CandleBlockItem.h @@ -35,7 +35,7 @@ class CandleBlockItem : public ::BlockItem { // vIndex: 32, symbol: ?getLevelDataForAuxValue@CandleBlockItem@@UEBAHH@Z virtual int getLevelDataForAuxValue(int auxValue) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@CandleBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const&) const; diff --git a/src/mc/world/item/CarrotOnAStickItem.h b/src/mc/world/item/CarrotOnAStickItem.h index cd18b0ef3c..96201324bf 100644 --- a/src/mc/world/item/CarrotOnAStickItem.h +++ b/src/mc/world/item/CarrotOnAStickItem.h @@ -44,7 +44,7 @@ class CarrotOnAStickItem : public ::Item { // vIndex: 76, symbol: ?hurtActor@CarrotOnAStickItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack& item, class Actor& actor, class Mob& attacker) const; - // vIndex: 80, symbol: ?mineBlock@CarrotOnAStickItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@CarrotOnAStickItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& item, class Block const& block, int x, int y, int z, class Actor* owner) const; diff --git a/src/mc/world/item/ChemistryAuxDataBlockItem.h b/src/mc/world/item/ChemistryAuxDataBlockItem.h index 32651d2ce0..6eef543143 100644 --- a/src/mc/world/item/ChemistryAuxDataBlockItem.h +++ b/src/mc/world/item/ChemistryAuxDataBlockItem.h @@ -29,7 +29,7 @@ class ChemistryAuxDataBlockItem : public ::AuxDataBlockItem { // vIndex: 0, symbol: __gen_??1ChemistryAuxDataBlockItem@@UEAA@XZ virtual ~ChemistryAuxDataBlockItem() = default; - // vIndex: 91, symbol: ?fixupCommon@ChemistryAuxDataBlockItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@ChemistryAuxDataBlockItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; // NOLINTEND diff --git a/src/mc/world/item/ChemistryBlockItem.h b/src/mc/world/item/ChemistryBlockItem.h index e033b2deb6..b082931f2a 100644 --- a/src/mc/world/item/ChemistryBlockItem.h +++ b/src/mc/world/item/ChemistryBlockItem.h @@ -29,7 +29,7 @@ class ChemistryBlockItem : public ::BlockItem { // vIndex: 0, symbol: __gen_??1ChemistryBlockItem@@UEAA@XZ virtual ~ChemistryBlockItem() = default; - // vIndex: 91, symbol: ?fixupCommon@ChemistryBlockItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@ChemistryBlockItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; // NOLINTEND diff --git a/src/mc/world/item/ChemistryItem.h b/src/mc/world/item/ChemistryItem.h index 8dabb7b242..c8b9b07559 100644 --- a/src/mc/world/item/ChemistryItem.h +++ b/src/mc/world/item/ChemistryItem.h @@ -29,7 +29,7 @@ class ChemistryItem : public ::Item { // vIndex: 0, symbol: ??1ChemistryItem@@UEAA@XZ virtual ~ChemistryItem(); - // vIndex: 91, symbol: ?fixupCommon@ChemistryItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@ChemistryItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; // symbol: ?validate@ChemistryItem@@SAXAEAVItemStackBase@@@Z diff --git a/src/mc/world/item/ChemistryStickItem.h b/src/mc/world/item/ChemistryStickItem.h index 984e09c35e..21955200af 100644 --- a/src/mc/world/item/ChemistryStickItem.h +++ b/src/mc/world/item/ChemistryStickItem.h @@ -56,15 +56,15 @@ class ChemistryStickItem : public ::ChemistryItem { // vIndex: 76, symbol: ?hurtActor@ChemistryStickItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack& instance, class Actor& actor, class Mob& attacker) const; - // vIndex: 80, symbol: ?mineBlock@ChemistryStickItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@ChemistryStickItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& item, class Block const& block, int x, int y, int z, class Actor* owner) const; - // vIndex: 87, symbol: ?inventoryTick@ChemistryStickItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z + // vIndex: 86, symbol: ?inventoryTick@ChemistryStickItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z virtual bool inventoryTick(class ItemStack& item, class Level& level, class Actor& owner, int slot, bool selected) const; - // vIndex: 91, symbol: ?fixupCommon@ChemistryStickItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@ChemistryStickItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; // symbol: ??0ChemistryStickItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/ChestBoatItem.h b/src/mc/world/item/ChestBoatItem.h index 95cba91545..c1d59b4b59 100644 --- a/src/mc/world/item/ChestBoatItem.h +++ b/src/mc/world/item/ChestBoatItem.h @@ -30,11 +30,11 @@ class ChestBoatItem : public ::BoatItem { // vIndex: 0, symbol: __gen_??1ChestBoatItem@@UEAA@XZ virtual ~ChestBoatItem() = default; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@ChestBoatItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 119, symbol: ?_getActorType@ChestBoatItem@@EEBA?AW4ActorType@@XZ + // vIndex: 118, symbol: ?_getActorType@ChestBoatItem@@EEBA?AW4ActorType@@XZ virtual ::ActorType _getActorType() const; // symbol: ??0ChestBoatItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HH@Z diff --git a/src/mc/world/item/ClockItem.h b/src/mc/world/item/ClockItem.h index 5de8eb3e59..4b19c63580 100644 --- a/src/mc/world/item/ClockItem.h +++ b/src/mc/world/item/ClockItem.h @@ -29,10 +29,10 @@ class ClockItem : public ::Item { // vIndex: 0, symbol: __gen_??1ClockItem@@UEAA@XZ virtual ~ClockItem() = default; - // vIndex: 104, symbol: ?getIconInfo@ClockItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@ClockItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 106, symbol: ?getAnimationFrameFor@ClockItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@ClockItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob* holder, bool asItemEntity, class ItemStack const* item, bool shouldAnimate) const; diff --git a/src/mc/world/item/CoalItem.h b/src/mc/world/item/CoalItem.h index 6bc2e70838..b5d348aab6 100644 --- a/src/mc/world/item/CoalItem.h +++ b/src/mc/world/item/CoalItem.h @@ -34,18 +34,18 @@ class CoalItem : public ::ComponentItem { // vIndex: 0, symbol: __gen_??1CoalItem@@UEAA@XZ virtual ~CoalItem() = default; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@CoalItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@CoalItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const&, int); - // vIndex: 104, symbol: ?getIconInfo@CoalItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@CoalItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const&, int, bool) const; - // vIndex: 112, symbol: ?getFurnaceXPmultiplier@CoalItem@@UEBAMAEBVItemStackBase@@@Z + // vIndex: 111, symbol: ?getFurnaceXPmultiplier@CoalItem@@UEBAMAEBVItemStackBase@@@Z virtual float getFurnaceXPmultiplier(class ItemStackBase const& instance) const; // symbol: diff --git a/src/mc/world/item/CocoaBeanItem.h b/src/mc/world/item/CocoaBeanItem.h index cd9918cca9..78f3a970b0 100644 --- a/src/mc/world/item/CocoaBeanItem.h +++ b/src/mc/world/item/CocoaBeanItem.h @@ -38,15 +38,15 @@ class CocoaBeanItem : public ::Item { // vIndex: 54, symbol: ?isValidAuxValue@CocoaBeanItem@@UEBA_NH@Z virtual bool isValidAuxValue(int) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@CocoaBeanItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@CocoaBeanItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const&, int); - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@CocoaBeanItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack&, class Actor&, class BlockPos, uchar, class Vec3 const&) const; diff --git a/src/mc/world/item/CompassItem.h b/src/mc/world/item/CompassItem.h index 3d1fd076f5..55423b2e84 100644 --- a/src/mc/world/item/CompassItem.h +++ b/src/mc/world/item/CompassItem.h @@ -29,7 +29,7 @@ class CompassItem : public ::AbstractCompassItem { // vIndex: 0, symbol: __gen_??1CompassItem@@UEAA@XZ virtual ~CompassItem() = default; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@CompassItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& item, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; diff --git a/src/mc/world/item/ComplexItem.h b/src/mc/world/item/ComplexItem.h index 5a64e8fd82..fcac3a2231 100644 --- a/src/mc/world/item/ComplexItem.h +++ b/src/mc/world/item/ComplexItem.h @@ -32,7 +32,7 @@ class ComplexItem : public ::Item { // vIndex: 53, symbol: ?isComplex@ComplexItem@@UEBA_NXZ virtual bool isComplex() const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?getUpdatePacket@ComplexItem@@UEBA?AV?$unique_ptr@VPacket@@U?$default_delete@VPacket@@@std@@@std@@AEBVItemStack@@AEAVLevel@@AEAVActor@@@Z virtual std::unique_ptr getUpdatePacket(class ItemStack const& item, class Level& level, class Actor& player) const; diff --git a/src/mc/world/item/CompoundItem.h b/src/mc/world/item/CompoundItem.h index b306f77a15..8e470be4a6 100644 --- a/src/mc/world/item/CompoundItem.h +++ b/src/mc/world/item/CompoundItem.h @@ -33,15 +33,15 @@ class CompoundItem : public ::ChemistryItem { // vIndex: 54, symbol: ?isValidAuxValue@CompoundItem@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@CompoundItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@CompoundItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@CompoundItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@CompoundItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; // symbol: diff --git a/src/mc/world/item/CoralFanBlockItem.h b/src/mc/world/item/CoralFanBlockItem.h index 0351bf0e6b..285ceaae6f 100644 --- a/src/mc/world/item/CoralFanBlockItem.h +++ b/src/mc/world/item/CoralFanBlockItem.h @@ -35,7 +35,7 @@ class CoralFanBlockItem : public ::BlockItem { // vIndex: 54, symbol: ?isValidAuxValue@CoralFanBlockItem@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@CoralFanBlockItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const&) const; diff --git a/src/mc/world/item/CrossbowItem.h b/src/mc/world/item/CrossbowItem.h index a8de452357..6f1879ad38 100644 --- a/src/mc/world/item/CrossbowItem.h +++ b/src/mc/world/item/CrossbowItem.h @@ -46,24 +46,24 @@ class CrossbowItem : public ::RangedWeaponItem { // vIndex: 74, symbol: ?releaseUsing@CrossbowItem@@UEBAXAEAVItemStack@@PEAVPlayer@@H@Z virtual void releaseUsing(class ItemStack& item, class Player* player, int durationLeft) const; - // vIndex: 96, symbol: ?enchantProjectile@CrossbowItem@@UEBAXAEBVItemStackBase@@AEAVActor@@@Z + // vIndex: 95, symbol: ?enchantProjectile@CrossbowItem@@UEBAXAEBVItemStackBase@@AEAVActor@@@Z virtual void enchantProjectile(class ItemStackBase const&, class Actor& projectile) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@CrossbowItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@CrossbowItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@CrossbowItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 106, symbol: ?getAnimationFrameFor@CrossbowItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@CrossbowItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob* holder, bool asItemEntity, class ItemStack const* item, bool shouldAnimate) const; - // vIndex: 110, symbol: ?canBeCharged@CrossbowItem@@UEBA_NXZ + // vIndex: 109, symbol: ?canBeCharged@CrossbowItem@@UEBA_NXZ virtual bool canBeCharged() const; - // vIndex: 111, symbol: ?playSoundIncrementally@CrossbowItem@@UEBAXAEBVItemStack@@AEAVMob@@@Z + // vIndex: 110, symbol: ?playSoundIncrementally@CrossbowItem@@UEBAXAEBVItemStack@@AEAVMob@@@Z virtual void playSoundIncrementally(class ItemStack const& item, class Mob& mob) const; // symbol: ??0CrossbowItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/DecoratedPotBlockItem.h b/src/mc/world/item/DecoratedPotBlockItem.h index 296b695338..2a90882e1e 100644 --- a/src/mc/world/item/DecoratedPotBlockItem.h +++ b/src/mc/world/item/DecoratedPotBlockItem.h @@ -33,7 +33,7 @@ class DecoratedPotBlockItem : public ::BlockItem { // ?appendFormattedHovertext@DecoratedPotBlockItem@@UEBAXAEBVItemStackBase@@AEAVLevel@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@Z virtual void appendFormattedHovertext(class ItemStackBase const&, class Level&, std::string&, bool) const; - // vIndex: 91, symbol: ?fixupCommon@DecoratedPotBlockItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@DecoratedPotBlockItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase&) const; // symbol: ??0DecoratedPotBlockItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/DiggerItem.h b/src/mc/world/item/DiggerItem.h index 383f342882..a868329846 100644 --- a/src/mc/world/item/DiggerItem.h +++ b/src/mc/world/item/DiggerItem.h @@ -57,7 +57,7 @@ class DiggerItem : public ::Item { // vIndex: 75, symbol: ?getDestroySpeed@DiggerItem@@UEBAMAEBVItemStackBase@@AEBVBlock@@@Z virtual float getDestroySpeed(class ItemStackBase const& item, class Block const& block) const; - // vIndex: 80, symbol: ?mineBlock@DiggerItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@DiggerItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& itemInstance, class Block const& block, int x, int y, int z, class Actor* owner) const; diff --git a/src/mc/world/item/DiscFragmentItem.h b/src/mc/world/item/DiscFragmentItem.h index d56d72d46f..6a85a1207e 100644 --- a/src/mc/world/item/DiscFragmentItem.h +++ b/src/mc/world/item/DiscFragmentItem.h @@ -38,7 +38,7 @@ class DiscFragmentItem : public ::Item { bool showCategory ) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@DiscFragmentItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; diff --git a/src/mc/world/item/DoorItem.h b/src/mc/world/item/DoorItem.h index 3fcc2e1d14..08a1aa6360 100644 --- a/src/mc/world/item/DoorItem.h +++ b/src/mc/world/item/DoorItem.h @@ -30,7 +30,7 @@ class DoorItem : public ::Item { // vIndex: 0, symbol: __gen_??1DoorItem@@UEAA@XZ virtual ~DoorItem() = default; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@DoorItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/DyePowderItem.h b/src/mc/world/item/DyePowderItem.h index 1a2e53f66a..286678a139 100644 --- a/src/mc/world/item/DyePowderItem.h +++ b/src/mc/world/item/DyePowderItem.h @@ -38,11 +38,11 @@ class DyePowderItem : public ::Item { // vIndex: 54, symbol: ?isValidAuxValue@DyePowderItem@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@DyePowderItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@DyePowderItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); diff --git a/src/mc/world/item/ElementBlockItem.h b/src/mc/world/item/ElementBlockItem.h index 87d9a241d1..f772ca0bc1 100644 --- a/src/mc/world/item/ElementBlockItem.h +++ b/src/mc/world/item/ElementBlockItem.h @@ -29,7 +29,7 @@ class ElementBlockItem : public ::ChemistryAuxDataBlockItem { // vIndex: 0, symbol: __gen_??1ElementBlockItem@@UEAA@XZ virtual ~ElementBlockItem() = default; - // vIndex: 91, symbol: ?fixupCommon@ElementBlockItem@@EEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@ElementBlockItem@@EEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; // NOLINTEND diff --git a/src/mc/world/item/EmptyMapItem.h b/src/mc/world/item/EmptyMapItem.h index 42c5789975..42e668f2da 100644 --- a/src/mc/world/item/EmptyMapItem.h +++ b/src/mc/world/item/EmptyMapItem.h @@ -35,11 +35,11 @@ class EmptyMapItem : public ::ComplexItem { // vIndex: 71, symbol: ?use@EmptyMapItem@@UEBAAEAVItemStack@@AEAV2@AEAVPlayer@@@Z virtual class ItemStack& use(class ItemStack& item, class Player& player) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@EmptyMapItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 105, symbol: + // vIndex: 104, symbol: // ?getInteractText@EmptyMapItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPlayer@@@Z virtual std::string getInteractText(class Player const&) const; diff --git a/src/mc/world/item/EndCrystalItem.h b/src/mc/world/item/EndCrystalItem.h index 217a146b8c..c2cd5fb172 100644 --- a/src/mc/world/item/EndCrystalItem.h +++ b/src/mc/world/item/EndCrystalItem.h @@ -35,7 +35,7 @@ class EndCrystalItem : public ::Item { // vIndex: 43, symbol: ?isDestructive@EndCrystalItem@@UEBA_NH@Z virtual bool isDestructive(int auxValue) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@EndCrystalItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor&, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; diff --git a/src/mc/world/item/EnderpearlItem.h b/src/mc/world/item/EnderpearlItem.h index 9fe4d07db2..1430b02532 100644 --- a/src/mc/world/item/EnderpearlItem.h +++ b/src/mc/world/item/EnderpearlItem.h @@ -35,10 +35,10 @@ class EnderpearlItem : public ::Item { // vIndex: 71, symbol: ?use@EnderpearlItem@@UEBAAEAVItemStack@@AEAV2@AEAVPlayer@@@Z virtual class ItemStack& use(class ItemStack& item, class Player& player) const; - // vIndex: 89, symbol: ?getCooldownType@EnderpearlItem@@UEBAAEBVHashedString@@XZ + // vIndex: 88, symbol: ?getCooldownType@EnderpearlItem@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getCooldownType() const; - // vIndex: 90, symbol: ?getCooldownTime@EnderpearlItem@@UEBAHXZ + // vIndex: 89, symbol: ?getCooldownTime@EnderpearlItem@@UEBAHXZ virtual int getCooldownTime() const; // symbol: ??0EnderpearlItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/FertilizerItem.h b/src/mc/world/item/FertilizerItem.h index 103b9734fe..ceb3010456 100644 --- a/src/mc/world/item/FertilizerItem.h +++ b/src/mc/world/item/FertilizerItem.h @@ -41,7 +41,7 @@ class FertilizerItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@FertilizerItem@@MEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/FireChargeItem.h b/src/mc/world/item/FireChargeItem.h index f2da29109c..202b55631f 100644 --- a/src/mc/world/item/FireChargeItem.h +++ b/src/mc/world/item/FireChargeItem.h @@ -36,11 +36,11 @@ class FireChargeItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 116, symbol: ?_calculatePlacePos@FireChargeItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 115, symbol: ?_calculatePlacePos@FireChargeItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& actor, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@FireChargeItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/FireworkChargeItem.h b/src/mc/world/item/FireworkChargeItem.h index 4a3881acfd..79208c6d48 100644 --- a/src/mc/world/item/FireworkChargeItem.h +++ b/src/mc/world/item/FireworkChargeItem.h @@ -51,7 +51,7 @@ class FireworkChargeItem : public ::Item { // vIndex: 60, symbol: ?getColor@FireworkChargeItem@@UEBA?AVColor@mce@@PEBVCompoundTag@@AEBVItemDescriptor@@@Z virtual class mce::Color getColor(class CompoundTag const* userData, class ItemDescriptor const& instance) const; - // vIndex: 101, symbol: ?hasSameRelevantUserData@FireworkChargeItem@@UEBA_NAEBVItemStackBase@@0@Z + // vIndex: 100, symbol: ?hasSameRelevantUserData@FireworkChargeItem@@UEBA_NAEBVItemStackBase@@0@Z virtual bool hasSameRelevantUserData(class ItemStackBase const& stack, class ItemStackBase const& other) const; // symbol: ??0FireworkChargeItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/FireworksItem.h b/src/mc/world/item/FireworksItem.h index 1c6ef299fa..2b69b32142 100644 --- a/src/mc/world/item/FireworksItem.h +++ b/src/mc/world/item/FireworksItem.h @@ -48,7 +48,7 @@ class FireworksItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@FireworksItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor&, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; diff --git a/src/mc/world/item/FishingRodItem.h b/src/mc/world/item/FishingRodItem.h index 210037db3a..f9ddcc8a2b 100644 --- a/src/mc/world/item/FishingRodItem.h +++ b/src/mc/world/item/FishingRodItem.h @@ -48,33 +48,33 @@ class FishingRodItem : public ::ComponentItem { // vIndex: 76, symbol: ?hurtActor@FishingRodItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack& item, class Actor& actor, class Mob& attacker) const; - // vIndex: 80, symbol: ?mineBlock@FishingRodItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@FishingRodItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& item, class Block const& block, int x, int y, int z, class Actor* owner) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@FishingRodItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 99, symbol: ?shouldSendInteractionGameEvents@FishingRodItem@@UEBA_NXZ + // vIndex: 98, symbol: ?shouldSendInteractionGameEvents@FishingRodItem@@UEBA_NXZ virtual bool shouldSendInteractionGameEvents() const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@FishingRodItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const&, int); - // vIndex: 104, symbol: ?getIconInfo@FishingRodItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@FishingRodItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 105, symbol: + // vIndex: 104, symbol: // ?getInteractText@FishingRodItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPlayer@@@Z virtual std::string getInteractText(class Player const&) const; - // vIndex: 106, symbol: ?getAnimationFrameFor@FishingRodItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@FishingRodItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob* holder, bool asItemEntity, class ItemStack const* item, bool shouldAnimate) const; - // vIndex: 121, symbol: ?shouldUseJsonForRenderMatrix@FishingRodItem@@UEBA_NXZ + // vIndex: 120, symbol: ?shouldUseJsonForRenderMatrix@FishingRodItem@@UEBA_NXZ virtual bool shouldUseJsonForRenderMatrix() const; // symbol: diff --git a/src/mc/world/item/FlintAndSteelItem.h b/src/mc/world/item/FlintAndSteelItem.h index d010b67c6d..122194175c 100644 --- a/src/mc/world/item/FlintAndSteelItem.h +++ b/src/mc/world/item/FlintAndSteelItem.h @@ -42,12 +42,12 @@ class FlintAndSteelItem : public ::Item { // vIndex: 76, symbol: ?hurtActor@FlintAndSteelItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack& item, class Actor& actor, class Mob& attacker) const; - // vIndex: 116, symbol: + // vIndex: 115, symbol: // ?_calculatePlacePos@FlintAndSteelItem@@MEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@FlintAndSteelItem@@MEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/FrogSpawnBlockItem.h b/src/mc/world/item/FrogSpawnBlockItem.h index 3d310e88af..f29ea101e9 100644 --- a/src/mc/world/item/FrogSpawnBlockItem.h +++ b/src/mc/world/item/FrogSpawnBlockItem.h @@ -32,12 +32,12 @@ class FrogSpawnBlockItem : public ::BlockItem { // vIndex: 44, symbol: ?isLiquidClipItem@FrogSpawnBlockItem@@UEBA_NXZ virtual bool isLiquidClipItem() const; - // vIndex: 116, symbol: + // vIndex: 115, symbol: // ?_calculatePlacePos@FrogSpawnBlockItem@@UEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& actor, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@FrogSpawnBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const&) const; diff --git a/src/mc/world/item/GlowStickItem.h b/src/mc/world/item/GlowStickItem.h index d6dbaf59ca..5d3704b728 100644 --- a/src/mc/world/item/GlowStickItem.h +++ b/src/mc/world/item/GlowStickItem.h @@ -32,11 +32,11 @@ class GlowStickItem : public ::ChemistryStickItem { // vIndex: 54, symbol: ?isValidAuxValue@GlowStickItem@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@GlowStickItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 108, symbol: ?getLightEmission@GlowStickItem@@UEBA?AUBrightness@@H@Z + // vIndex: 107, symbol: ?getLightEmission@GlowStickItem@@UEBA?AUBrightness@@H@Z virtual struct Brightness getLightEmission(int auxValue) const; // symbol: ??0GlowStickItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/GoatHornItem.h b/src/mc/world/item/GoatHornItem.h index b38e30ff4a..a09aa2e5b0 100644 --- a/src/mc/world/item/GoatHornItem.h +++ b/src/mc/world/item/GoatHornItem.h @@ -41,13 +41,13 @@ class GoatHornItem : public ::Item { // vIndex: 71, symbol: ?use@GoatHornItem@@UEBAAEAVItemStack@@AEAV2@AEAVPlayer@@@Z virtual class ItemStack& use(class ItemStack& item, class Player& player) const; - // vIndex: 89, symbol: ?getCooldownType@GoatHornItem@@UEBAAEBVHashedString@@XZ + // vIndex: 88, symbol: ?getCooldownType@GoatHornItem@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getCooldownType() const; - // vIndex: 90, symbol: ?getCooldownTime@GoatHornItem@@UEBAHXZ + // vIndex: 89, symbol: ?getCooldownTime@GoatHornItem@@UEBAHXZ virtual int getCooldownTime() const; - // vIndex: 110, symbol: ?canBeCharged@GoatHornItem@@UEBA_NXZ + // vIndex: 109, symbol: ?canBeCharged@GoatHornItem@@UEBA_NXZ virtual bool canBeCharged() const; // symbol: ??0GoatHornItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/HangingActorItem.h b/src/mc/world/item/HangingActorItem.h index d87595bcaa..04c7904e73 100644 --- a/src/mc/world/item/HangingActorItem.h +++ b/src/mc/world/item/HangingActorItem.h @@ -30,7 +30,7 @@ class HangingActorItem : public ::Item { // vIndex: 0, symbol: __gen_??1HangingActorItem@@UEAA@XZ virtual ~HangingActorItem() = default; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@HangingActorItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor&, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; diff --git a/src/mc/world/item/HangingSignItem.h b/src/mc/world/item/HangingSignItem.h index e5ae0da615..2d762e8ae6 100644 --- a/src/mc/world/item/HangingSignItem.h +++ b/src/mc/world/item/HangingSignItem.h @@ -30,11 +30,11 @@ class HangingSignItem : public ::SignItem { // vIndex: 0, symbol: __gen_??1HangingSignItem@@UEAA@XZ virtual ~HangingSignItem() = default; - // vIndex: 116, symbol: + // vIndex: 115, symbol: // ?_calculatePlacePos@HangingSignItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase&, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 119, symbol: ?getBlockToPlace@HangingSignItem@@MEBAPEBVBlock@@EAEBVActor@@VBlockPos@@@Z + // vIndex: 118, symbol: ?getBlockToPlace@HangingSignItem@@MEBAPEBVBlock@@EAEBVActor@@VBlockPos@@@Z virtual class Block const* getBlockToPlace(uchar face, class Actor const& entity, class BlockPos pos) const; // symbol: diff --git a/src/mc/world/item/IceBombItem.h b/src/mc/world/item/IceBombItem.h index f874d02bfa..9522007aae 100644 --- a/src/mc/world/item/IceBombItem.h +++ b/src/mc/world/item/IceBombItem.h @@ -39,10 +39,10 @@ class IceBombItem : public ::ChemistryItem { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 89, symbol: ?getCooldownType@IceBombItem@@UEBAAEBVHashedString@@XZ + // vIndex: 88, symbol: ?getCooldownType@IceBombItem@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getCooldownType() const; - // vIndex: 90, symbol: ?getCooldownTime@IceBombItem@@UEBAHXZ + // vIndex: 89, symbol: ?getCooldownTime@IceBombItem@@UEBAHXZ virtual int getCooldownTime() const; // symbol: ??0IceBombItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/Item.h b/src/mc/world/item/Item.h index d679ef6367..01e3c30830 100644 --- a/src/mc/world/item/Item.h +++ b/src/mc/world/item/Item.h @@ -358,57 +358,53 @@ class Item { hitBlock(class ItemStack& instance, class Block const& block, class BlockPos const& blockPos, class Mob& attacker) const; - // vIndex: 79, symbol: ?mineBlock@Item@@UEBA_NAEAVItemInstance@@AEBVBlock@@HHHPEAVActor@@@Z - virtual bool - mineBlock(class ItemInstance& instance, class Block const& block, int x, int y, int z, class Actor* owner) const; - - // vIndex: 80, symbol: ?mineBlock@Item@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@Item@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& instance, class Block const& block, int x, int y, int z, class Actor* owner) const; - // vIndex: 81, symbol: + // vIndex: 80, symbol: // ?buildDescriptionName@Item@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemStackBase@@@Z virtual std::string buildDescriptionName(class ItemStackBase const&) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@Item@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 83, symbol: + // vIndex: 82, symbol: // ?buildEffectDescriptionName@Item@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemStackBase@@@Z virtual std::string buildEffectDescriptionName(class ItemStackBase const&) const; - // vIndex: 84, symbol: ?readUserData@Item@@UEBAXAEAVItemStackBase@@AEAVIDataInput@@AEAVReadOnlyBinaryStream@@@Z + // vIndex: 83, symbol: ?readUserData@Item@@UEBAXAEAVItemStackBase@@AEAVIDataInput@@AEAVReadOnlyBinaryStream@@@Z virtual void readUserData(class ItemStackBase& stack, class IDataInput& input, class ReadOnlyBinaryStream& underlyingStream) const; - // vIndex: 85, symbol: ?writeUserData@Item@@UEBAXAEBVItemStackBase@@AEAVIDataOutput@@@Z + // vIndex: 84, symbol: ?writeUserData@Item@@UEBAXAEBVItemStackBase@@AEAVIDataOutput@@@Z virtual void writeUserData(class ItemStackBase const& stack, class IDataOutput& output) const; - // vIndex: 86, symbol: ?getMaxStackSize@Item@@UEBAEAEBVItemDescriptor@@@Z + // vIndex: 85, symbol: ?getMaxStackSize@Item@@UEBAEAEBVItemDescriptor@@@Z virtual uchar getMaxStackSize(class ItemDescriptor const& item) const; - // vIndex: 87, symbol: ?inventoryTick@Item@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z + // vIndex: 86, symbol: ?inventoryTick@Item@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z virtual bool inventoryTick(class ItemStack& item, class Level& level, class Actor& owner, int slot, bool selected) const; - // vIndex: 88, symbol: ?refreshedInContainer@Item@@UEBAXAEBVItemStackBase@@AEAVLevel@@@Z + // vIndex: 87, symbol: ?refreshedInContainer@Item@@UEBAXAEBVItemStackBase@@AEAVLevel@@@Z virtual void refreshedInContainer(class ItemStackBase const& stack, class Level& level) const; - // vIndex: 89, symbol: ?getCooldownType@Item@@UEBAAEBVHashedString@@XZ + // vIndex: 88, symbol: ?getCooldownType@Item@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getCooldownType() const; - // vIndex: 90, symbol: ?getCooldownTime@Item@@UEBAHXZ + // vIndex: 89, symbol: ?getCooldownTime@Item@@UEBAHXZ virtual int getCooldownTime() const; - // vIndex: 91, symbol: ?fixupCommon@Item@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@Item@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; - // vIndex: 92, symbol: ?fixupCommon@Item@@UEBAXAEAVItemStackBase@@AEAVLevel@@@Z + // vIndex: 91, symbol: ?fixupCommon@Item@@UEBAXAEAVItemStackBase@@AEAVLevel@@@Z virtual void fixupCommon(class ItemStackBase& stack, class Level& level) const; - // vIndex: 93, symbol: ?getInHandUpdateType@Item@@UEBA?AW4InHandUpdateType@@AEBVPlayer@@AEBVItemInstance@@1_N2@Z + // vIndex: 92, symbol: ?getInHandUpdateType@Item@@UEBA?AW4InHandUpdateType@@AEBVPlayer@@AEBVItemInstance@@1_N2@Z virtual ::InHandUpdateType getInHandUpdateType( class Player const&, class ItemInstance const& oldItem, @@ -417,7 +413,7 @@ class Item { bool slotChanged ) const; - // vIndex: 94, symbol: ?getInHandUpdateType@Item@@UEBA?AW4InHandUpdateType@@AEBVPlayer@@AEBVItemStack@@1_N2@Z + // vIndex: 93, symbol: ?getInHandUpdateType@Item@@UEBA?AW4InHandUpdateType@@AEBVPlayer@@AEBVItemStack@@1_N2@Z virtual ::InHandUpdateType getInHandUpdateType( class Player const&, class ItemStack const& oldItem, @@ -426,84 +422,84 @@ class Item { bool slotChanged ) const; - // vIndex: 95, symbol: ?validFishInteraction@Item@@UEBA_NH@Z + // vIndex: 94, symbol: ?validFishInteraction@Item@@UEBA_NH@Z virtual bool validFishInteraction(int auxValue) const; - // vIndex: 96, symbol: ?enchantProjectile@Item@@UEBAXAEBVItemStackBase@@AEAVActor@@@Z + // vIndex: 95, symbol: ?enchantProjectile@Item@@UEBAXAEBVItemStackBase@@AEAVActor@@@Z virtual void enchantProjectile(class ItemStackBase const&, class Actor& projectile) const; - // vIndex: 97, symbol: ?getEquipLocation@Item@@UEBA?AW4ActorLocation@@XZ + // vIndex: 96, symbol: ?getEquipLocation@Item@@UEBA?AW4ActorLocation@@XZ virtual ::ActorLocation getEquipLocation() const; - // vIndex: 98, symbol: ?getEquipSound@Item@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 97, symbol: ?getEquipSound@Item@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getEquipSound() const; - // vIndex: 99, symbol: ?shouldSendInteractionGameEvents@Item@@UEBA_NXZ + // vIndex: 98, symbol: ?shouldSendInteractionGameEvents@Item@@UEBA_NXZ virtual bool shouldSendInteractionGameEvents() const; - // vIndex: 100, symbol: ?useInterruptedByAttacking@Item@@UEBA_NXZ + // vIndex: 99, symbol: ?useInterruptedByAttacking@Item@@UEBA_NXZ virtual bool useInterruptedByAttacking() const; - // vIndex: 101, symbol: ?hasSameRelevantUserData@Item@@UEBA_NAEBVItemStackBase@@0@Z + // vIndex: 100, symbol: ?hasSameRelevantUserData@Item@@UEBA_NAEBVItemStackBase@@0@Z virtual bool hasSameRelevantUserData(class ItemStackBase const&, class ItemStackBase const&) const; - // vIndex: 102, symbol: ?initClient@Item@@UEAAXAEAVValue@Json@@AEBVSemVersion@@_NAEBVExperiments@@@Z + // vIndex: 101, symbol: ?initClient@Item@@UEAAXAEAVValue@Json@@AEBVSemVersion@@_NAEBVExperiments@@@Z virtual void initClient(class Json::Value&, class SemVersion const&, bool, class Experiments const&); - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@Item@@UEAAAEAV1@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int index); - // vIndex: 104, symbol: ?getIconInfo@Item@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@Item@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const&, int, bool) const; - // vIndex: 105, symbol: + // vIndex: 104, symbol: // ?getInteractText@Item@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPlayer@@@Z virtual std::string getInteractText(class Player const&) const; - // vIndex: 106, symbol: ?getAnimationFrameFor@Item@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@Item@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob* holder, bool asItemEntity, class ItemStack const* item, bool shouldAnimate) const; - // vIndex: 107, symbol: ?isEmissive@Item@@UEBA_NH@Z + // vIndex: 106, symbol: ?isEmissive@Item@@UEBA_NH@Z virtual bool isEmissive(int auxValue) const; - // vIndex: 108, symbol: ?getLightEmission@Item@@UEBA?AUBrightness@@H@Z + // vIndex: 107, symbol: ?getLightEmission@Item@@UEBA?AUBrightness@@H@Z virtual struct Brightness getLightEmission(int auxValue) const; - // vIndex: 109, symbol: ?getIconYOffset@Item@@UEBAHXZ + // vIndex: 108, symbol: ?getIconYOffset@Item@@UEBAHXZ virtual int getIconYOffset() const; - // vIndex: 110, symbol: ?canBeCharged@Item@@UEBA_NXZ + // vIndex: 109, symbol: ?canBeCharged@Item@@UEBA_NXZ virtual bool canBeCharged() const; - // vIndex: 111, symbol: ?playSoundIncrementally@Item@@UEBAXAEBVItemStack@@AEAVMob@@@Z + // vIndex: 110, symbol: ?playSoundIncrementally@Item@@UEBAXAEBVItemStack@@AEAVMob@@@Z virtual void playSoundIncrementally(class ItemStack const& item, class Mob& mob) const; - // vIndex: 112, symbol: ?getFurnaceXPmultiplier@Item@@UEBAMAEBVItemStackBase@@@Z + // vIndex: 111, symbol: ?getFurnaceXPmultiplier@Item@@UEBAMAEBVItemStackBase@@@Z virtual float getFurnaceXPmultiplier(class ItemStackBase const& instance) const; - // vIndex: 113, symbol: + // vIndex: 112, symbol: // ?getAuxValuesDescription@Item@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getAuxValuesDescription() const; - // vIndex: 114, symbol: ?calculatePlacePos@Item@@UEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 113, symbol: ?calculatePlacePos@Item@@UEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 115, symbol: ?_checkUseOnPermissions@Item@@EEBA_NAEAVActor@@AEAVItemStackBase@@AEBEAEBVBlockPos@@@Z + // vIndex: 114, symbol: ?_checkUseOnPermissions@Item@@EEBA_NAEAVActor@@AEAVItemStackBase@@AEBEAEBVBlockPos@@@Z virtual bool _checkUseOnPermissions(class Actor& entity, class ItemStackBase& item, uchar const& face, class BlockPos const& pos) const; - // vIndex: 116, symbol: ?_calculatePlacePos@Item@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 115, symbol: ?_calculatePlacePos@Item@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 117, symbol: ?_shouldAutoCalculatePlacePos@Item@@EEBA_NXZ + // vIndex: 116, symbol: ?_shouldAutoCalculatePlacePos@Item@@EEBA_NXZ virtual bool _shouldAutoCalculatePlacePos() const; - // vIndex: 118, symbol: ?_useOn@Item@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z + // vIndex: 117, symbol: ?_useOn@Item@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; diff --git a/src/mc/world/item/ItemStackBase.h b/src/mc/world/item/ItemStackBase.h index 848e3de625..d696581965 100644 --- a/src/mc/world/item/ItemStackBase.h +++ b/src/mc/world/item/ItemStackBase.h @@ -118,10 +118,6 @@ class ItemStackBase { // symbol: ?constructItemEnchantsFromUserData@ItemStackBase@@QEBA?AVItemEnchants@@XZ MCAPI class ItemEnchants constructItemEnchantsFromUserData() const; - // symbol: - // ?executeEvent@ItemStackBase@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVRenderParams@@@Z - MCAPI void executeEvent(std::string const& event, class RenderParams& params); - // symbol: ?getArmorSlot@ItemStackBase@@QEBA?AW4ArmorSlot@@XZ MCAPI ::ArmorSlot getArmorSlot() const; @@ -288,6 +284,9 @@ class ItemStackBase { // symbol: ?isBlockInstance@ItemStackBase@@QEBA_NAEBVHashedString@@@Z MCAPI bool isBlockInstance(class HashedString const& blockName) const; + // symbol: ?isCoolableItem@ItemStackBase@@QEBA_NXZ + MCAPI bool isCoolableItem() const; + // symbol: ?isDamageableItem@ItemStackBase@@QEBA_NXZ MCAPI bool isDamageableItem() const; diff --git a/src/mc/world/item/LeadItem.h b/src/mc/world/item/LeadItem.h index e355079945..12615f5945 100644 --- a/src/mc/world/item/LeadItem.h +++ b/src/mc/world/item/LeadItem.h @@ -29,7 +29,7 @@ class LeadItem : public ::Item { // vIndex: 0, symbol: __gen_??1LeadItem@@UEAA@XZ virtual ~LeadItem() = default; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@LeadItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/LeavesBlockItem.h b/src/mc/world/item/LeavesBlockItem.h index 1a0dd2bca4..9877fa79bf 100644 --- a/src/mc/world/item/LeavesBlockItem.h +++ b/src/mc/world/item/LeavesBlockItem.h @@ -32,14 +32,14 @@ class LeavesBlockItem : public ::BlockItem { // vIndex: 32, symbol: ?getLevelDataForAuxValue@LeavesBlockItem@@UEBAHH@Z virtual int getLevelDataForAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@LeavesBlockItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 91, symbol: ?fixupCommon@LeavesBlockItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@LeavesBlockItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; - // vIndex: 92, symbol: ?fixupCommon@LeavesBlockItem@@UEBAXAEAVItemStackBase@@AEAVLevel@@@Z + // vIndex: 91, symbol: ?fixupCommon@LeavesBlockItem@@UEBAXAEAVItemStackBase@@AEAVLevel@@@Z virtual void fixupCommon(class ItemStackBase& stack, class Level& level) const; // NOLINTEND diff --git a/src/mc/world/item/LingeringPotionItem.h b/src/mc/world/item/LingeringPotionItem.h index 8055cde52a..817fe523b3 100644 --- a/src/mc/world/item/LingeringPotionItem.h +++ b/src/mc/world/item/LingeringPotionItem.h @@ -49,18 +49,18 @@ class LingeringPotionItem : public ::PotionItem { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@LingeringPotionItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@LingeringPotionItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@LingeringPotionItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@LingeringPotionItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 119, symbol: ?getPotionType@LingeringPotionItem@@UEBA?AW4PotionType@Potion@@XZ + // vIndex: 118, symbol: ?getPotionType@LingeringPotionItem@@UEBA?AW4PotionType@Potion@@XZ virtual ::Potion::PotionType getPotionType() const; // symbol: ??0LingeringPotionItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/LodestoneCompassItem.h b/src/mc/world/item/LodestoneCompassItem.h index 21aa09111d..8affa7f945 100644 --- a/src/mc/world/item/LodestoneCompassItem.h +++ b/src/mc/world/item/LodestoneCompassItem.h @@ -31,11 +31,11 @@ class LodestoneCompassItem : public ::AbstractCompassItem { // vIndex: 0, symbol: __gen_??1LodestoneCompassItem@@UEAA@XZ virtual ~LodestoneCompassItem() = default; - // vIndex: 106, symbol: ?getAnimationFrameFor@LodestoneCompassItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@LodestoneCompassItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob* holder, bool asItemEntity, class ItemStack const* item, bool shouldAnimate) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@LodestoneCompassItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& item, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/MapItem.h b/src/mc/world/item/MapItem.h index 3e4d57c857..7e443088d4 100644 --- a/src/mc/world/item/MapItem.h +++ b/src/mc/world/item/MapItem.h @@ -39,31 +39,31 @@ class MapItem : public ::ComplexItem { bool showCategory ) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@MapItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 87, symbol: ?inventoryTick@MapItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z + // vIndex: 86, symbol: ?inventoryTick@MapItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z virtual bool inventoryTick(class ItemStack& item, class Level& level, class Actor& owner, int slot, bool selected) const; - // vIndex: 88, symbol: ?refreshedInContainer@MapItem@@UEBAXAEBVItemStackBase@@AEAVLevel@@@Z + // vIndex: 87, symbol: ?refreshedInContainer@MapItem@@UEBAXAEBVItemStackBase@@AEAVLevel@@@Z virtual void refreshedInContainer(class ItemStackBase const& stack, class Level& level) const; - // vIndex: 92, symbol: ?fixupCommon@MapItem@@UEBAXAEAVItemStackBase@@AEAVLevel@@@Z + // vIndex: 91, symbol: ?fixupCommon@MapItem@@UEBAXAEAVItemStackBase@@AEAVLevel@@@Z virtual void fixupCommon(class ItemStackBase& stack, class Level& level) const; - // vIndex: 101, symbol: ?hasSameRelevantUserData@MapItem@@UEBA_NAEBVItemStackBase@@0@Z + // vIndex: 100, symbol: ?hasSameRelevantUserData@MapItem@@UEBA_NAEBVItemStackBase@@0@Z virtual bool hasSameRelevantUserData(class ItemStackBase const& stack, class ItemStackBase const& other) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@MapItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@MapItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@MapItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?getUpdatePacket@MapItem@@UEBA?AV?$unique_ptr@VPacket@@U?$default_delete@VPacket@@@std@@@std@@AEBVItemStack@@AEAVLevel@@AEAVActor@@@Z virtual std::unique_ptr getUpdatePacket(class ItemStack const& item, class Level& level, class Actor& player) const; diff --git a/src/mc/world/item/MedicineItem.h b/src/mc/world/item/MedicineItem.h index 45fab1c5cf..519923b855 100644 --- a/src/mc/world/item/MedicineItem.h +++ b/src/mc/world/item/MedicineItem.h @@ -40,15 +40,15 @@ class MedicineItem : public ::ChemistryItem { virtual ::ItemUseMethod useTimeDepleted(class ItemStack& inoutInstance, class Level* level, class Player* player) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@MedicineItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@MedicineItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@MedicineItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@MedicineItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool) const; // symbol: ??0MedicineItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/MinecartItem.h b/src/mc/world/item/MinecartItem.h index 7a7e1dd7de..3a9ca98b2e 100644 --- a/src/mc/world/item/MinecartItem.h +++ b/src/mc/world/item/MinecartItem.h @@ -37,7 +37,7 @@ class MinecartItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@MinecartItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& item, class Actor& entity, class BlockPos pos, uchar, class Vec3 const&) const; diff --git a/src/mc/world/item/PotionItem.h b/src/mc/world/item/PotionItem.h index 916cd52eca..b82274125a 100644 --- a/src/mc/world/item/PotionItem.h +++ b/src/mc/world/item/PotionItem.h @@ -58,27 +58,27 @@ class PotionItem : public ::Item { // vIndex: 73, symbol: ?useTimeDepleted@PotionItem@@UEBA?AW4ItemUseMethod@@AEAVItemStack@@PEAVLevel@@PEAVPlayer@@@Z virtual ::ItemUseMethod useTimeDepleted(class ItemStack& instance, class Level* level, class Player* player) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@PotionItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 83, symbol: + // vIndex: 82, symbol: // ?buildEffectDescriptionName@PotionItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemStackBase@@@Z virtual std::string buildEffectDescriptionName(class ItemStackBase const&) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@PotionItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@PotionItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@PotionItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@PotionItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar, class Vec3 const& clickPos) const; - // vIndex: 119, symbol: ?getPotionType@PotionItem@@UEBA?AW4PotionType@Potion@@XZ + // vIndex: 118, symbol: ?getPotionType@PotionItem@@UEBA?AW4PotionType@Potion@@XZ virtual ::Potion::PotionType getPotionType() const; // symbol: ??0PotionItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/PumpkinBlockItem.h b/src/mc/world/item/PumpkinBlockItem.h index 68fdfa2948..668a9e03c8 100644 --- a/src/mc/world/item/PumpkinBlockItem.h +++ b/src/mc/world/item/PumpkinBlockItem.h @@ -32,10 +32,10 @@ class PumpkinBlockItem : public ::BlockItem { // vIndex: 49, symbol: ?getEnchantSlot@PumpkinBlockItem@@UEBAHXZ virtual int getEnchantSlot() const; - // vIndex: 97, symbol: ?getEquipLocation@PumpkinBlockItem@@UEBA?AW4ActorLocation@@XZ + // vIndex: 96, symbol: ?getEquipLocation@PumpkinBlockItem@@UEBA?AW4ActorLocation@@XZ virtual ::ActorLocation getEquipLocation() const; - // vIndex: 98, symbol: ?getEquipSound@PumpkinBlockItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 97, symbol: ?getEquipSound@PumpkinBlockItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getEquipSound() const; // symbol: ??0PumpkinBlockItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/RangedWeaponItem.h b/src/mc/world/item/RangedWeaponItem.h index 0db692e12d..fdc71e66de 100644 --- a/src/mc/world/item/RangedWeaponItem.h +++ b/src/mc/world/item/RangedWeaponItem.h @@ -41,11 +41,11 @@ class RangedWeaponItem : public ::Item { // vIndex: 76, symbol: ?hurtActor@RangedWeaponItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack& itemInstance, class Actor& actor, class Mob& attacker) const; - // vIndex: 80, symbol: ?mineBlock@RangedWeaponItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@RangedWeaponItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& item, class Block const& block, int x, int y, int z, class Actor* owner) const; - // vIndex: 106, symbol: ?getAnimationFrameFor@RangedWeaponItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@RangedWeaponItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob* holder, bool asItemEntity, class ItemStack const* item, bool shouldAnimate) const; diff --git a/src/mc/world/item/RapidFertilizerItem.h b/src/mc/world/item/RapidFertilizerItem.h index 42bf043490..a53434f4a0 100644 --- a/src/mc/world/item/RapidFertilizerItem.h +++ b/src/mc/world/item/RapidFertilizerItem.h @@ -29,7 +29,7 @@ class RapidFertilizerItem : public ::FertilizerItem { // vIndex: 0, symbol: __gen_??1RapidFertilizerItem@@UEAA@XZ virtual ~RapidFertilizerItem() = default; - // vIndex: 91, symbol: ?fixupCommon@RapidFertilizerItem@@UEBAXAEAVItemStackBase@@@Z + // vIndex: 90, symbol: ?fixupCommon@RapidFertilizerItem@@UEBAXAEAVItemStackBase@@@Z virtual void fixupCommon(class ItemStackBase& stack) const; // NOLINTEND diff --git a/src/mc/world/item/RecordItem.h b/src/mc/world/item/RecordItem.h index 20e2d5c1f7..c79f35d347 100644 --- a/src/mc/world/item/RecordItem.h +++ b/src/mc/world/item/RecordItem.h @@ -34,15 +34,15 @@ class RecordItem : public ::ComponentItem { // ?setDescriptionId@RecordItem@@UEAAAEAV1@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual class RecordItem& setDescriptionId(std::string const&); - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@RecordItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@RecordItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const&, int); - // vIndex: 104, symbol: ?getIconInfo@RecordItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@RecordItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const&, int, bool) const; // symbol: diff --git a/src/mc/world/item/RedStoneDustItem.h b/src/mc/world/item/RedStoneDustItem.h index 3fea9caa80..c159200aba 100644 --- a/src/mc/world/item/RedStoneDustItem.h +++ b/src/mc/world/item/RedStoneDustItem.h @@ -29,12 +29,12 @@ class RedStoneDustItem : public ::Item { // vIndex: 0, symbol: __gen_??1RedStoneDustItem@@UEAA@XZ virtual ~RedStoneDustItem() = default; - // vIndex: 116, symbol: + // vIndex: 115, symbol: // ?_calculatePlacePos@RedStoneDustItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@RedStoneDustItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/SaplingBlockItem.h b/src/mc/world/item/SaplingBlockItem.h index 9f9d506ae0..4a6b26200c 100644 --- a/src/mc/world/item/SaplingBlockItem.h +++ b/src/mc/world/item/SaplingBlockItem.h @@ -32,7 +32,7 @@ class SaplingBlockItem : public ::BlockItem { // vIndex: 32, symbol: ?getLevelDataForAuxValue@SaplingBlockItem@@UEBAHH@Z virtual int getLevelDataForAuxValue(int auxValue) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@SaplingBlockItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; diff --git a/src/mc/world/item/ScaffoldingBlockItem.h b/src/mc/world/item/ScaffoldingBlockItem.h index d18f589b2e..3c5eadefff 100644 --- a/src/mc/world/item/ScaffoldingBlockItem.h +++ b/src/mc/world/item/ScaffoldingBlockItem.h @@ -29,7 +29,7 @@ class ScaffoldingBlockItem : public ::BlockItem { // vIndex: 0, symbol: __gen_??1ScaffoldingBlockItem@@UEAA@XZ virtual ~ScaffoldingBlockItem() = default; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@ScaffoldingBlockItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/SeaPickleBlockItem.h b/src/mc/world/item/SeaPickleBlockItem.h index 6a5f793714..9d4abe9f3a 100644 --- a/src/mc/world/item/SeaPickleBlockItem.h +++ b/src/mc/world/item/SeaPickleBlockItem.h @@ -32,7 +32,7 @@ class SeaPickleBlockItem : public ::BlockItem { // vIndex: 32, symbol: ?getLevelDataForAuxValue@SeaPickleBlockItem@@UEBAHH@Z virtual int getLevelDataForAuxValue(int auxValue) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@SeaPickleBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const&) const; diff --git a/src/mc/world/item/ShearsItem.h b/src/mc/world/item/ShearsItem.h index b08f7a034a..6da7f8a55c 100644 --- a/src/mc/world/item/ShearsItem.h +++ b/src/mc/world/item/ShearsItem.h @@ -45,10 +45,10 @@ class ShearsItem : public ::Item { // vIndex: 76, symbol: ?hurtActor@ShearsItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack&, class Actor&, class Mob&) const; - // vIndex: 80, symbol: ?mineBlock@ShearsItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@ShearsItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& item, class Block const& block, int, int, int, class Actor* owner) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@ShearsItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const&) const; diff --git a/src/mc/world/item/ShieldItem.h b/src/mc/world/item/ShieldItem.h index 29429cfee0..3a0b279f57 100644 --- a/src/mc/world/item/ShieldItem.h +++ b/src/mc/world/item/ShieldItem.h @@ -61,30 +61,30 @@ class ShieldItem : public ::Item { // vIndex: 76, symbol: ?hurtActor@ShieldItem@@UEBAXAEAVItemStack@@AEAVActor@@AEAVMob@@@Z virtual void hurtActor(class ItemStack& item, class Actor& actor, class Mob& attacker) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@ShieldItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 84, symbol: + // vIndex: 83, symbol: // ?readUserData@ShieldItem@@UEBAXAEAVItemStackBase@@AEAVIDataInput@@AEAVReadOnlyBinaryStream@@@Z virtual void readUserData(class ItemStackBase& stack, class IDataInput& input, class ReadOnlyBinaryStream& underlyingStream) const; - // vIndex: 85, symbol: ?writeUserData@ShieldItem@@UEBAXAEBVItemStackBase@@AEAVIDataOutput@@@Z + // vIndex: 84, symbol: ?writeUserData@ShieldItem@@UEBAXAEBVItemStackBase@@AEAVIDataOutput@@@Z virtual void writeUserData(class ItemStackBase const& stack, class IDataOutput& output) const; - // vIndex: 87, symbol: ?inventoryTick@ShieldItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z + // vIndex: 86, symbol: ?inventoryTick@ShieldItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z virtual bool inventoryTick(class ItemStack& item, class Level& level, class Actor& owner, int slot, bool selected) const; - // vIndex: 89, symbol: ?getCooldownType@ShieldItem@@UEBAAEBVHashedString@@XZ + // vIndex: 88, symbol: ?getCooldownType@ShieldItem@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getCooldownType() const; - // vIndex: 90, symbol: ?getCooldownTime@ShieldItem@@UEBAHXZ + // vIndex: 89, symbol: ?getCooldownTime@ShieldItem@@UEBAHXZ virtual int getCooldownTime() const; - // vIndex: 93, symbol: + // vIndex: 92, symbol: // ?getInHandUpdateType@ShieldItem@@UEBA?AW4InHandUpdateType@@AEBVPlayer@@AEBVItemInstance@@1_N2@Z virtual ::InHandUpdateType getInHandUpdateType( class Player const& player, @@ -94,7 +94,7 @@ class ShieldItem : public ::Item { bool slotChanged ) const; - // vIndex: 94, symbol: ?getInHandUpdateType@ShieldItem@@UEBA?AW4InHandUpdateType@@AEBVPlayer@@AEBVItemStack@@1_N2@Z + // vIndex: 93, symbol: ?getInHandUpdateType@ShieldItem@@UEBA?AW4InHandUpdateType@@AEBVPlayer@@AEBVItemStack@@1_N2@Z virtual ::InHandUpdateType getInHandUpdateType( class Player const& player, class ItemStack const& oldItem, @@ -103,7 +103,7 @@ class ShieldItem : public ::Item { bool slotChanged ) const; - // vIndex: 98, symbol: ?getEquipSound@ShieldItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 97, symbol: ?getEquipSound@ShieldItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getEquipSound() const; // symbol: ??0ShieldItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/ShovelItem.h b/src/mc/world/item/ShovelItem.h index 4431058c19..64ad7bbb03 100644 --- a/src/mc/world/item/ShovelItem.h +++ b/src/mc/world/item/ShovelItem.h @@ -40,7 +40,7 @@ class ShovelItem : public ::DiggerItem { // vIndex: 49, symbol: ?getEnchantSlot@ShovelItem@@UEBAHXZ virtual int getEnchantSlot() const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@ShovelItem@@MEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/ShulkerBoxBlockItem.h b/src/mc/world/item/ShulkerBoxBlockItem.h index 94ad62427b..77f1ded2d9 100644 --- a/src/mc/world/item/ShulkerBoxBlockItem.h +++ b/src/mc/world/item/ShulkerBoxBlockItem.h @@ -41,7 +41,7 @@ class ShulkerBoxBlockItem : public ::AuxDataBlockItem { bool showCategory ) const; - // vIndex: 83, symbol: + // vIndex: 82, symbol: // ?buildEffectDescriptionName@ShulkerBoxBlockItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemStackBase@@@Z virtual std::string buildEffectDescriptionName(class ItemStackBase const&) const; diff --git a/src/mc/world/item/SignItem.h b/src/mc/world/item/SignItem.h index 120180a6c5..a997045634 100644 --- a/src/mc/world/item/SignItem.h +++ b/src/mc/world/item/SignItem.h @@ -30,15 +30,15 @@ class SignItem : public ::Item { // vIndex: 0, symbol: ??1SignItem@@UEAA@XZ virtual ~SignItem(); - // vIndex: 116, symbol: ?_calculatePlacePos@SignItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 115, symbol: ?_calculatePlacePos@SignItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase&, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@SignItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const&) const; - // vIndex: 119, symbol: ?getBlockToPlace@SignItem@@UEBAPEBVBlock@@EAEBVActor@@VBlockPos@@@Z + // vIndex: 118, symbol: ?getBlockToPlace@SignItem@@UEBAPEBVBlock@@EAEBVActor@@VBlockPos@@@Z virtual class Block const* getBlockToPlace(uchar face, class Actor const& entity, class BlockPos pos) const; // symbol: diff --git a/src/mc/world/item/SkullItem.h b/src/mc/world/item/SkullItem.h index 15e169ef1c..fb46912523 100644 --- a/src/mc/world/item/SkullItem.h +++ b/src/mc/world/item/SkullItem.h @@ -45,28 +45,28 @@ class SkullItem : public ::Item { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@SkullItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 97, symbol: ?getEquipLocation@SkullItem@@UEBA?AW4ActorLocation@@XZ + // vIndex: 96, symbol: ?getEquipLocation@SkullItem@@UEBA?AW4ActorLocation@@XZ virtual ::ActorLocation getEquipLocation() const; - // vIndex: 98, symbol: ?getEquipSound@SkullItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 97, symbol: ?getEquipSound@SkullItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getEquipSound() const; - // vIndex: 104, symbol: ?getIconInfo@SkullItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@SkullItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 113, symbol: + // vIndex: 112, symbol: // ?getAuxValuesDescription@SkullItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getAuxValuesDescription() const; - // vIndex: 116, symbol: ?_calculatePlacePos@SkullItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 115, symbol: ?_calculatePlacePos@SkullItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@SkullItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/item/SmithingTemplateItem.h b/src/mc/world/item/SmithingTemplateItem.h index bb240bc003..3b4bd476d0 100644 --- a/src/mc/world/item/SmithingTemplateItem.h +++ b/src/mc/world/item/SmithingTemplateItem.h @@ -42,7 +42,7 @@ class SmithingTemplateItem : public ::Item { bool showCategory ) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@SmithingTemplateItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; diff --git a/src/mc/world/item/SnowballItem.h b/src/mc/world/item/SnowballItem.h index 7ce7c25dbe..60500020fb 100644 --- a/src/mc/world/item/SnowballItem.h +++ b/src/mc/world/item/SnowballItem.h @@ -38,15 +38,15 @@ class SnowballItem : public ::ComponentItem { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@SnowballItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@SnowballItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const&, int); - // vIndex: 104, symbol: ?getIconInfo@SnowballItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@SnowballItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const&, int, bool) const; // symbol: diff --git a/src/mc/world/item/SparklerItem.h b/src/mc/world/item/SparklerItem.h index 73fd9ad914..e69999fc8f 100644 --- a/src/mc/world/item/SparklerItem.h +++ b/src/mc/world/item/SparklerItem.h @@ -47,22 +47,22 @@ class SparklerItem : public ::ChemistryStickItem { // vIndex: 36, symbol: ?isHandEquipped@SparklerItem@@UEBA_NXZ virtual bool isHandEquipped() const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@SparklerItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 87, symbol: ?inventoryTick@SparklerItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z + // vIndex: 86, symbol: ?inventoryTick@SparklerItem@@UEBA_NAEAVItemStack@@AEAVLevel@@AEAVActor@@H_N@Z virtual bool inventoryTick(class ItemStack& item, class Level& level, class Actor& owner, int slot, bool selected) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@SparklerItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@SparklerItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@SparklerItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 108, symbol: ?getLightEmission@SparklerItem@@UEBA?AUBrightness@@H@Z + // vIndex: 107, symbol: ?getLightEmission@SparklerItem@@UEBA?AUBrightness@@H@Z virtual struct Brightness getLightEmission(int auxValue) const; // symbol: ??0SparklerItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/SplashPotionItem.h b/src/mc/world/item/SplashPotionItem.h index c608798ae6..18b4fc2116 100644 --- a/src/mc/world/item/SplashPotionItem.h +++ b/src/mc/world/item/SplashPotionItem.h @@ -49,18 +49,18 @@ class SplashPotionItem : public ::PotionItem { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@SplashPotionItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@SplashPotionItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int id); - // vIndex: 104, symbol: ?getIconInfo@SplashPotionItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@SplashPotionItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 119, symbol: ?getPotionType@SplashPotionItem@@UEBA?AW4PotionType@Potion@@XZ + // vIndex: 118, symbol: ?getPotionType@SplashPotionItem@@UEBA?AW4PotionType@Potion@@XZ virtual ::Potion::PotionType getPotionType() const; // symbol: ??0SplashPotionItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/item/TopSnowBlockItem.h b/src/mc/world/item/TopSnowBlockItem.h index 6f7fc526be..af3ba4acbf 100644 --- a/src/mc/world/item/TopSnowBlockItem.h +++ b/src/mc/world/item/TopSnowBlockItem.h @@ -32,7 +32,7 @@ class TopSnowBlockItem : public ::BlockItem { // vIndex: 32, symbol: ?getLevelDataForAuxValue@TopSnowBlockItem@@UEBAHH@Z virtual int getLevelDataForAuxValue(int auxValue) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@TopSnowBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const&) const; diff --git a/src/mc/world/item/VanillaItemNames.h b/src/mc/world/item/VanillaItemNames.h index 57a20bd049..21079747fa 100644 --- a/src/mc/world/item/VanillaItemNames.h +++ b/src/mc/world/item/VanillaItemNames.h @@ -145,6 +145,9 @@ MCAPI extern class HashedString const BlueDye; // symbol: ?BoatLegacy@VanillaItemNames@@3VHashedString@@B MCAPI extern class HashedString const BoatLegacy; +// symbol: ?BoggedSpawnEgg@VanillaItemNames@@3VHashedString@@B +MCAPI extern class HashedString const BoggedSpawnEgg; + // symbol: ?Bone@VanillaItemNames@@3VHashedString@@B MCAPI extern class HashedString const Bone; @@ -1405,6 +1408,9 @@ MCAPI extern class HashedString const WhiteDye; // symbol: ?WildArmorTrimSmithingTemplate@VanillaItemNames@@3VHashedString@@B MCAPI extern class HashedString const WildArmorTrimSmithingTemplate; +// symbol: ?WindCharge@VanillaItemNames@@3VHashedString@@B +MCAPI extern class HashedString const WindCharge; + // symbol: ?WitchSpawnEgg@VanillaItemNames@@3VHashedString@@B MCAPI extern class HashedString const WitchSpawnEgg; diff --git a/src/mc/world/item/VanillaItems.h b/src/mc/world/item/VanillaItems.h index a1700fcd45..19f2ef778a 100644 --- a/src/mc/world/item/VanillaItems.h +++ b/src/mc/world/item/VanillaItems.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace cereal { struct ReflectionCtx; } +// clang-format on + class VanillaItems { public: // prevent constructor by default @@ -14,13 +19,10 @@ class VanillaItems { // symbol: ?registerHardCodedItemTags@VanillaItems@@SAXVItemRegistryRef@@@Z MCAPI static void registerHardCodedItemTags(class ItemRegistryRef); - // symbol: ?registerItems@VanillaItems@@SAXVItemRegistryRef@@AEBVBaseGameVersion@@AEBVExperiments@@_N@Z - MCAPI static void registerItems( - class ItemRegistryRef, - class BaseGameVersion const& baseGameVersion, - class Experiments const&, - bool enableExperimentalGameplay - ); + // symbol: + // ?registerItems@VanillaItems@@SAXAEAUReflectionCtx@cereal@@VItemRegistryRef@@AEBVBaseGameVersion@@AEBVExperiments@@@Z + MCAPI static void + registerItems(struct cereal::ReflectionCtx&, class ItemRegistryRef, class BaseGameVersion const&, class Experiments const&); // symbol: // ?serverInitCreativeItemsCallback@VanillaItems@@SAXVItemRegistryRef@@PEAVActorInfoRegistry@@PEAVBlockDefinitionGroup@@PEAVCreativeItemRegistry@@_NAEBVBaseGameVersion@@AEBVExperiments@@@Z diff --git a/src/mc/world/item/WarpedFungusOnAStickItem.h b/src/mc/world/item/WarpedFungusOnAStickItem.h index 7c5c178ed1..3c283a7252 100644 --- a/src/mc/world/item/WarpedFungusOnAStickItem.h +++ b/src/mc/world/item/WarpedFungusOnAStickItem.h @@ -42,7 +42,7 @@ class WarpedFungusOnAStickItem : public ::ComponentItem { // vIndex: 50, symbol: ?getEnchantValue@WarpedFungusOnAStickItem@@UEBAHXZ virtual int getEnchantValue() const; - // vIndex: 80, symbol: ?mineBlock@WarpedFungusOnAStickItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@WarpedFungusOnAStickItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& item, class Block const& block, int x, int y, int z, class Actor* owner) const; diff --git a/src/mc/world/item/WaterLilyBlockItem.h b/src/mc/world/item/WaterLilyBlockItem.h index 9d46e0854e..26eeb52b88 100644 --- a/src/mc/world/item/WaterLilyBlockItem.h +++ b/src/mc/world/item/WaterLilyBlockItem.h @@ -32,11 +32,11 @@ class WaterLilyBlockItem : public ::BlockItem { // vIndex: 44, symbol: ?isLiquidClipItem@WaterLilyBlockItem@@UEBA_NXZ virtual bool isLiquidClipItem() const; - // vIndex: 116, symbol: + // vIndex: 115, symbol: // ?_calculatePlacePos@WaterLilyBlockItem@@UEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase&, class Actor&, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@WaterLilyBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar, class Vec3 const&) const; diff --git a/src/mc/world/item/WoodSlabBlockItem.h b/src/mc/world/item/WoodSlabBlockItem.h deleted file mode 100644 index 8efc8152d5..0000000000 --- a/src/mc/world/item/WoodSlabBlockItem.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/entity/utilities/ActorLocation.h" -#include "mc/enums/InHandUpdateType.h" -#include "mc/events/LevelSoundEvent.h" -#include "mc/world/item/components/ItemColor.h" -#include "mc/world/item/components/ItemUseMethod.h" -#include "mc/world/level/block/utils/BlockShape.h" -#include "mc/world/level/block/utils/DeprecatedSlabBlockItem.h" - -// auto generated forward declare list -// clang-format off -namespace Json { class Value; } -namespace mce { class Color; } -// clang-format on - -class WoodSlabBlockItem : public ::DeprecatedSlabBlockItem { -public: - // prevent constructor by default - WoodSlabBlockItem& operator=(WoodSlabBlockItem const&); - WoodSlabBlockItem(WoodSlabBlockItem const&); - WoodSlabBlockItem(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1WoodSlabBlockItem@@UEAA@XZ - virtual ~WoodSlabBlockItem() = default; - - // vIndex: 32, symbol: ?getLevelDataForAuxValue@WoodSlabBlockItem@@UEBAHH@Z - virtual int getLevelDataForAuxValue(int auxValue) const; - - // NOLINTEND -}; diff --git a/src/mc/world/item/WoolBlockItem.h b/src/mc/world/item/WoolBlockItem.h index 5d44dd32ce..e6c564d669 100644 --- a/src/mc/world/item/WoolBlockItem.h +++ b/src/mc/world/item/WoolBlockItem.h @@ -29,7 +29,7 @@ class WoolBlockItem : public ::BlockItem { // vIndex: 0, symbol: __gen_??1WoolBlockItem@@UEAA@XZ virtual ~WoolBlockItem() = default; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@WoolBlockItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; diff --git a/src/mc/world/item/WritableBookItem.h b/src/mc/world/item/WritableBookItem.h index c3e4f87cc2..04de07660c 100644 --- a/src/mc/world/item/WritableBookItem.h +++ b/src/mc/world/item/WritableBookItem.h @@ -35,7 +35,7 @@ class WritableBookItem : public ::Item { // vIndex: 71, symbol: ?use@WritableBookItem@@UEBAAEAVItemStack@@AEAV2@AEAVPlayer@@@Z virtual class ItemStack& use(class ItemStack& instance, class Player& player) const; - // vIndex: 105, symbol: + // vIndex: 104, symbol: // ?getInteractText@WritableBookItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPlayer@@@Z virtual std::string getInteractText(class Player const&) const; diff --git a/src/mc/world/item/WrittenBookItem.h b/src/mc/world/item/WrittenBookItem.h index 42a17480c5..88f1bfd206 100644 --- a/src/mc/world/item/WrittenBookItem.h +++ b/src/mc/world/item/WrittenBookItem.h @@ -47,11 +47,11 @@ class WrittenBookItem : public ::Item { // vIndex: 71, symbol: ?use@WrittenBookItem@@UEBAAEAVItemStack@@AEAV2@AEAVPlayer@@@Z virtual class ItemStack& use(class ItemStack& instance, class Player& player) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@WrittenBookItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 105, symbol: + // vIndex: 104, symbol: // ?getInteractText@WrittenBookItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPlayer@@@Z virtual std::string getInteractText(class Player const&) const; diff --git a/src/mc/world/item/components/CerealItemComponentFactory.h b/src/mc/world/item/components/CerealItemComponentFactory.h index 6d39546e72..52046a5064 100644 --- a/src/mc/world/item/components/CerealItemComponentFactory.h +++ b/src/mc/world/item/components/CerealItemComponentFactory.h @@ -2,6 +2,9 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/enums/AllExperiments.h" + // auto generated forward declare list // clang-format off namespace Json { class Value; } @@ -12,30 +15,30 @@ class CerealItemComponentFactory { public: // CerealItemComponentFactory inner types declare // clang-format off - struct Constructor; + struct ComponentMetadata; // clang-format on // CerealItemComponentFactory inner types define - struct Constructor { + struct ComponentMetadata { public: // prevent constructor by default - Constructor(); + ComponentMetadata(); public: // NOLINTBEGIN - // symbol: ??0Constructor@CerealItemComponentFactory@@QEAA@AEBU01@@Z - MCAPI Constructor(struct CerealItemComponentFactory::Constructor const&); + // symbol: ??0ComponentMetadata@CerealItemComponentFactory@@QEAA@AEBU01@@Z + MCAPI ComponentMetadata(struct CerealItemComponentFactory::ComponentMetadata const&); - // symbol: ??4Constructor@CerealItemComponentFactory@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct CerealItemComponentFactory::Constructor& - operator=(struct CerealItemComponentFactory::Constructor&&); + // symbol: ??4ComponentMetadata@CerealItemComponentFactory@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct CerealItemComponentFactory::ComponentMetadata& + operator=(struct CerealItemComponentFactory::ComponentMetadata&&); - // symbol: ??4Constructor@CerealItemComponentFactory@@QEAAAEAU01@AEBU01@@Z - MCAPI struct CerealItemComponentFactory::Constructor& - operator=(struct CerealItemComponentFactory::Constructor const&); + // symbol: ??4ComponentMetadata@CerealItemComponentFactory@@QEAAAEAU01@AEBU01@@Z + MCAPI struct CerealItemComponentFactory::ComponentMetadata& + operator=(struct CerealItemComponentFactory::ComponentMetadata const&); - // symbol: ??1Constructor@CerealItemComponentFactory@@QEAA@XZ - MCAPI ~Constructor(); + // symbol: ??1ComponentMetadata@CerealItemComponentFactory@@QEAA@XZ + MCAPI ~ComponentMetadata(); // NOLINTEND }; @@ -49,59 +52,61 @@ class CerealItemComponentFactory { public: // NOLINTBEGIN // symbol: - // ?addAllComponentUpgrades@CerealItemComponentFactory@@SAXAEAVCerealDocumentUpgrader@@AEAUReflectionCtx@cereal@@@Z - MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader&, struct cereal::ReflectionCtx&); + // ?addAllComponentUpgrades@CerealItemComponentFactory@@SAXAEAVCerealDocumentUpgrader@@AEBUReflectionCtx@cereal@@@Z + MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader&, struct cereal::ReflectionCtx const&); // symbol: - // ?constructItemComponent@CerealItemComponentFactory@@SA?AV?$shared_ptr@VItemComponent@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEAUReflectionCtx@cereal@@@Z + // ?constructItemComponent@CerealItemComponentFactory@@SA?AV?$shared_ptr@VItemComponent@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBUReflectionCtx@cereal@@@Z MCAPI static std::shared_ptr - constructItemComponent(std::string const&, struct cereal::ReflectionCtx&); + constructItemComponent(std::string const&, struct cereal::ReflectionCtx const&); // symbol: - // ?deprecateComponentStartingFromVersion@CerealItemComponentFactory@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@VSemVersion@@AEAUReflectionCtx@cereal@@@Z + // ?deprecateComponentStartingFromVersion@CerealItemComponentFactory@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@VSemVersion@@AEBUReflectionCtx@cereal@@@Z MCAPI static void - deprecateComponentStartingFromVersion(std::string const&, class SemVersion, struct cereal::ReflectionCtx&); + deprecateComponentStartingFromVersion(std::string const&, class SemVersion, struct cereal::ReflectionCtx const&); // symbol: - // ?getReleasedMinFormatVersionForAnyComponent@CerealItemComponentFactory@@SA?AV?$optional@VSemVersion@@@std@@AEAUReflectionCtx@cereal@@@Z + // ?getReleasedMinFormatVersionForAnyComponent@CerealItemComponentFactory@@SA?AV?$optional@VSemVersion@@@std@@AEBUReflectionCtx@cereal@@@Z MCAPI static std::optional - getReleasedMinFormatVersionForAnyComponent(struct cereal::ReflectionCtx&); + getReleasedMinFormatVersionForAnyComponent(struct cereal::ReflectionCtx const&); // symbol: - // ?isComponentBasedItemSchema@CerealItemComponentFactory@@SA_NAEBVSemVersion@@AEBVValue@Json@@AEAUReflectionCtx@cereal@@@Z + // ?isComponentBasedItemSchema@CerealItemComponentFactory@@SA_NAEBVSemVersion@@AEBVValue@Json@@AEBUReflectionCtx@cereal@@@Z MCAPI static bool - isComponentBasedItemSchema(class SemVersion const&, class Json::Value const&, struct cereal::ReflectionCtx&); + isComponentBasedItemSchema(class SemVersion const&, class Json::Value const&, struct cereal::ReflectionCtx const&); // symbol: - // ?isRegisteredComponent@CerealItemComponentFactory@@SA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI static bool isRegisteredComponent(std::string const&, struct cereal::ReflectionCtx&); + // ?validateCerealComponent@CerealItemComponentFactory@@SA_NV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVSemVersion@@_NAEBVExperiments@@AEBUReflectionCtx@cereal@@@Z + MCAPI static bool + validateCerealComponent(std::string, class SemVersion const&, bool, class Experiments const&, struct cereal::ReflectionCtx const&); // NOLINTEND // private: // NOLINTBEGIN - // symbol: ?getEnTTMetaType@CerealItemComponentFactory@@CA?AVmeta_type@entt@@AEAUReflectionCtx@cereal@@@Z - MCAPI static entt::meta_type getEnTTMetaType(struct cereal::ReflectionCtx&); - // symbol: - // ?getPropDeprecatedComponents@CerealItemComponentFactory@@CAAEAV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@VSemVersion@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@VSemVersion@@@std@@@2@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI static std::unordered_map& - getPropDeprecatedComponents(struct cereal::ReflectionCtx&); + // ?getComponentMissingToggles@CerealItemComponentFactory@@CA?AV?$vector@W4AllExperiments@@V?$allocator@W4AllExperiments@@@std@@@std@@AEBUComponentMetadata@1@AEBVExperiments@@@Z + MCAPI static std::vector<::AllExperiments> + getComponentMissingToggles(struct CerealItemComponentFactory::ComponentMetadata const&, class Experiments const&); // symbol: - // ?getPropRegisteredComponents@CerealItemComponentFactory@@CAAEAV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UConstructor@CerealItemComponentFactory@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UConstructor@CerealItemComponentFactory@@@std@@@2@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI static std::unordered_map& - getPropRegisteredComponents(struct cereal::ReflectionCtx&); + // ?getPropRegisteredComponents@CerealItemComponentFactory@@CA?AV?$optional@V?$reference_wrapper@V?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UComponentMetadata@CerealItemComponentFactory@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UComponentMetadata@CerealItemComponentFactory@@@std@@@2@@std@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI static std::optional< + std::reference_wrapper>> + getPropRegisteredComponents(struct cereal::ReflectionCtx const&); // symbol: - // ?getPropReleasedMinFormatVersionForAnyComponent@CerealItemComponentFactory@@CAAEAV?$optional@VSemVersion@@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI static std::optional& - getPropReleasedMinFormatVersionForAnyComponent(struct cereal::ReflectionCtx&); + // ?getPropReleasedMinFormatVersionForAnyComponent@CerealItemComponentFactory@@CA?AV?$optional@V?$reference_wrapper@VSemVersion@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI static std::optional> + getPropReleasedMinFormatVersionForAnyComponent(struct cereal::ReflectionCtx const&); + + // symbol: ?initEnTTMetaType@CerealItemComponentFactory@@CAXAEAUReflectionCtx@cereal@@@Z + MCAPI static void initEnTTMetaType(struct cereal::ReflectionCtx&); // symbol: - // ?updateReleasedMinFormatVersionForAnyComponentIfLower@CerealItemComponentFactory@@CAXVSemVersion@@AEAUReflectionCtx@cereal@@@Z + // ?updateReleasedMinFormatVersionForAnyComponentIfLower@CerealItemComponentFactory@@CAXVSemVersion@@AEBUReflectionCtx@cereal@@@Z MCAPI static void - updateReleasedMinFormatVersionForAnyComponentIfLower(class SemVersion, struct cereal::ReflectionCtx&); + updateReleasedMinFormatVersionForAnyComponentIfLower(class SemVersion, struct cereal::ReflectionCtx const&); // NOLINTEND }; diff --git a/src/mc/world/item/components/ComponentItem.h b/src/mc/world/item/components/ComponentItem.h index 52d83de4b2..eec9fe9f39 100644 --- a/src/mc/world/item/components/ComponentItem.h +++ b/src/mc/world/item/components/ComponentItem.h @@ -202,111 +202,99 @@ class ComponentItem : public ::Item { hitBlock(class ItemStack& item, class Block const& block, class BlockPos const& blockPos, class Mob& attacker) const; - // vIndex: 79, symbol: ?mineBlock@ComponentItem@@UEBA_NAEAVItemInstance@@AEBVBlock@@HHHPEAVActor@@@Z - virtual bool - mineBlock(class ItemInstance& instance, class Block const& block, int x, int y, int z, class Actor* owner) const; - - // vIndex: 80, symbol: ?mineBlock@ComponentItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z + // vIndex: 79, symbol: ?mineBlock@ComponentItem@@UEBA_NAEAVItemStack@@AEBVBlock@@HHHPEAVActor@@@Z virtual bool mineBlock(class ItemStack& instance, class Block const& block, int x, int y, int z, class Actor* owner) const; - // vIndex: 81, symbol: + // vIndex: 80, symbol: // ?buildDescriptionName@ComponentItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemStackBase@@@Z virtual std::string buildDescriptionName(class ItemStackBase const&) const; - // vIndex: 82, symbol: + // vIndex: 81, symbol: // ?buildDescriptionId@ComponentItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemDescriptor@@PEBVCompoundTag@@@Z virtual std::string buildDescriptionId(class ItemDescriptor const&, class CompoundTag const*) const; - // vIndex: 83, symbol: + // vIndex: 82, symbol: // ?buildEffectDescriptionName@ComponentItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVItemStackBase@@@Z virtual std::string buildEffectDescriptionName(class ItemStackBase const&) const; - // vIndex: 86, symbol: ?getMaxStackSize@ComponentItem@@UEBAEAEBVItemDescriptor@@@Z + // vIndex: 85, symbol: ?getMaxStackSize@ComponentItem@@UEBAEAEBVItemDescriptor@@@Z virtual uchar getMaxStackSize(class ItemDescriptor const&) const; - // vIndex: 89, symbol: ?getCooldownType@ComponentItem@@UEBAAEBVHashedString@@XZ + // vIndex: 88, symbol: ?getCooldownType@ComponentItem@@UEBAAEBVHashedString@@XZ virtual class HashedString const& getCooldownType() const; - // vIndex: 90, symbol: ?getCooldownTime@ComponentItem@@UEBAHXZ + // vIndex: 89, symbol: ?getCooldownTime@ComponentItem@@UEBAHXZ virtual int getCooldownTime() const; - // vIndex: 97, symbol: ?getEquipLocation@ComponentItem@@UEBA?AW4ActorLocation@@XZ + // vIndex: 96, symbol: ?getEquipLocation@ComponentItem@@UEBA?AW4ActorLocation@@XZ virtual ::ActorLocation getEquipLocation() const; - // vIndex: 98, symbol: ?getEquipSound@ComponentItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ + // vIndex: 97, symbol: ?getEquipSound@ComponentItem@@UEBA?AW4LevelSoundEvent@Legacy@Puv@@XZ virtual ::Puv::Legacy::LevelSoundEvent getEquipSound() const; - // vIndex: 102, symbol: ?initClient@ComponentItem@@UEAAXAEAVValue@Json@@AEBVSemVersion@@_NAEBVExperiments@@@Z + // vIndex: 101, symbol: ?initClient@ComponentItem@@UEAAXAEAVValue@Json@@AEBVSemVersion@@_NAEBVExperiments@@@Z virtual void initClient(class Json::Value&, class SemVersion const&, bool, class Experiments const&); - // vIndex: 103, symbol: + // vIndex: 102, symbol: // ?setIconInfo@ComponentItem@@UEAAAEAVItem@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z virtual class Item& setIconInfo(std::string const& name, int frame); - // vIndex: 104, symbol: ?getIconInfo@ComponentItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z + // vIndex: 103, symbol: ?getIconInfo@ComponentItem@@UEBA?AUResolvedItemIconInfo@@AEBVItemStackBase@@H_N@Z virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const& item, int, bool inInventoryPane) const; - // vIndex: 105, symbol: + // vIndex: 104, symbol: // ?getInteractText@ComponentItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVPlayer@@@Z virtual std::string getInteractText(class Player const&) const; - // vIndex: 106, symbol: ?getAnimationFrameFor@ComponentItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z + // vIndex: 105, symbol: ?getAnimationFrameFor@ComponentItem@@UEBAHPEAVMob@@_NPEBVItemStack@@_N@Z virtual int getAnimationFrameFor(class Mob*, bool, class ItemStack const*, bool) const; - // vIndex: 107, symbol: ?isEmissive@ComponentItem@@UEBA_NH@Z + // vIndex: 106, symbol: ?isEmissive@ComponentItem@@UEBA_NH@Z virtual bool isEmissive(int) const; - // vIndex: 110, symbol: ?canBeCharged@ComponentItem@@UEBA_NXZ + // vIndex: 109, symbol: ?canBeCharged@ComponentItem@@UEBA_NXZ virtual bool canBeCharged() const; - // vIndex: 113, symbol: + // vIndex: 112, symbol: // ?getAuxValuesDescription@ComponentItem@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ virtual std::string getAuxValuesDescription() const; - // vIndex: 115, symbol: + // vIndex: 114, symbol: // ?_checkUseOnPermissions@ComponentItem@@EEBA_NAEAVActor@@AEAVItemStackBase@@AEBEAEBVBlockPos@@@Z virtual bool _checkUseOnPermissions(class Actor& entity, class ItemStackBase& item, uchar const& face, class BlockPos const& pos) const; - // vIndex: 116, symbol: ?_calculatePlacePos@ComponentItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 115, symbol: ?_calculatePlacePos@ComponentItem@@EEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - // vIndex: 117, symbol: ?_shouldAutoCalculatePlacePos@ComponentItem@@EEBA_NXZ + // vIndex: 116, symbol: ?_shouldAutoCalculatePlacePos@ComponentItem@@EEBA_NXZ virtual bool _shouldAutoCalculatePlacePos() const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@ComponentItem@@EEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) const; - // vIndex: 119, symbol: ?useVariant@ComponentItem@@UEBA_NHH_N@Z + // vIndex: 118, symbol: ?useVariant@ComponentItem@@UEBA_NHH_N@Z virtual bool useVariant(int, int, bool) const; - // vIndex: 120, symbol: ?getVariant@ComponentItem@@UEBAHHH_N@Z + // vIndex: 119, symbol: ?getVariant@ComponentItem@@UEBAHHH_N@Z virtual int getVariant(int, int, bool) const; - // vIndex: 121, symbol: ?shouldUseJsonForRenderMatrix@ComponentItem@@UEBA_NXZ + // vIndex: 120, symbol: ?shouldUseJsonForRenderMatrix@ComponentItem@@UEBA_NXZ virtual bool shouldUseJsonForRenderMatrix() const; // symbol: - // ??0ComponentItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@FAEAUReflectionCtx@cereal@@@Z - MCAPI ComponentItem(std::string const&, short, struct cereal::ReflectionCtx&); - - // symbol: ?_addCerealItemsToMap@ComponentItem@@QEAAXXZ - MCAPI void _addCerealItemsToMap(); - - // symbol: - // ?_validateSchemaAndInitItem@ComponentItem@@QEAA_NAEAVValue@Json@@AEBVSemVersion@@_N2AEBVExperiments@@AEAUReflectionCtx@cereal@@@Z - MCAPI bool - _validateSchemaAndInitItem(class Json::Value&, class SemVersion const&, bool, bool, class Experiments const&, struct cereal::ReflectionCtx&); + // ??0ComponentItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@FAEBUReflectionCtx@cereal@@@Z + MCAPI ComponentItem(std::string const&, short, struct cereal::ReflectionCtx const&); // symbol: - // ?buildNetworkTag@ComponentItem@@QEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI std::unique_ptr buildNetworkTag(struct cereal::ReflectionCtx&) const; + // ?buildNetworkTag@ComponentItem@@QEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI std::unique_ptr buildNetworkTag(struct cereal::ReflectionCtx const&) const; // symbol: ?checkComponentDataForContentErrors@ComponentItem@@QEBA_NXZ MCAPI bool checkComponentDataForContentErrors() const; @@ -348,16 +336,16 @@ class ComponentItem : public ::Item { // symbol: ?setCanDestroyInCreative@ComponentItem@@QEAAX_N@Z MCAPI void setCanDestroyInCreative(bool); - // symbol: ?initializeJsonUpgrades@ComponentItem@@SAXAEAUReflectionCtx@cereal@@@Z - MCAPI static void initializeJsonUpgrades(struct cereal::ReflectionCtx&); + // symbol: ?initializeJsonUpgrades@ComponentItem@@SAXAEBUReflectionCtx@cereal@@@Z + MCAPI static void initializeJsonUpgrades(struct cereal::ReflectionCtx const&); // symbol: ?registerItemComponentTypes@ComponentItem@@SAXAEAUReflectionCtx@cereal@@@Z MCAPI static void registerItemComponentTypes(struct cereal::ReflectionCtx&); // symbol: - // ?upgradeJson@ComponentItem@@SA?AU?$pair@_NVSemVersion@@@std@@AEAUReflectionCtx@cereal@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBVPath@Core@@V?$optional@VSemVersion@@@3@@Z + // ?upgradeJson@ComponentItem@@SA?AU?$pair@_NVSemVersion@@@std@@AEBUReflectionCtx@cereal@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBVPath@Core@@V?$optional@VSemVersion@@@3@@Z MCAPI static std::pair - upgradeJson(struct cereal::ReflectionCtx&, std::string&, class Core::Path const&, std::optional); + upgradeJson(struct cereal::ReflectionCtx const&, std::string&, class Core::Path const&, std::optional); // NOLINTEND @@ -370,29 +358,37 @@ class ComponentItem : public ::Item { // private: // NOLINTBEGIN + // symbol: ?_addCerealItemsToMap@ComponentItem@@AEAAXXZ + MCAPI void _addCerealItemsToMap(); + // symbol: - // ?_buildItemPropertiesNetworkTag@ComponentItem@@AEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI std::unique_ptr _buildItemPropertiesNetworkTag(struct cereal::ReflectionCtx&) const; + // ?_buildItemPropertiesNetworkTag@ComponentItem@@AEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI std::unique_ptr _buildItemPropertiesNetworkTag(struct cereal::ReflectionCtx const&) const; // symbol: - // ?_loadComponentsFromNetworkTag@ComponentItem@@AEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVCompoundTag@@AEAUReflectionCtx@cereal@@@Z + // ?_loadComponentsFromNetworkTag@ComponentItem@@AEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVCompoundTag@@AEBUReflectionCtx@cereal@@@Z MCAPI void - _loadComponentsFromNetworkTag(std::string const&, class CompoundTag const&, struct cereal::ReflectionCtx&); + _loadComponentsFromNetworkTag(std::string const&, class CompoundTag const&, struct cereal::ReflectionCtx const&); - // symbol: ?_loadItemPropertiesNetworkTag@ComponentItem@@AEAAXAEBVCompoundTag@@AEAUReflectionCtx@cereal@@@Z - MCAPI void _loadItemPropertiesNetworkTag(class CompoundTag const&, struct cereal::ReflectionCtx&); + // symbol: ?_loadItemPropertiesNetworkTag@ComponentItem@@AEAAXAEBVCompoundTag@@AEBUReflectionCtx@cereal@@@Z + MCAPI void _loadItemPropertiesNetworkTag(class CompoundTag const&, struct cereal::ReflectionCtx const&); // symbol: ?_loadItemTagsNetworkTag@ComponentItem@@AEAAXAEBVListTag@@@Z MCAPI void _loadItemTagsNetworkTag(class ListTag const& listTag); + // symbol: + // ?_validateSchemaAndInitItem@ComponentItem@@AEAA_NAEAVValue@Json@@AEBVSemVersion@@_N2AEBVExperiments@@AEBUReflectionCtx@cereal@@@Z + MCAPI bool + _validateSchemaAndInitItem(class Json::Value&, class SemVersion const&, bool, bool, class Experiments const&, struct cereal::ReflectionCtx const&); + // symbol: ?_moveDataToComponentItem@ComponentItem@@CAXAEAV1@AEAUComponentItemData_Legacy@@@Z MCAPI static void _moveDataToComponentItem(class ComponentItem&, struct ComponentItemData_Legacy&); - // symbol: ?getEnTTMetaType@ComponentItem@@CA?AVmeta_type@entt@@AEAUReflectionCtx@cereal@@@Z - MCAPI static entt::meta_type getEnTTMetaType(struct cereal::ReflectionCtx&); + // symbol: ?getPropCerealDocumentUpgrader@ComponentItem@@CAAEAVCerealDocumentUpgrader@@AEBUReflectionCtx@cereal@@@Z + MCAPI static class CerealDocumentUpgrader& getPropCerealDocumentUpgrader(struct cereal::ReflectionCtx const&); - // symbol: ?getPropCerealDocumentUpgrader@ComponentItem@@CAAEAVCerealDocumentUpgrader@@AEAUReflectionCtx@cereal@@@Z - MCAPI static class CerealDocumentUpgrader& getPropCerealDocumentUpgrader(struct cereal::ReflectionCtx&); + // symbol: ?initEnTTMetaType@ComponentItem@@CAXAEAUReflectionCtx@cereal@@@Z + MCAPI static void initEnTTMetaType(struct cereal::ReflectionCtx&); // NOLINTEND }; diff --git a/src/mc/world/item/components/ComponentItemDataLoader.h b/src/mc/world/item/components/ComponentItemDataLoader.h index 1199f666db..c707357e90 100644 --- a/src/mc/world/item/components/ComponentItemDataLoader.h +++ b/src/mc/world/item/components/ComponentItemDataLoader.h @@ -21,9 +21,9 @@ class ComponentItemDataLoader { public: // NOLINTBEGIN // symbol: - // ??0ComponentItemDataLoader@@QEAA@VSemVersion@@_N1AEBVExperiments@@AEAUReflectionCtx@cereal@@V?$function@$$A6AXAEAV?$LoadResult@UComponentItemDataAll_Latest@@@Puv@@@Z@std@@@Z + // ??0ComponentItemDataLoader@@QEAA@VSemVersion@@_N1AEBVExperiments@@AEBUReflectionCtx@cereal@@V?$function@$$A6AXAEAV?$LoadResult@UComponentItemDataAll_Latest@@@Puv@@@Z@std@@@Z MCAPI - ComponentItemDataLoader(class SemVersion, bool, bool, class Experiments const&, struct cereal::ReflectionCtx&, std::function&)>); + ComponentItemDataLoader(class SemVersion, bool, bool, class Experiments const&, struct cereal::ReflectionCtx const&, std::function&)>); // symbol: ?load@ComponentItemDataLoader@@QEBA?AV?$LoadResult@UComponentItemDataAll_Latest@@@Puv@@AEBVValue@Json@@@Z MCAPI class Puv::LoadResult load(class Json::Value const&) const; diff --git a/src/mc/world/item/components/ComponentItemData_v1_19_83.h b/src/mc/world/item/components/ComponentItemData_v1_19_83.h index c502327231..b25b4b6293 100644 --- a/src/mc/world/item/components/ComponentItemData_v1_19_83.h +++ b/src/mc/world/item/components/ComponentItemData_v1_19_83.h @@ -2,6 +2,11 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace cereal { struct ReflectionCtx; } +// clang-format on + struct ComponentItemData_v1_19_83 { public: // prevent constructor by default @@ -14,6 +19,9 @@ struct ComponentItemData_v1_19_83 { // symbol: ??1ComponentItemData_v1_19_83@@QEAA@XZ MCAPI ~ComponentItemData_v1_19_83(); + // symbol: ?bindType@ComponentItemData_v1_19_83@@SAXAEAUReflectionCtx@cereal@@@Z + MCAPI static void bindType(struct cereal::ReflectionCtx&); + // symbol: ?FIRST_VERSION@ComponentItemData_v1_19_83@@2VSemVersion@@B MCAPI static class SemVersion const FIRST_VERSION; diff --git a/src/mc/world/item/components/DyeableComponent.h b/src/mc/world/item/components/DyeableComponent.h index c489cb6390..14d778ebf9 100644 --- a/src/mc/world/item/components/DyeableComponent.h +++ b/src/mc/world/item/components/DyeableComponent.h @@ -4,6 +4,7 @@ // auto generated forward declare list // clang-format off +namespace cereal { struct ReflectionCtx; } namespace mce { class Color; } // clang-format on @@ -19,6 +20,38 @@ class DyeableComponent { // vIndex: 0, symbol: __gen_??1DyeableComponent@@UEAA@XZ virtual ~DyeableComponent() = default; + // vIndex: 1, symbol: ?checkComponentDataForContentErrors@ShooterItemComponent@@UEBA_NXZ + virtual bool checkComponentDataForContentErrors() const; + + // vIndex: 2, symbol: ?writeSettings@ItemComponent@@UEAAXXZ + virtual void writeSettings(); + + // vIndex: 3, symbol: ?isNetworkComponent@ItemComponent@@UEBA_NXZ + virtual bool isNetworkComponent() const; + + // vIndex: 4, symbol: + // ?buildNetworkTag@?$NetworkedItemComponent@VAllowOffHandItemComponent@@@@UEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z + virtual std::unique_ptr buildNetworkTag(struct cereal::ReflectionCtx const&) const; + + // vIndex: 5, symbol: + // ?initializeFromNetwork@?$NetworkedItemComponent@VAllowOffHandItemComponent@@@@UEAA_NAEBVCompoundTag@@AEBUReflectionCtx@cereal@@@Z + virtual bool initializeFromNetwork(class CompoundTag const&, struct cereal::ReflectionCtx const&); + + // vIndex: 6, symbol: ?handleVersionBasedInitialization@EntityPlacerItemComponent@@UEAAXAEBVSemVersion@@@Z + virtual void handleVersionBasedInitialization(class SemVersion const&); + + // vIndex: 7, symbol: ?_canUseOn@PlanterItemComponent@@MEBA_NAEBVItemStack@@AEAVActor@@AEBVBlockPos@@E@Z + virtual bool + _canUseOn(class ItemStack const& instance, class Actor& entity, class BlockPos const& pos, uchar face) const; + + // vIndex: 8, symbol: ?_useOn@EntityPlacerItemComponent@@MEBA_NAEAVItemStack@@AEAVActor@@AEBVBlockPos@@EAEBVVec3@@@Z + virtual bool + _useOn(class ItemStack& instance, class Actor&, class BlockPos const& pos, uchar face, class Vec3 const& clickPos) + const; + + // vIndex: 9, symbol: ?_initializeComponent@AllowOffHandItemComponent@@UEAAXXZ + virtual void _initializeComponent(); + // symbol: // ?appendFormattedHovertext@DyeableComponent@@QEBAXAEBVItemStackBase@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@Z MCAPI void appendFormattedHovertext(class ItemStackBase const& item, std::string& hovertext, bool) const; diff --git a/src/mc/world/item/registry/ItemRegistry.h b/src/mc/world/item/registry/ItemRegistry.h index 120ad8c98f..daa7e1f02e 100644 --- a/src/mc/world/item/registry/ItemRegistry.h +++ b/src/mc/world/item/registry/ItemRegistry.h @@ -125,9 +125,10 @@ class ItemRegistry { // symbol: ?getRef@ItemRegistry@@AEAA?AVItemRegistryRef@@XZ MCAPI class ItemRegistryRef getRef(); - // symbol: ?init@ItemRegistry@@AEAAXAEBVExperiments@@AEBVBaseGameVersion@@PEAVResourcePackManager@@@Z + // symbol: + // ?init@ItemRegistry@@AEAAXAEAUReflectionCtx@cereal@@AEBVExperiments@@AEBVBaseGameVersion@@PEAVResourcePackManager@@@Z MCAPI void - init(class Experiments const&, class BaseGameVersion const& baseGameVersion, class ResourcePackManager* rpm); + init(struct cereal::ReflectionCtx&, class Experiments const&, class BaseGameVersion const&, class ResourcePackManager*); // symbol: // ?initCreativeItemsServer@ItemRegistry@@AEAAXPEAVActorInfoRegistry@@PEAVBlockDefinitionGroup@@_NAEBVExperiments@@V?$function@$$A6AXVItemRegistryRef@@PEAVActorInfoRegistry@@PEAVBlockDefinitionGroup@@PEAVCreativeItemRegistry@@_NAEBVBaseGameVersion@@AEBVExperiments@@@Z@std@@@Z diff --git a/src/mc/world/item/registry/ItemRegistryRef.h b/src/mc/world/item/registry/ItemRegistryRef.h index ff63a20c09..2f3a0fe1a3 100644 --- a/src/mc/world/item/registry/ItemRegistryRef.h +++ b/src/mc/world/item/registry/ItemRegistryRef.h @@ -8,6 +8,7 @@ // auto generated forward declare list // clang-format off namespace Bedrock::Threading { class Mutex; } +namespace cereal { struct ReflectionCtx; } // clang-format on class ItemRegistryRef { @@ -97,9 +98,11 @@ class ItemRegistryRef { // symbol: ?getWorldBaseGameVersion@ItemRegistryRef@@QEBA?AVBaseGameVersion@@XZ MCAPI class BaseGameVersion getWorldBaseGameVersion() const; - // symbol: ?init@ItemRegistryRef@@QEBAXAEBVExperiments@@AEBVBaseGameVersion@@PEAVResourcePackManager@@@Z + // symbol: + // ?init@ItemRegistryRef@@QEBAXAEAUReflectionCtx@cereal@@AEBVExperiments@@AEBVBaseGameVersion@@PEAVResourcePackManager@@@Z MCAPI void - init(class Experiments const&, class BaseGameVersion const& baseGameVersion, class ResourcePackManager* rpm) const; + init(struct cereal::ReflectionCtx&, class Experiments const&, class BaseGameVersion const&, class ResourcePackManager*) + const; // symbol: // ?initCreativeItemsServer@ItemRegistryRef@@QEBAXPEAVActorInfoRegistry@@PEAVBlockDefinitionGroup@@_NAEBVExperiments@@V?$function@$$A6AXVItemRegistryRef@@PEAVActorInfoRegistry@@PEAVBlockDefinitionGroup@@PEAVCreativeItemRegistry@@_NAEBVBaseGameVersion@@AEBVExperiments@@@Z@std@@@Z @@ -185,9 +188,6 @@ class ItemRegistryRef { // symbol: ?setCheckForItemWorldCompatibility@ItemRegistryRef@@QEBAX_N@Z MCAPI void setCheckForItemWorldCompatibility(bool value) const; - // symbol: ?setOwningThreadId@ItemRegistryRef@@QEBAXVid@thread@std@@@Z - MCAPI void setOwningThreadId(std::thread::id threadId) const; - // symbol: ?setServerInitializingCreativeItems@ItemRegistryRef@@QEBAX_N@Z MCAPI void setServerInitializingCreativeItems(bool value) const; @@ -208,12 +208,6 @@ class ItemRegistryRef { // symbol: ??1ItemRegistryRef@@QEAA@XZ MCAPI ~ItemRegistryRef(); - // symbol: ?isUsingCombinedItemRegistry@ItemRegistryRef@@SA_NXZ - MCAPI static bool isUsingCombinedItemRegistry(); - - // symbol: ?setUseCombinedItemRegistryToggle@ItemRegistryRef@@SAX_N@Z - MCAPI static void setUseCombinedItemRegistryToggle(bool); - // NOLINTEND // private: @@ -221,19 +215,5 @@ class ItemRegistryRef { // symbol: ?_lockRegistry@ItemRegistryRef@@AEBA?AV?$shared_ptr@VItemRegistry@@@std@@XZ MCAPI std::shared_ptr _lockRegistry() const; - // NOLINTEND - -private: - // NOLINTBEGIN - // symbol: ?mCombinedItemRegistryInstance@ItemRegistryRef@@0V?$shared_ptr@VItemRegistry@@@std@@A - MCAPI static std::shared_ptr mCombinedItemRegistryInstance; - - // NOLINTEND - - // member accessor -public: - // NOLINTBEGIN - static auto& $mCombinedItemRegistryInstance() { return mCombinedItemRegistryInstance; } - // NOLINTEND }; diff --git a/src/mc/world/level/BlockSource.h b/src/mc/world/level/BlockSource.h index 988b1c8c7b..914b07f2b8 100644 --- a/src/mc/world/level/BlockSource.h +++ b/src/mc/world/level/BlockSource.h @@ -17,6 +17,11 @@ #include "mc/world/level/block/utils/BlockDataFetchResult.h" #include "mc/world/level/block/utils/BlockSupportType.h" +// auto generated forward declare list +// clang-format off +namespace BlockSourceVisitor { struct CollisionShape; } +// clang-format on + class Actor; class Container; class BlockPos; @@ -95,30 +100,42 @@ class BlockSource : public IBlockSource, public std::enable_shared_from_this&, class AABB const& intersectTestBox, bool withUnloadedChunks) const; - // vIndex: 18, symbol: - // ?fetchCollisionShapes@BlockSource@@UEBAXAEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@AEBVAABB@@_NV?$optional_ref@$$CBVGetCollisionShapeInterface@@@@@Z + // vIndex: 20, symbol: + // ?fetchCollisionShapes@BlockSource@@UEBAXAEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@AEBVAABB@@_NV?$optional_ref@$$CBVGetCollisionShapeInterface@@@@PEAV23@@Z virtual void - fetchCollisionShapes(std::vector&, class AABB const&, bool, class optional_ref) + fetchCollisionShapes(std::vector&, class AABB const&, bool, class optional_ref, std::vector*) const; - // vIndex: 19, symbol: + // vIndex: 21, symbol: + // ?fetchCollisionShapesAndBlocks@BlockSource@@UEBAXAEAV?$vector@UCollisionShape@BlockSourceVisitor@@V?$allocator@UCollisionShape@BlockSourceVisitor@@@std@@@std@@AEBVAABB@@_NV?$optional_ref@$$CBVGetCollisionShapeInterface@@@@PEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@3@@Z + virtual void + fetchCollisionShapesAndBlocks(std::vector&, class AABB const&, bool, class optional_ref, std::vector*) + const; + + // vIndex: 22, symbol: // ?getTallestCollisionShape@BlockSource@@UEBA?AVAABB@@AEBV2@PEAM_NV?$optional_ref@$$CBVGetCollisionShapeInterface@@@@@Z virtual class AABB getTallestCollisionShape( class AABB const& intersectTestBox, @@ -127,64 +144,70 @@ class BlockSource : public IBlockSource, public std::enable_shared_from_this entity ) const; - // vIndex: 20, symbol: ?getBrightness@BlockSource@@UEBAMAEBVBlockPos@@@Z + // vIndex: 23, symbol: ?getBrightness@BlockSource@@UEBAMAEBVBlockPos@@@Z virtual float getBrightness(class BlockPos const& pos) const; - // vIndex: 21, symbol: + // vIndex: 24, symbol: // ?fetchAABBs@BlockSource@@UEAAAEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@AEBVAABB@@_N@Z virtual std::vector& fetchAABBs(class AABB const& intersectTestBox, bool withUnloadedChunks); - // vIndex: 22, symbol: - // ?fetchCollisionShapes@BlockSource@@UEAAAEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@AEBVAABB@@_NV?$optional@$$CBVEntityContext@@@3@@Z + // vIndex: 25, symbol: + // ?fetchCollisionShapes@BlockSource@@UEAAAEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@AEBVAABB@@_NV?$optional@$$CBVEntityContext@@@3@PEAV23@@Z virtual std::vector& - fetchCollisionShapes(class AABB const&, bool, std::optional); + fetchCollisionShapes(class AABB const&, bool, std::optional, std::vector*); - // vIndex: 23, symbol: ?getWeakRef@BlockSource@@UEAA?AV?$WeakRef@VBlockSource@@@@XZ + // vIndex: 26, symbol: ?getWeakRef@BlockSource@@UEAA?AV?$WeakRef@VBlockSource@@@@XZ virtual class WeakRef getWeakRef(); - // vIndex: 24, symbol: ?addListener@BlockSource@@UEAAXAEAVBlockSourceListener@@@Z + // vIndex: 27, symbol: ?addListener@BlockSource@@UEAAXAEAVBlockSourceListener@@@Z virtual void addListener(class BlockSourceListener& l); - // vIndex: 25, symbol: ?removeListener@BlockSource@@UEAAXAEAVBlockSourceListener@@@Z + // vIndex: 28, symbol: ?removeListener@BlockSource@@UEAAXAEAVBlockSourceListener@@@Z virtual void removeListener(class BlockSourceListener& l); - // vIndex: 26, symbol: + // vIndex: 29, symbol: // ?fetchEntities@BlockSource@@UEAA?AV?$span@V?$not_null@PEAVActor@@@gsl@@$0?0@gsl@@PEBVActor@@AEBVAABB@@_N2@Z virtual gsl::span> fetchEntities(class Actor const* except, class AABB const& bb, bool, bool); - // vIndex: 27, symbol: + // vIndex: 30, symbol: // ?fetchEntities@BlockSource@@UEAA?AV?$span@V?$not_null@PEAVActor@@@gsl@@$0?0@gsl@@W4ActorType@@AEBVAABB@@PEBVActor@@V?$function@$$A6A_NPEAVActor@@@Z@std@@@Z virtual gsl::span> fetchEntities(::ActorType, class AABB const&, class Actor const*, std::function); - // vIndex: 28, symbol: + // vIndex: 31, symbol: // ?setBlock@BlockSource@@UEAA_NAEBVBlockPos@@AEBVBlock@@HPEBUActorBlockSyncMessage@@PEAVActor@@@Z virtual bool setBlock(class BlockPos const& pos, class Block const& block, int updateFlags, struct ActorBlockSyncMessage const* syncMsg, class Actor*); - // vIndex: 29, symbol: ?getMaxHeight@BlockSource@@UEBAFXZ - virtual short getMaxHeight() const; - - // vIndex: 30, symbol: ?getMinHeight@BlockSource@@UEBAFXZ + // vIndex: 32, symbol: ?getMinHeight@BlockSource@@UEBAFXZ virtual short getMinHeight() const; - // vIndex: 31, symbol: ?getDimension@BlockSource@@UEBAAEAVDimension@@XZ + // vIndex: 33, symbol: ?getMaxHeight@BlockSource@@UEBAFXZ + virtual short getMaxHeight() const; + + // vIndex: 34, symbol: ?getDimension@BlockSource@@UEBAAEAVDimension@@XZ virtual class Dimension& getDimension() const; - // vIndex: 32, symbol: ?getDimension@BlockSource@@UEAAAEAVDimension@@XZ + // vIndex: 35, symbol: ?getDimension@BlockSource@@UEAAAEAVDimension@@XZ virtual class Dimension& getDimension(); - // vIndex: 33, symbol: ?getDimensionConst@BlockSource@@UEBAAEBVDimension@@XZ + // vIndex: 36, symbol: ?getDimensionConst@BlockSource@@UEBAAEBVDimension@@XZ virtual class Dimension const& getDimensionConst() const; - // vIndex: 34, symbol: ?getChunkAt@BlockSource@@UEBAPEAVLevelChunk@@AEBVBlockPos@@@Z - virtual class LevelChunk* getChunkAt(class BlockPos const& pos) const; + // vIndex: 37, symbol: ?getChunk@BlockSource@@UEBAPEAVLevelChunk@@HH@Z + virtual class LevelChunk* getChunk(int x, int z) const; + + // vIndex: 38, symbol: ?getChunk@BlockSource@@UEBAPEAVLevelChunk@@AEBVChunkPos@@@Z + virtual class LevelChunk* getChunk(class ChunkPos const& pos) const; - // vIndex: 35, symbol: ?getILevel@BlockSource@@UEBAAEAVILevel@@XZ + // vIndex: 39, symbol: ?getLevel@BlockSource@@UEAAAEAVLevel@@XZ + virtual class Level& getLevel(); + + // vIndex: 40, symbol: ?getILevel@BlockSource@@UEBAAEAVILevel@@XZ virtual class ILevel& getILevel() const; - // vIndex: 36, symbol: + // vIndex: 41, symbol: // ?clip@BlockSource@@UEBA?AVHitResult@@AEBVVec3@@0_NW4ShapeType@@H11PEAVActor@@AEBV?$function@$$A6A_NAEBVBlockSource@@AEBVBlock@@_N@Z@std@@@Z virtual class HitResult clip( class Vec3 const& startPos, @@ -198,24 +221,27 @@ class BlockSource : public IBlockSource, public std::enable_shared_from_this const& shouldCheckBlock ) const; - // vIndex: 37, symbol: ?getChunkSource@BlockSource@@UEAAAEAVChunkSource@@XZ + // vIndex: 42, symbol: ?getChunkSource@BlockSource@@UEAAAEAVChunkSource@@XZ virtual class ChunkSource& getChunkSource(); - // vIndex: 38, symbol: ?isSolidBlockingBlock@BlockSource@@UEBA_NAEBVBlockPos@@@Z + // vIndex: 43, symbol: ?isSolidBlockingBlock@BlockSource@@UEBA_NAEBVBlockPos@@@Z virtual bool isSolidBlockingBlock(class BlockPos const& p) const; - // vIndex: 39, symbol: ?isSolidBlockingBlock@BlockSource@@UEBA_NHHH@Z + // vIndex: 44, symbol: ?isSolidBlockingBlock@BlockSource@@UEBA_NHHH@Z virtual bool isSolidBlockingBlock(int x, int y, int z) const; - // vIndex: 40, symbol: ?areChunksFullyLoaded@BlockSource@@UEBA_NAEBVBlockPos@@H@Z + // vIndex: 45, symbol: ?areChunksFullyLoaded@BlockSource@@UEBA_NAEBVBlockPos@@H@Z virtual bool areChunksFullyLoaded(class BlockPos const& pos, int r) const; - // vIndex: 41, symbol: ?canDoBlockDrops@BlockSource@@UEBA_NXZ + // vIndex: 46, symbol: ?canDoBlockDrops@BlockSource@@UEBA_NXZ virtual bool canDoBlockDrops() const; - // vIndex: 42, symbol: ?canDoContainedItemDrops@BlockSource@@UEBA_NXZ + // vIndex: 47, symbol: ?canDoContainedItemDrops@BlockSource@@UEBA_NXZ virtual bool canDoContainedItemDrops() const; + // vIndex: 48, symbol: ?isInstaticking@BlockSource@@UEBA_NAEBVBlockPos@@@Z + virtual bool isInstaticking(class BlockPos const& pos) const; + // symbol: ??0BlockSource@@QEAA@AEAVChunkSource@@_N1@Z MCAPI BlockSource(class ChunkSource& source, bool publicSource, bool allowUnpopulatedChunks); @@ -316,14 +342,6 @@ class BlockSource : public IBlockSource, public std::enable_shared_from_this&) const; - - // symbol: - // ?fetchActorIds@BlockSource@@QEBAX_KAEBVAABB@@AEAV?$vector@UActorUniqueID@@V?$allocator@UActorUniqueID@@@std@@@std@@@Z - MCAPI void fetchActorIds(uint64, class AABB const& bb, std::vector&) const; - // symbol: // ?fetchActors@BlockSource@@QEAA?AV?$span@V?$not_null@PEAVActor@@@gsl@@$0?0@gsl@@AEBUActorDefinitionIdentifier@@AEBVAABB@@@Z MCAPI gsl::span> @@ -444,21 +462,12 @@ class BlockSource : public IBlockSource, public std::enable_shared_from_this> @@ -562,9 +568,6 @@ class BlockSource : public IBlockSource, public std::enable_shared_from_this&, class AABB const& box) const; - // symbol: ?addVoidFloor@BlockSource@@IEBAXAEAV?$vector@VAABB@@V?$allocator@VAABB@@@std@@@std@@AEBVAABB@@@Z - MCAPI void addVoidFloor(std::vector&, class AABB const& box) const; - // symbol: ?getTallestCollisionShapeFromUnloadedChunksAABBs@BlockSource@@IEBAXAEBVAABB@@AEAV2@AEBVVec3@@AEAM@Z MCAPI void getTallestCollisionShapeFromUnloadedChunksAABBs(class AABB const& intersectTestBox, class AABB&, class Vec3 const&, float&) diff --git a/src/mc/world/level/BlockTickingQueue.h b/src/mc/world/level/BlockTickingQueue.h index 06fc428d93..198d1f7fc1 100644 --- a/src/mc/world/level/BlockTickingQueue.h +++ b/src/mc/world/level/BlockTickingQueue.h @@ -1,28 +1,22 @@ #pragma once #include "mc/_HeaderOutputPredefine.h" -#include "mc/deps/core/data/MovePriorityQueue.h" -#include "mc/world/level/TickNextTickData.h" class BlockTickingQueue { public: // BlockTickingQueue inner types declare // clang-format off - class BlockTick; class TickDataSet; // clang-format on // BlockTickingQueue inner types define - class BlockTick { + class TickDataSet { public: - bool mIsRemoved{}; - TickNextTickData mData; + // prevent constructor by default + TickDataSet& operator=(TickDataSet const&); + TickDataSet(TickDataSet const&); + TickDataSet(); - public: - bool operator>(const BlockTick& other) const { return mData > other.mData; } - }; - - class TickDataSet : public MovePriorityQueue> { public: // NOLINTBEGIN // symbol: ?_pruneQueueForMemory@TickDataSet@BlockTickingQueue@@QEAAXXZ diff --git a/src/mc/world/level/Explosion.h b/src/mc/world/level/Explosion.h index 9f7c8b0532..0c17ec16fe 100644 --- a/src/mc/world/level/Explosion.h +++ b/src/mc/world/level/Explosion.h @@ -48,6 +48,12 @@ class Explosion { // symbol: ?setFire@Explosion@@QEAAX_N@Z MCAPI void setFire(bool val); + // symbol: ?setIgnoreBlockResistance@Explosion@@QEAAX_N@Z + MCAPI void setIgnoreBlockResistance(bool); + + // symbol: ?setKnockbackScaling@Explosion@@QEAAXM@Z + MCAPI void setKnockbackScaling(float); + // symbol: ?setMaxResistance@Explosion@@QEAAXM@Z MCAPI void setMaxResistance(float resistance); diff --git a/src/mc/world/level/Level.h b/src/mc/world/level/Level.h index 8a8cae8760..18342ed707 100644 --- a/src/mc/world/level/Level.h +++ b/src/mc/world/level/Level.h @@ -167,33 +167,33 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries class UserEntityIdentifierComponent const* userIdentifier ); - // symbol: ?broadcastLocalEvent@Level@@UEAAXAEAVBlockSource@@W4LevelEvent@@AEBVVec3@@H@Z - MCVAPI void broadcastLocalEvent(class BlockSource& region, ::LevelEvent type, class Vec3 const& pos, int data); - // symbol: ?broadcastLocalEvent@Level@@UEAAXAEAVBlockSource@@W4LevelEvent@@AEBVVec3@@AEBVBlock@@@Z MCVAPI void broadcastLocalEvent(class BlockSource& region, ::LevelEvent type, class Vec3 const& pos, class Block const& block); + // symbol: ?broadcastLocalEvent@Level@@UEAAXAEAVBlockSource@@W4LevelEvent@@AEBVVec3@@H@Z + MCVAPI void broadcastLocalEvent(class BlockSource& region, ::LevelEvent type, class Vec3 const& pos, int data); + // symbol: - // ?broadcastSoundEvent@Level@@UEAAXAEAVDimension@@W4LevelSoundEvent@Legacy@Puv@@AEBVVec3@@HAEBUActorDefinitionIdentifier@@_N4@Z + // ?broadcastSoundEvent@Level@@UEAAXAEAVBlockSource@@W4LevelSoundEvent@Legacy@Puv@@AEBVVec3@@AEBVBlock@@AEBUActorDefinitionIdentifier@@_N5@Z MCVAPI void broadcastSoundEvent( - class Dimension& dimension, + class BlockSource& region, ::Puv::Legacy::LevelSoundEvent type, class Vec3 const& pos, - int data, - struct ActorDefinitionIdentifier const& identifier, + class Block const& block, + struct ActorDefinitionIdentifier const& entityType, bool isBabyMob, bool isGlobal ); // symbol: - // ?broadcastSoundEvent@Level@@UEAAXAEAVBlockSource@@W4LevelSoundEvent@Legacy@Puv@@AEBVVec3@@AEBVBlock@@AEBUActorDefinitionIdentifier@@_N5@Z + // ?broadcastSoundEvent@Level@@UEAAXAEAVDimension@@W4LevelSoundEvent@Legacy@Puv@@AEBVVec3@@HAEBUActorDefinitionIdentifier@@_N4@Z MCVAPI void broadcastSoundEvent( - class BlockSource& region, + class Dimension& dimension, ::Puv::Legacy::LevelSoundEvent type, class Vec3 const& pos, - class Block const& block, - struct ActorDefinitionIdentifier const& entityType, + int data, + struct ActorDefinitionIdentifier const& identifier, bool isBabyMob, bool isGlobal ); @@ -304,12 +304,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries MCVAPI std::unique_ptr findPath(class Actor& from, int xBest, int yBest, int zBest, class NavigationComponent& navigation); - // symbol: ?findPlayer@Level@@UEBAPEAVPlayer@@V?$function@$$A6A_NAEBVWeakEntityRef@@@Z@std@@@Z - MCVAPI class Player* findPlayer(std::function pred) const; - // symbol: ?findPlayer@Level@@UEBAPEAVPlayer@@V?$function@$$A6A_NAEBVPlayer@@@Z@std@@@Z MCVAPI class Player* findPlayer(std::function pred) const; + // symbol: ?findPlayer@Level@@UEBAPEAVPlayer@@V?$function@$$A6A_NAEBVWeakEntityRef@@@Z@std@@@Z + MCVAPI class Player* findPlayer(std::function pred) const; + // symbol: ?flushRunTimeLighting@Level@@UEAAXXZ MCVAPI void flushRunTimeLighting(); @@ -325,12 +325,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?forEachPlayer@Level@@UEAAXV?$function@$$A6A_NAEAVPlayer@@@Z@std@@@Z MCVAPI void forEachPlayer(std::function callback); - // symbol: ?forEachUser@Level@@UEAAXV?$function@$$A6A_NAEAVEntityContext@@@Z@std@@@Z - MCVAPI void forEachUser(std::function callback); - // symbol: ?forEachUser@Level@@UEBAXV?$function@$$A6A_NAEBVEntityContext@@@Z@std@@@Z MCVAPI void forEachUser(std::function callback) const; + // symbol: ?forEachUser@Level@@UEAAXV?$function@$$A6A_NAEAVEntityContext@@@Z@std@@@Z + MCVAPI void forEachUser(std::function callback); + // symbol: ?forceFlushRemovedPlayers@Level@@UEAAXXZ MCVAPI void forceFlushRemovedPlayers(); @@ -360,12 +360,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getActorEventCoordinator@Level@@UEAAAEAVActorEventCoordinator@@XZ MCVAPI class ActorEventCoordinator& getActorEventCoordinator(); - // symbol: ?getActorFactory@Level@@UEAAAEAVActorFactory@@XZ - MCVAPI class ActorFactory& getActorFactory(); - // symbol: ?getActorFactory@Level@@UEBAAEBVActorFactory@@XZ MCVAPI class ActorFactory const& getActorFactory() const; + // symbol: ?getActorFactory@Level@@UEAAAEAVActorFactory@@XZ + MCVAPI class ActorFactory& getActorFactory(); + // symbol: ?getActorInfoRegistry@Level@@UEAAPEAVActorInfoRegistry@@XZ MCVAPI class ActorInfoRegistry* getActorInfoRegistry(); @@ -393,18 +393,18 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getBiomeComponentFactory@Level@@UEAAAEAVBiomeComponentFactory@@XZ MCVAPI class BiomeComponentFactory& getBiomeComponentFactory(); - // symbol: ?getBiomeManager@Level@@UEBAAEBVBiomeManager@@XZ - MCVAPI class BiomeManager const& getBiomeManager() const; - // symbol: ?getBiomeManager@Level@@UEAAAEAVBiomeManager@@XZ MCVAPI class BiomeManager& getBiomeManager(); - // symbol: ?getBiomeRegistry@Level@@UEAAAEAVBiomeRegistry@@XZ - MCVAPI class BiomeRegistry& getBiomeRegistry(); + // symbol: ?getBiomeManager@Level@@UEBAAEBVBiomeManager@@XZ + MCVAPI class BiomeManager const& getBiomeManager() const; // symbol: ?getBiomeRegistry@Level@@UEBAAEBVBiomeRegistry@@XZ MCVAPI class BiomeRegistry const& getBiomeRegistry() const; + // symbol: ?getBiomeRegistry@Level@@UEAAAEAVBiomeRegistry@@XZ + MCVAPI class BiomeRegistry& getBiomeRegistry(); + // symbol: ?getBlockComponentFactory@Level@@UEAAAEAVBlockComponentFactory@@XZ MCVAPI class BlockComponentFactory& getBlockComponentFactory(); @@ -417,12 +417,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // 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 MCVAPI class BlockReducer* getBlockReducer() const; @@ -433,12 +433,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // ?getBossEventSubscriptionManager@Level@@UEAA?AV?$not_null@V?$NonOwnerPointer@VBossEventSubscriptionManager@@@Bedrock@@@gsl@@XZ MCVAPI Bedrock::NotNullNonOwnerPtr getBossEventSubscriptionManager(); - // symbol: ?getCameraPresets@Level@@UEAAAEAVCameraPresets@@XZ - MCVAPI class CameraPresets& getCameraPresets(); - // symbol: ?getCameraPresets@Level@@UEBAAEBVCameraPresets@@XZ MCVAPI class CameraPresets const& getCameraPresets() const; + // symbol: ?getCameraPresets@Level@@UEAAAEAVCameraPresets@@XZ + MCVAPI class CameraPresets& getCameraPresets(); + // symbol: ?getCapabilities@Level@@UEBAAEBUISharedController@PlayerCapabilities@@XZ MCVAPI struct PlayerCapabilities::ISharedController const& getCapabilities() const; @@ -469,12 +469,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getDefaultGameType@Level@@UEBA?AW4GameType@@XZ MCVAPI ::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 MCVAPI class BlockPos const& getDefaultSpawn() const; @@ -487,18 +487,18 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getDimensionConversionData@Level@@UEBA?AVDimensionConversionData@@XZ MCVAPI class DimensionConversionData getDimensionConversionData() const; - // symbol: ?getDimensionFactory@Level@@UEAAAEAV?$OwnerPtrFactory@VDimension@@AEAVILevel@@AEAVScheduler@@@@XZ - MCVAPI class OwnerPtrFactory& getDimensionFactory(); - // symbol: ?getDimensionFactory@Level@@UEBAAEBV?$OwnerPtrFactory@VDimension@@AEAVILevel@@AEAVScheduler@@@@XZ MCVAPI class OwnerPtrFactory const& getDimensionFactory() const; - // symbol: ?getDimensionManager@Level@@UEBAAEBVDimensionManager@@XZ - MCVAPI class DimensionManager const& getDimensionManager() const; + // symbol: ?getDimensionFactory@Level@@UEAAAEAV?$OwnerPtrFactory@VDimension@@AEAVILevel@@AEAVScheduler@@@@XZ + MCVAPI class OwnerPtrFactory& getDimensionFactory(); // symbol: ?getDimensionManager@Level@@UEAAAEAVDimensionManager@@XZ MCVAPI class DimensionManager& getDimensionManager(); + // symbol: ?getDimensionManager@Level@@UEBAAEBVDimensionManager@@XZ + MCVAPI class DimensionManager const& getDimensionManager() const; + // symbol: ?getDisablePlayerInteractions@Level@@UEBA_NXZ MCVAPI bool getDisablePlayerInteractions() const; @@ -512,30 +512,30 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getEntityDefinitions@Level@@UEBAPEAVActorDefinitionGroup@@XZ MCVAPI class ActorDefinitionGroup* getEntityDefinitions() const; - // symbol: ?getEntityRegistry@Level@@UEAA?AV?$StackRefResult@VEntityRegistry@@@@XZ - MCVAPI class StackRefResult getEntityRegistry(); - // symbol: ?getEntityRegistry@Level@@UEBA?AV?$StackRefResult@$$CBVEntityRegistry@@@@XZ MCVAPI class StackRefResult getEntityRegistry() const; + // symbol: ?getEntityRegistry@Level@@UEAA?AV?$StackRefResult@VEntityRegistry@@@@XZ + MCVAPI class StackRefResult getEntityRegistry(); + // symbol: ?getEntitySystems@Level@@UEAAAEAVEntitySystems@@XZ MCVAPI class EntitySystems& getEntitySystems(); // symbol: ?getEventing@Level@@UEAAAEAVIMinecraftEventing@@XZ MCVAPI class IMinecraftEventing& getEventing(); - // symbol: ?getFeatureRegistry@Level@@UEAAAEAVFeatureRegistry@@XZ - MCVAPI class FeatureRegistry& getFeatureRegistry(); - // symbol: ?getFeatureRegistry@Level@@UEBAAEBVFeatureRegistry@@XZ MCVAPI class FeatureRegistry const& getFeatureRegistry() const; - // symbol: ?getFeatureTypeFactory@Level@@UEAAAEAVFeatureTypeFactory@@XZ - MCVAPI class FeatureTypeFactory& getFeatureTypeFactory(); + // symbol: ?getFeatureRegistry@Level@@UEAAAEAVFeatureRegistry@@XZ + MCVAPI class FeatureRegistry& getFeatureRegistry(); // symbol: ?getFeatureTypeFactory@Level@@UEBAAEBVFeatureTypeFactory@@XZ MCVAPI class FeatureTypeFactory const& getFeatureTypeFactory() const; + // symbol: ?getFeatureTypeFactory@Level@@UEAAAEAVFeatureTypeFactory@@XZ + MCVAPI class FeatureTypeFactory& getFeatureTypeFactory(); + // symbol: ?getGameRules@Level@@UEAAAEAVGameRules@@XZ MCVAPI class GameRules& getGameRules(); @@ -548,6 +548,9 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getIOTasksGroup@Level@@UEAAAEAVTaskGroup@@XZ MCVAPI class TaskGroup& getIOTasksGroup(); + // symbol: ?getIRandom@Level@@UEBAAEAVIRandom@@XZ + MCVAPI class IRandom& getIRandom() const; + // symbol: ?getImmersiveReaderString@Level@@UEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCVAPI std::string const& getImmersiveReaderString() const; @@ -578,12 +581,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getLevelChunkMetaDataManager@Level@@UEAAPEAVLevelChunkMetaDataManager@@XZ MCVAPI class LevelChunkMetaDataManager* getLevelChunkMetaDataManager(); - // symbol: ?getLevelData@Level@@UEBAAEBVLevelData@@XZ - MCVAPI class LevelData const& getLevelData() const; - // symbol: ?getLevelData@Level@@UEAAAEAVLevelData@@XZ MCVAPI class LevelData& getLevelData(); + // symbol: ?getLevelData@Level@@UEBAAEBVLevelData@@XZ + MCVAPI class LevelData const& getLevelData() const; + // symbol: ?getLevelEntity@Level@@UEAA?AV?$WeakRef@VEntityContext@@@@XZ MCVAPI class WeakRef getLevelEntity(); @@ -602,16 +605,16 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getLevelStorage@Level@@UEBAAEBVLevelStorage@@XZ MCVAPI class LevelStorage const& getLevelStorage() const; - // symbol: - // ?getLightTextureImageBuilderFactory@Level@@UEAAAEAV?$Factory@VBaseLightTextureImageBuilder@@AEAVLevel@@AEAVScheduler@@@@XZ - MCVAPI class Factory& - getLightTextureImageBuilderFactory(); - // symbol: // ?getLightTextureImageBuilderFactory@Level@@UEBAAEBV?$Factory@VBaseLightTextureImageBuilder@@AEAVLevel@@AEAVScheduler@@@@XZ MCVAPI class Factory const& getLightTextureImageBuilderFactory() const; + // symbol: + // ?getLightTextureImageBuilderFactory@Level@@UEAAAEAV?$Factory@VBaseLightTextureImageBuilder@@AEAVLevel@@AEAVScheduler@@@@XZ + MCVAPI class Factory& + getLightTextureImageBuilderFactory(); + // symbol: ?getLiquidHitResult@Level@@UEAAAEAVHitResult@@XZ MCVAPI class HitResult& getLiquidHitResult(); @@ -621,12 +624,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getMapSavedData@Level@@UEAAPEAVMapItemSavedData@@UActorUniqueID@@@Z MCVAPI class MapItemSavedData* getMapSavedData(struct ActorUniqueID uuid); - // symbol: ?getMapSavedData@Level@@UEAAPEAVMapItemSavedData@@AEBVCompoundTag@@@Z - MCVAPI class MapItemSavedData* getMapSavedData(class CompoundTag const& instance); - // symbol: ?getMapSavedData@Level@@UEAAPEAVMapItemSavedData@@PEBVCompoundTag@@@Z MCVAPI class MapItemSavedData* getMapSavedData(class CompoundTag const* instance); + // symbol: ?getMapSavedData@Level@@UEAAPEAVMapItemSavedData@@AEBVCompoundTag@@@Z + MCVAPI class MapItemSavedData* getMapSavedData(class CompoundTag const& instance); + // symbol: ?getMob@Level@@UEBAPEAVMob@@UActorUniqueID@@@Z MCVAPI class Mob* getMob(struct ActorUniqueID mobId) const; @@ -654,12 +657,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getPacketSender@Level@@UEBAPEAVPacketSender@@XZ MCVAPI class PacketSender* getPacketSender() const; - // symbol: ?getPauseManager@Level@@UEBA?AV?$StackRefResult@$$CBVPauseManager@@@@XZ - MCVAPI class StackRefResult getPauseManager() const; - // symbol: ?getPauseManager@Level@@UEAA?AV?$StackRefResult@VPauseManager@@@@XZ MCVAPI class StackRefResult getPauseManager(); + // symbol: ?getPauseManager@Level@@UEBA?AV?$StackRefResult@$$CBVPauseManager@@@@XZ + MCVAPI class StackRefResult getPauseManager() const; + // symbol: ?getPhotoStorage@Level@@UEAAAEAVPhotoStorage@@XZ MCVAPI class PhotoStorage& getPhotoStorage(); @@ -676,12 +679,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getPlayer@Level@@UEBAPEAVPlayer@@AEBVUUID@mce@@@Z MCVAPI class Player* getPlayer(class mce::UUID const& uuid) const; - // symbol: ?getPlayer@Level@@UEBAPEAVPlayer@@UActorUniqueID@@@Z - MCVAPI class Player* getPlayer(struct ActorUniqueID entityID) 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& name) const; + // symbol: ?getPlayer@Level@@UEBAPEAVPlayer@@UActorUniqueID@@@Z + MCVAPI class Player* getPlayer(struct ActorUniqueID entityID) const; + // symbol: ?getPlayerAbilities@Level@@UEAAPEAVLayeredAbilities@@AEBUActorUniqueID@@@Z MCVAPI class LayeredAbilities* getPlayerAbilities(struct ActorUniqueID const& playerId); @@ -696,14 +699,14 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // ?getPlayerFromServerId@Level@@UEBAPEAVPlayer@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCVAPI class Player* getPlayerFromServerId(std::string const& serverId) const; - // symbol: - // ?getPlayerList@Level@@UEBAAEBV?$unordered_map@VUUID@mce@@VPlayerListEntry@@U?$hash@VUUID@mce@@@std@@U?$equal_to@VUUID@mce@@@5@V?$allocator@U?$pair@$$CBVUUID@mce@@VPlayerListEntry@@@std@@@5@@std@@XZ - MCVAPI std::unordered_map const& getPlayerList() const; - // symbol: // ?getPlayerList@Level@@UEAAAEAV?$unordered_map@VUUID@mce@@VPlayerListEntry@@U?$hash@VUUID@mce@@@std@@U?$equal_to@VUUID@mce@@@5@V?$allocator@U?$pair@$$CBVUUID@mce@@VPlayerListEntry@@@std@@@5@@std@@XZ MCVAPI std::unordered_map& getPlayerList(); + // symbol: + // ?getPlayerList@Level@@UEBAAEBV?$unordered_map@VUUID@mce@@VPlayerListEntry@@U?$hash@VUUID@mce@@@std@@U?$equal_to@VUUID@mce@@@5@V?$allocator@U?$pair@$$CBVUUID@mce@@VPlayerListEntry@@@std@@@5@@std@@XZ + MCVAPI std::unordered_map const& getPlayerList() const; + // symbol: ?getPlayerMovementSettings@Level@@UEBAAEBUPlayerMovementSettings@@XZ MCVAPI struct PlayerMovementSettings const& getPlayerMovementSettings() const; @@ -809,12 +812,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?getSubChunkRequestManager@Level@@UEAAPEAVSubChunkRequestManager@@XZ MCVAPI class SubChunkRequestManager* getSubChunkRequestManager(); - // symbol: ?getSurfaceBuilderRegistry@Level@@UEBAAEBVSurfaceBuilderRegistry@@XZ - MCVAPI class SurfaceBuilderRegistry const& getSurfaceBuilderRegistry() const; - // symbol: ?getSurfaceBuilderRegistry@Level@@UEAAAEAVSurfaceBuilderRegistry@@XZ MCVAPI class SurfaceBuilderRegistry& getSurfaceBuilderRegistry(); + // symbol: ?getSurfaceBuilderRegistry@Level@@UEBAAEBVSurfaceBuilderRegistry@@XZ + MCVAPI class SurfaceBuilderRegistry const& getSurfaceBuilderRegistry() const; + // symbol: ?getSyncTasksGroup@Level@@UEAAAEAVTaskGroup@@XZ MCVAPI class TaskGroup& getSyncTasksGroup(); @@ -863,12 +866,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // ?getUsers@Level@@UEBAAEBV?$vector@V?$OwnerPtr@VEntityContext@@@@V?$allocator@V?$OwnerPtr@VEntityContext@@@@@std@@@std@@XZ MCVAPI std::vector> const& getUsers() const; - // symbol: ?getWorldRegistriesProvider@Level@@UEAAAEAVIWorldRegistriesProvider@@XZ - MCVAPI class IWorldRegistriesProvider& getWorldRegistriesProvider(); - // symbol: ?getWorldRegistriesProvider@Level@@UEBAAEBVIWorldRegistriesProvider@@XZ MCVAPI class IWorldRegistriesProvider const& getWorldRegistriesProvider() const; + // symbol: ?getWorldRegistriesProvider@Level@@UEAAAEAVIWorldRegistriesProvider@@XZ + MCVAPI class IWorldRegistriesProvider& getWorldRegistriesProvider(); + // symbol: ?getXBLBroadcastIntent@Level@@UEBA?AW4GamePublishSetting@Social@@XZ MCVAPI ::Social::GamePublishSetting getXBLBroadcastIntent() const; @@ -1060,12 +1063,12 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?removeDisplayEntity@Level@@UEAAXVWeakEntityRef@@@Z MCVAPI void removeDisplayEntity(class WeakEntityRef); - // symbol: ?removeEntity@Level@@UEAA?AV?$OwnerPtr@VEntityContext@@@@AEAVActor@@@Z - MCVAPI class OwnerPtr removeEntity(class Actor& actor); - // symbol: ?removeEntity@Level@@UEAA?AV?$OwnerPtr@VEntityContext@@@@VWeakEntityRef@@@Z MCVAPI class OwnerPtr removeEntity(class WeakEntityRef weakEntity); + // symbol: ?removeEntity@Level@@UEAA?AV?$OwnerPtr@VEntityContext@@@@AEAVActor@@@Z + MCVAPI class OwnerPtr removeEntity(class Actor& actor); + // symbol: ?removeListener@Level@@UEAAXAEAVLevelListener@@@Z MCVAPI void removeListener(class LevelListener& listener); @@ -1300,8 +1303,8 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?earlyShutdownMainthread@Level@@QEAAXXZ MCAPI void earlyShutdownMainthread(); - // symbol: ?getActorManager@Level@@QEAAAEAVActorManager@@XZ - MCAPI class ActorManager& getActorManager(); + // symbol: ?getActorManager@Level@@QEAA?AV?$not_null@V?$StackRefResult@VActorManager@@@@@gsl@@XZ + MCAPI gsl::not_null> getActorManager(); // symbol: ?getAutonomousActorManager@Level@@QEBAAEBVAutonomousActorManager@@XZ MCAPI class AutonomousActorManager const& getAutonomousActorManager() const; @@ -1381,6 +1384,13 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?_getGameplayUserManager@Level@@IEBAAEBVGameplayUserManager@@XZ MCAPI class GameplayUserManager const& _getGameplayUserManager() const; + // symbol: + // ?_getGameplayUserManagerStackRef@Level@@IEAA?AV?$not_null@V?$StackRefResult@VGameplayUserManager@@@@@gsl@@XZ + MCAPI gsl::not_null> _getGameplayUserManagerStackRef(); + + // symbol: ?_getLevelChunkEventManagerConnector@Level@@IEAAAEAVILevelChunkEventManagerConnector@@XZ + MCAPI class ILevelChunkEventManagerConnector& _getLevelChunkEventManagerConnector(); + // symbol: ?_getLevelStorageManager@Level@@IEAAPEAVLevelStorageManager@@XZ MCAPI class LevelStorageManager* _getLevelStorageManager(); @@ -1409,12 +1419,41 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?_initializeGameplayUserManager@Level@@AEAAXXZ MCAPI void _initializeGameplayUserManager(); + // symbol: ?_initializeLevelChunkEventManager@Level@@AEAAXXZ + MCAPI void _initializeLevelChunkEventManager(); + // symbol: ?_initializeLevelEventManager@Level@@AEAAXXZ MCAPI void _initializeLevelEventManager(); + // symbol: ?_initializeLevelStorageManager@Level@@AEAAXXZ + MCAPI void _initializeLevelStorageManager(); + + // symbol: ?_initializeParticleProvider@Level@@AEAAXXZ + MCAPI void _initializeParticleProvider(); + + // symbol: ?_onAddBreakingItemParticleEffect@Level@@AEAAXAEBVVec3@@W4ParticleType@@AEBUResolvedItemIconInfo@@@Z + MCAPI void _onAddBreakingItemParticleEffect(class Vec3 const&, ::ParticleType, struct ResolvedItemIconInfo const&); + + // symbol: ?_onAddTerrainParticleEffect@Level@@AEAAXAEBVBlockPos@@AEBVBlock@@AEBVVec3@@MMM@Z + MCAPI void + _onAddTerrainParticleEffect(class BlockPos const&, class Block const&, class Vec3 const&, float, float, float); + + // symbol: ?_onAddTerrainSlideEffect@Level@@AEAAXAEBVBlockPos@@AEBVBlock@@AEBVVec3@@MMM@Z + MCAPI void + _onAddTerrainSlideEffect(class BlockPos const&, class Block const&, class Vec3 const&, float, float, float); + // symbol: ?_onAnyGameplayUsersRemoved@Level@@AEAAXXZ MCAPI void _onAnyGameplayUsersRemoved(); + // symbol: ?_onChunkDiscarded@Level@@AEAAXAEAVLevelChunk@@@Z + MCAPI void _onChunkDiscarded(class LevelChunk&); + + // symbol: ?_onChunkLoaded@Level@@AEAAXAEAVChunkSource@@AEAVLevelChunk@@H@Z + MCAPI void _onChunkLoaded(class ChunkSource&, class LevelChunk&, int); + + // symbol: ?_onChunkReloaded@Level@@AEAAXAEAVChunkSource@@AEAVLevelChunk@@@Z + MCAPI void _onChunkReloaded(class ChunkSource&, class LevelChunk&); + // symbol: ?_onGameplayUserAdded@Level@@AEAAXAEAVEntityContext@@@Z MCAPI void _onGameplayUserAdded(class EntityContext& entity); @@ -1436,6 +1475,9 @@ class Level : public ILevel, public BlockSourceListener, public IWorldRegistries // symbol: ?_onSaveLevelData@Level@@AEAAXAEAVLevelStorage@@@Z MCAPI void _onSaveLevelData(class LevelStorage& levelStorage); + // symbol: ?_onSendServerLegacyParticle@Level@@AEAAXW4ParticleType@@AEBVVec3@@1H@Z + MCAPI void _onSendServerLegacyParticle(::ParticleType, class Vec3 const&, class Vec3 const&, int); + // symbol: ?_saveSomeChunks@Level@@AEAAXXZ MCAPI void _saveSomeChunks(); diff --git a/src/mc/world/level/LevelChunkMetaDataManager.h b/src/mc/world/level/LevelChunkMetaDataManager.h index a6001ded48..06e934c2d2 100644 --- a/src/mc/world/level/LevelChunkMetaDataManager.h +++ b/src/mc/world/level/LevelChunkMetaDataManager.h @@ -15,13 +15,13 @@ class LevelChunkMetaDataManager { public: // NOLINTBEGIN - // symbol: ?consolidateLevelChunkMetaData@LevelChunkMetaDataManager@@QEAAXAEAVLevelChunk@@@Z - MCAPI void consolidateLevelChunkMetaData(class LevelChunk&); - // symbol: // ?getLevelChunkMetaDataDictionary@LevelChunkMetaDataManager@@QEBA?AV?$shared_ptr@VLevelChunkMetaDataDictionary@@@std@@XZ MCAPI std::shared_ptr getLevelChunkMetaDataDictionary() const; + // symbol: ?registerForLevelChunkEvents@LevelChunkMetaDataManager@@QEAAXAEAVILevelChunkEventManagerConnector@@@Z + MCAPI void registerForLevelChunkEvents(class ILevelChunkEventManagerConnector&); + // symbol: ?registerOnNewDimensionCreated@LevelChunkMetaDataManager@@QEAAXAEAVDimensionManager@@@Z MCAPI void registerOnNewDimensionCreated(class DimensionManager&); @@ -54,6 +54,9 @@ class LevelChunkMetaDataManager { // private: // NOLINTBEGIN + // symbol: ?_consolidateLevelChunkMetaData@LevelChunkMetaDataManager@@AEAAXAEAVLevelChunk@@@Z + MCAPI void _consolidateLevelChunkMetaData(class LevelChunk&); + // symbol: ?_onNewDimensionCreated@LevelChunkMetaDataManager@@AEAAXAEAVDimension@@@Z MCAPI void _onNewDimensionCreated(class Dimension&); diff --git a/src/mc/world/level/LevelEventCoordinator.h b/src/mc/world/level/LevelEventCoordinator.h index fee13adb7d..e40419c5d2 100644 --- a/src/mc/world/level/LevelEventCoordinator.h +++ b/src/mc/world/level/LevelEventCoordinator.h @@ -49,8 +49,8 @@ class LevelEventCoordinator { MCAPI void sendLevelTickStart(class Level& level); // symbol: - // ?sendLevelWeatherChanged@LevelEventCoordinator@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N1@Z - MCAPI void sendLevelWeatherChanged(std::string const& dimension, bool raining, bool lightning); + // ?sendLevelWeatherChanged@LevelEventCoordinator@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N111@Z + MCAPI void sendLevelWeatherChanged(std::string const&, bool, bool, bool, bool); // NOLINTEND }; diff --git a/src/mc/world/level/LevelListCache.h b/src/mc/world/level/LevelListCache.h index 3c047fe0c1..09f06b053b 100644 --- a/src/mc/world/level/LevelListCache.h +++ b/src/mc/world/level/LevelListCache.h @@ -96,6 +96,9 @@ class LevelListCache { // ?getShallowLevelSummary@LevelListCache@@UEAAPEAULevelSummary@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCVAPI struct LevelSummary* getShallowLevelSummary(std::string const& levelId); + // symbol: ?hasCachedLevels@LevelListCache@@UEBA_N_N@Z + MCVAPI bool hasCachedLevels(bool) const; + // symbol: ?hasLevelWithId@LevelListCache@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCVAPI bool hasLevelWithId(std::string const& levelId); diff --git a/src/mc/world/level/RuntimeLightingManager.h b/src/mc/world/level/RuntimeLightingManager.h index 415725ca63..d2a1de610d 100644 --- a/src/mc/world/level/RuntimeLightingManager.h +++ b/src/mc/world/level/RuntimeLightingManager.h @@ -33,6 +33,9 @@ class RuntimeLightingManager { public: // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1RuntimeLightingManager@@UEAA@XZ + virtual ~RuntimeLightingManager() = default; + // symbol: ??0RuntimeLightingManager@@QEAA@AEAVDimension@@@Z MCAPI explicit RuntimeLightingManager(class Dimension& dimension); @@ -49,9 +52,6 @@ class RuntimeLightingManager { bool isSkyLight ); - // symbol: ??1RuntimeLightingManager@@QEAA@XZ - MCAPI ~RuntimeLightingManager(); - // NOLINTEND // private: diff --git a/src/mc/world/level/ServerPlayerEventCoordinator.h b/src/mc/world/level/ServerPlayerEventCoordinator.h index 31e2f2b05e..58aeffce0b 100644 --- a/src/mc/world/level/ServerPlayerEventCoordinator.h +++ b/src/mc/world/level/ServerPlayerEventCoordinator.h @@ -23,8 +23,5 @@ class ServerPlayerEventCoordinator : public ::PlayerEventCoordinator { // symbol: ?sendPlayerAuthInputReceived@ServerPlayerEventCoordinator@@QEAAXAEAVPlayer@@@Z MCAPI void sendPlayerAuthInputReceived(class Player& player); - // symbol: ?sendPlayerOnGround@ServerPlayerEventCoordinator@@QEAAXAEAVPlayer@@@Z - MCAPI void sendPlayerOnGround(class Player& player); - // NOLINTEND }; diff --git a/src/mc/world/level/TrialChambersPieces.h b/src/mc/world/level/TrialChambersPieces.h new file mode 100644 index 0000000000..0e5ba52d32 --- /dev/null +++ b/src/mc/world/level/TrialChambersPieces.h @@ -0,0 +1,12 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace TrialChambersPieces { +// NOLINTBEGIN +// symbol: +// ?ALIAS_BINDINGS@TrialChambersPieces@@3V?$vector@V?$shared_ptr@VPoolAliasBinding@@@std@@V?$allocator@V?$shared_ptr@VPoolAliasBinding@@@std@@@2@@std@@B +MCAPI extern std::vector> const ALIAS_BINDINGS; +// NOLINTEND + +}; // namespace TrialChambersPieces diff --git a/src/mc/world/level/TrialSpawner.h b/src/mc/world/level/TrialSpawner.h index fba68a7754..c7b0f005fc 100644 --- a/src/mc/world/level/TrialSpawner.h +++ b/src/mc/world/level/TrialSpawner.h @@ -109,9 +109,8 @@ class TrialSpawner { // symbol: ?_updateStateMachine@TrialSpawner@@AEAAXAEAVBlockSource@@@Z MCAPI void _updateStateMachine(class BlockSource&); - // symbol: - // ?_ejectResultItems@TrialSpawner@@CAXAEAVBlockSource@@VBlockPos@@AEBV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@H@Z - MCAPI static void _ejectResultItems(class BlockSource&, class BlockPos, std::vector const&, int); + // symbol: ?_ejectItem@TrialSpawner@@CAXAEAVBlockSource@@AEBVVec3@@AEBVItemStack@@@Z + MCAPI static void _ejectItem(class BlockSource&, class Vec3 const&, class ItemStack const&); // symbol: // ?_getRandomLootTableItems@TrialSpawner@@CA?AV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVLevel@@V?$AutomaticID@VDimension@@H@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@@Z diff --git a/src/mc/world/level/VanillaDataDrivenGeometry.h b/src/mc/world/level/VanillaDataDrivenGeometry.h new file mode 100644 index 0000000000..87a05d0e50 --- /dev/null +++ b/src/mc/world/level/VanillaDataDrivenGeometry.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class VanillaDataDrivenGeometry { +public: + // prevent constructor by default + VanillaDataDrivenGeometry& operator=(VanillaDataDrivenGeometry const&); + VanillaDataDrivenGeometry(VanillaDataDrivenGeometry const&); + VanillaDataDrivenGeometry(); + +public: + // NOLINTBEGIN + // symbol: ?addComponentsToBlocks@VanillaDataDrivenGeometry@@SAXAEBVExperiments@@@Z + MCAPI static void addComponentsToBlocks(class Experiments const&); + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/Biome.h b/src/mc/world/level/biome/Biome.h index ad797053d2..015bd2e3c7 100644 --- a/src/mc/world/level/biome/Biome.h +++ b/src/mc/world/level/biome/Biome.h @@ -55,6 +55,9 @@ class Biome { // vIndex: 0, symbol: __gen_??1Biome@@UEAA@XZ virtual ~Biome() = default; + // symbol: ??0Biome@@QEAA@H@Z + MCAPI explicit Biome(int id); + // symbol: ?cacheClientComponentData@Biome@@QEAAXXZ MCAPI void cacheClientComponentData(); diff --git a/src/mc/world/level/biome/BiomeComponentBase.h b/src/mc/world/level/biome/BiomeComponentBase.h new file mode 100644 index 0000000000..cbeed08f10 --- /dev/null +++ b/src/mc/world/level/biome/BiomeComponentBase.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct BiomeComponentBase { +public: + // prevent constructor by default + BiomeComponentBase& operator=(BiomeComponentBase const&); + BiomeComponentBase(BiomeComponentBase const&); + BiomeComponentBase(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BiomeComponentBase@@UEAA@XZ + virtual ~BiomeComponentBase() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/BiomeComponentStorage.h b/src/mc/world/level/biome/BiomeComponentStorage.h new file mode 100644 index 0000000000..a5d35d3028 --- /dev/null +++ b/src/mc/world/level/biome/BiomeComponentStorage.h @@ -0,0 +1,18 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class BiomeComponentStorage { +public: + // prevent constructor by default + BiomeComponentStorage& operator=(BiomeComponentStorage const&); + BiomeComponentStorage(BiomeComponentStorage const&); + BiomeComponentStorage(); + +public: + // NOLINTBEGIN + // symbol: ?finalizeComponents@BiomeComponentStorage@@QEAAXXZ + MCAPI void finalizeComponents(); + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/BiomeTagAttributes.h b/src/mc/world/level/biome/BiomeTagAttributes.h index 19d2fd0ef0..ba53467da3 100644 --- a/src/mc/world/level/biome/BiomeTagAttributes.h +++ b/src/mc/world/level/biome/BiomeTagAttributes.h @@ -2,7 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" -struct BiomeTagAttributes { +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct BiomeTagAttributes : public ::BiomeComponentBase { public: // prevent constructor by default BiomeTagAttributes& operator=(BiomeTagAttributes const&); @@ -11,6 +14,9 @@ struct BiomeTagAttributes { public: // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BiomeTagAttributes@@UEAA@XZ + virtual ~BiomeTagAttributes() = default; + // symbol: ??4BiomeTagAttributes@@QEAAAEAU0@$$QEAU0@@Z MCAPI struct BiomeTagAttributes& operator=(struct BiomeTagAttributes&&); diff --git a/src/mc/world/level/biome/DataDrivenBiomeSurfaceFlag.h b/src/mc/world/level/biome/DataDrivenBiomeSurfaceFlag.h new file mode 100644 index 0000000000..b39d326ab1 --- /dev/null +++ b/src/mc/world/level/biome/DataDrivenBiomeSurfaceFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct DataDrivenBiomeSurfaceFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + DataDrivenBiomeSurfaceFlag& operator=(DataDrivenBiomeSurfaceFlag const&); + DataDrivenBiomeSurfaceFlag(DataDrivenBiomeSurfaceFlag const&); + DataDrivenBiomeSurfaceFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1DataDrivenBiomeSurfaceFlag@@UEAA@XZ + virtual ~DataDrivenBiomeSurfaceFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/FrozenNoiseBasedTemperatureFlag.h b/src/mc/world/level/biome/FrozenNoiseBasedTemperatureFlag.h new file mode 100644 index 0000000000..eb764b1c08 --- /dev/null +++ b/src/mc/world/level/biome/FrozenNoiseBasedTemperatureFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct FrozenNoiseBasedTemperatureFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + FrozenNoiseBasedTemperatureFlag& operator=(FrozenNoiseBasedTemperatureFlag const&); + FrozenNoiseBasedTemperatureFlag(FrozenNoiseBasedTemperatureFlag const&); + FrozenNoiseBasedTemperatureFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1FrozenNoiseBasedTemperatureFlag@@UEAA@XZ + virtual ~FrozenNoiseBasedTemperatureFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/IgnoreAutomaticFeatureRulesFlag.h b/src/mc/world/level/biome/IgnoreAutomaticFeatureRulesFlag.h new file mode 100644 index 0000000000..04217d02be --- /dev/null +++ b/src/mc/world/level/biome/IgnoreAutomaticFeatureRulesFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct IgnoreAutomaticFeatureRulesFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + IgnoreAutomaticFeatureRulesFlag& operator=(IgnoreAutomaticFeatureRulesFlag const&); + IgnoreAutomaticFeatureRulesFlag(IgnoreAutomaticFeatureRulesFlag const&); + IgnoreAutomaticFeatureRulesFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1IgnoreAutomaticFeatureRulesFlag@@UEAA@XZ + virtual ~IgnoreAutomaticFeatureRulesFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/MobSpawnRules.h b/src/mc/world/level/biome/MobSpawnRules.h index 400b49ca48..a588657f4a 100644 --- a/src/mc/world/level/biome/MobSpawnRules.h +++ b/src/mc/world/level/biome/MobSpawnRules.h @@ -58,12 +58,12 @@ class MobSpawnRules { MCAPI int getPopulationCap(class SpawnConditions const& conditions) const; // symbol: - // ?getSpawnAboveBlockList@MobSpawnRules@@QEBAAEBV?$unordered_set@PEBVBlockLegacy@@U?$hash@PEBVBlockLegacy@@@std@@U?$equal_to@PEBVBlockLegacy@@@3@V?$allocator@PEBVBlockLegacy@@@3@@std@@XZ - MCAPI std::unordered_set const& getSpawnAboveBlockList() const; + // ?getSpawnAboveBlockList@MobSpawnRules@@QEBAAEBV?$vector@VBlockDescriptor@@V?$allocator@VBlockDescriptor@@@std@@@std@@XZ + MCAPI std::vector const& getSpawnAboveBlockList() const; // symbol: - // ?getSpawnAboveBlockListMutable@MobSpawnRules@@QEAAAEAV?$unordered_set@PEBVBlockLegacy@@U?$hash@PEBVBlockLegacy@@@std@@U?$equal_to@PEBVBlockLegacy@@@3@V?$allocator@PEBVBlockLegacy@@@3@@std@@XZ - MCAPI std::unordered_set& getSpawnAboveBlockListMutable(); + // ?getSpawnAboveBlockListMutable@MobSpawnRules@@QEAAAEAV?$vector@VBlockDescriptor@@V?$allocator@VBlockDescriptor@@@std@@@std@@XZ + MCAPI std::vector& getSpawnAboveBlockListMutable(); // symbol: // ?getSpawnCount@MobSpawnRules@@QEBAHAEBVSpawnConditions@@AEAVBlockSource@@AEAVRandom@@AEBUMobSpawnHerdInfo@@@Z @@ -75,20 +75,20 @@ class MobSpawnRules { ) const; // symbol: - // ?getSpawnOnBlockList@MobSpawnRules@@QEBAAEBV?$unordered_set@PEBVBlockLegacy@@U?$hash@PEBVBlockLegacy@@@std@@U?$equal_to@PEBVBlockLegacy@@@3@V?$allocator@PEBVBlockLegacy@@@3@@std@@XZ - MCAPI std::unordered_set const& getSpawnOnBlockList() const; + // ?getSpawnOnBlockList@MobSpawnRules@@QEBAAEBV?$vector@VBlockDescriptor@@V?$allocator@VBlockDescriptor@@@std@@@std@@XZ + MCAPI std::vector const& getSpawnOnBlockList() const; // symbol: - // ?getSpawnOnBlockListMutable@MobSpawnRules@@QEAAAEAV?$unordered_set@PEBVBlockLegacy@@U?$hash@PEBVBlockLegacy@@@std@@U?$equal_to@PEBVBlockLegacy@@@3@V?$allocator@PEBVBlockLegacy@@@3@@std@@XZ - MCAPI std::unordered_set& getSpawnOnBlockListMutable(); + // ?getSpawnOnBlockListMutable@MobSpawnRules@@QEAAAEAV?$vector@VBlockDescriptor@@V?$allocator@VBlockDescriptor@@@std@@@std@@XZ + MCAPI std::vector& getSpawnOnBlockListMutable(); // symbol: - // ?getSpawnOnBlockPreventedList@MobSpawnRules@@QEBAAEBV?$unordered_set@PEBVBlockLegacy@@U?$hash@PEBVBlockLegacy@@@std@@U?$equal_to@PEBVBlockLegacy@@@3@V?$allocator@PEBVBlockLegacy@@@3@@std@@XZ - MCAPI std::unordered_set const& getSpawnOnBlockPreventedList() const; + // ?getSpawnOnBlockPreventedList@MobSpawnRules@@QEBAAEBV?$vector@VBlockDescriptor@@V?$allocator@VBlockDescriptor@@@std@@@std@@XZ + MCAPI std::vector const& getSpawnOnBlockPreventedList() const; // symbol: - // ?getSpawnOnBlockPreventedListMutable@MobSpawnRules@@QEAAAEAV?$unordered_set@PEBVBlockLegacy@@U?$hash@PEBVBlockLegacy@@@std@@U?$equal_to@PEBVBlockLegacy@@@3@V?$allocator@PEBVBlockLegacy@@@3@@std@@XZ - MCAPI std::unordered_set& getSpawnOnBlockPreventedListMutable(); + // ?getSpawnOnBlockPreventedListMutable@MobSpawnRules@@QEAAAEAV?$vector@VBlockDescriptor@@V?$allocator@VBlockDescriptor@@@std@@@std@@XZ + MCAPI std::vector& getSpawnOnBlockPreventedListMutable(); // symbol: ?isLavaSpawner@MobSpawnRules@@QEBA_NXZ MCAPI bool isLavaSpawner() const; diff --git a/src/mc/world/level/biome/NetherSurfaceFlag.h b/src/mc/world/level/biome/NetherSurfaceFlag.h new file mode 100644 index 0000000000..1a55346408 --- /dev/null +++ b/src/mc/world/level/biome/NetherSurfaceFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct NetherSurfaceFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + NetherSurfaceFlag& operator=(NetherSurfaceFlag const&); + NetherSurfaceFlag(NetherSurfaceFlag const&); + NetherSurfaceFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1NetherSurfaceFlag@@UEAA@XZ + virtual ~NetherSurfaceFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/NoiseBasedColorPaletteFlag.h b/src/mc/world/level/biome/NoiseBasedColorPaletteFlag.h new file mode 100644 index 0000000000..f64c167b6f --- /dev/null +++ b/src/mc/world/level/biome/NoiseBasedColorPaletteFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct NoiseBasedColorPaletteFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + NoiseBasedColorPaletteFlag& operator=(NoiseBasedColorPaletteFlag const&); + NoiseBasedColorPaletteFlag(NoiseBasedColorPaletteFlag const&); + NoiseBasedColorPaletteFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1NoiseBasedColorPaletteFlag@@UEAA@XZ + virtual ~NoiseBasedColorPaletteFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/OceanFrozenSurfaceFlag.h b/src/mc/world/level/biome/OceanFrozenSurfaceFlag.h new file mode 100644 index 0000000000..8b61eefde4 --- /dev/null +++ b/src/mc/world/level/biome/OceanFrozenSurfaceFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct OceanFrozenSurfaceFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + OceanFrozenSurfaceFlag& operator=(OceanFrozenSurfaceFlag const&); + OceanFrozenSurfaceFlag(OceanFrozenSurfaceFlag const&); + OceanFrozenSurfaceFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1OceanFrozenSurfaceFlag@@UEAA@XZ + virtual ~OceanFrozenSurfaceFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/SwampBiomeSurfaceFlag.h b/src/mc/world/level/biome/SwampBiomeSurfaceFlag.h new file mode 100644 index 0000000000..7fd5865e70 --- /dev/null +++ b/src/mc/world/level/biome/SwampBiomeSurfaceFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct SwampBiomeSurfaceFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + SwampBiomeSurfaceFlag& operator=(SwampBiomeSurfaceFlag const&); + SwampBiomeSurfaceFlag(SwampBiomeSurfaceFlag const&); + SwampBiomeSurfaceFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1SwampBiomeSurfaceFlag@@UEAA@XZ + virtual ~SwampBiomeSurfaceFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/TheEndBiomeSurfaceFlag.h b/src/mc/world/level/biome/TheEndBiomeSurfaceFlag.h new file mode 100644 index 0000000000..469a70affd --- /dev/null +++ b/src/mc/world/level/biome/TheEndBiomeSurfaceFlag.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct TheEndBiomeSurfaceFlag : public ::BiomeComponentBase { +public: + // prevent constructor by default + TheEndBiomeSurfaceFlag& operator=(TheEndBiomeSurfaceFlag const&); + TheEndBiomeSurfaceFlag(TheEndBiomeSurfaceFlag const&); + TheEndBiomeSurfaceFlag(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1TheEndBiomeSurfaceFlag@@UEAA@XZ + virtual ~TheEndBiomeSurfaceFlag() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/BiomeDimensionAttributes.h b/src/mc/world/level/biome/components/BiomeDimensionAttributes.h new file mode 100644 index 0000000000..a7c4cc9f8f --- /dev/null +++ b/src/mc/world/level/biome/components/BiomeDimensionAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct BiomeDimensionAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + BiomeDimensionAttributes& operator=(BiomeDimensionAttributes const&); + BiomeDimensionAttributes(BiomeDimensionAttributes const&); + BiomeDimensionAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BiomeDimensionAttributes@@UEAA@XZ + virtual ~BiomeDimensionAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/ClimateAttributes.h b/src/mc/world/level/biome/components/ClimateAttributes.h new file mode 100644 index 0000000000..cfa389c0d3 --- /dev/null +++ b/src/mc/world/level/biome/components/ClimateAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +class ClimateAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + ClimateAttributes& operator=(ClimateAttributes const&); + ClimateAttributes(ClimateAttributes const&); + ClimateAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ClimateAttributes@@UEAA@XZ + virtual ~ClimateAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/ColorPaletteAttributes.h b/src/mc/world/level/biome/components/ColorPaletteAttributes.h new file mode 100644 index 0000000000..ad030048a8 --- /dev/null +++ b/src/mc/world/level/biome/components/ColorPaletteAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct ColorPaletteAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + ColorPaletteAttributes& operator=(ColorPaletteAttributes const&); + ColorPaletteAttributes(ColorPaletteAttributes const&); + ColorPaletteAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ColorPaletteAttributes@@UEAA@XZ + virtual ~ColorPaletteAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomDebugMapColorAttributes.h b/src/mc/world/level/biome/components/CustomDebugMapColorAttributes.h new file mode 100644 index 0000000000..a3f64dd57a --- /dev/null +++ b/src/mc/world/level/biome/components/CustomDebugMapColorAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomDebugMapColorAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomDebugMapColorAttributes& operator=(CustomDebugMapColorAttributes const&); + CustomDebugMapColorAttributes(CustomDebugMapColorAttributes const&); + CustomDebugMapColorAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomDebugMapColorAttributes@@UEAA@XZ + virtual ~CustomDebugMapColorAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomDebugMapColorOddAttributes.h b/src/mc/world/level/biome/components/CustomDebugMapColorOddAttributes.h new file mode 100644 index 0000000000..d1ddee28d5 --- /dev/null +++ b/src/mc/world/level/biome/components/CustomDebugMapColorOddAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomDebugMapColorOddAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomDebugMapColorOddAttributes& operator=(CustomDebugMapColorOddAttributes const&); + CustomDebugMapColorOddAttributes(CustomDebugMapColorOddAttributes const&); + CustomDebugMapColorOddAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomDebugMapColorOddAttributes@@UEAA@XZ + virtual ~CustomDebugMapColorOddAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomFoliageColorAttributes.h b/src/mc/world/level/biome/components/CustomFoliageColorAttributes.h new file mode 100644 index 0000000000..848c5be788 --- /dev/null +++ b/src/mc/world/level/biome/components/CustomFoliageColorAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomFoliageColorAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomFoliageColorAttributes& operator=(CustomFoliageColorAttributes const&); + CustomFoliageColorAttributes(CustomFoliageColorAttributes const&); + CustomFoliageColorAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomFoliageColorAttributes@@UEAA@XZ + virtual ~CustomFoliageColorAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomGrassColorAttributes.h b/src/mc/world/level/biome/components/CustomGrassColorAttributes.h new file mode 100644 index 0000000000..b4a8ff8edb --- /dev/null +++ b/src/mc/world/level/biome/components/CustomGrassColorAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomGrassColorAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomGrassColorAttributes& operator=(CustomGrassColorAttributes const&); + CustomGrassColorAttributes(CustomGrassColorAttributes const&); + CustomGrassColorAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomGrassColorAttributes@@UEAA@XZ + virtual ~CustomGrassColorAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomHumidityAttributes.h b/src/mc/world/level/biome/components/CustomHumidityAttributes.h new file mode 100644 index 0000000000..3d5b04df48 --- /dev/null +++ b/src/mc/world/level/biome/components/CustomHumidityAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomHumidityAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomHumidityAttributes& operator=(CustomHumidityAttributes const&); + CustomHumidityAttributes(CustomHumidityAttributes const&); + CustomHumidityAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomHumidityAttributes@@UEAA@XZ + virtual ~CustomHumidityAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomMapFoliageColorAttributes.h b/src/mc/world/level/biome/components/CustomMapFoliageColorAttributes.h new file mode 100644 index 0000000000..54a1bbd9ca --- /dev/null +++ b/src/mc/world/level/biome/components/CustomMapFoliageColorAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomMapFoliageColorAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomMapFoliageColorAttributes& operator=(CustomMapFoliageColorAttributes const&); + CustomMapFoliageColorAttributes(CustomMapFoliageColorAttributes const&); + CustomMapFoliageColorAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomMapFoliageColorAttributes@@UEAA@XZ + virtual ~CustomMapFoliageColorAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomMapGrassColorAttributes.h b/src/mc/world/level/biome/components/CustomMapGrassColorAttributes.h new file mode 100644 index 0000000000..56e6d0f062 --- /dev/null +++ b/src/mc/world/level/biome/components/CustomMapGrassColorAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomMapGrassColorAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomMapGrassColorAttributes& operator=(CustomMapGrassColorAttributes const&); + CustomMapGrassColorAttributes(CustomMapGrassColorAttributes const&); + CustomMapGrassColorAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomMapGrassColorAttributes@@UEAA@XZ + virtual ~CustomMapGrassColorAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/CustomSkyColorAttributes.h b/src/mc/world/level/biome/components/CustomSkyColorAttributes.h new file mode 100644 index 0000000000..a32029a34c --- /dev/null +++ b/src/mc/world/level/biome/components/CustomSkyColorAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CustomSkyColorAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + CustomSkyColorAttributes& operator=(CustomSkyColorAttributes const&); + CustomSkyColorAttributes(CustomSkyColorAttributes const&); + CustomSkyColorAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CustomSkyColorAttributes@@UEAA@XZ + virtual ~CustomSkyColorAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/MesaSurfaceAttributes.h b/src/mc/world/level/biome/components/MesaSurfaceAttributes.h index f25a17ca2f..57cdde5127 100644 --- a/src/mc/world/level/biome/components/MesaSurfaceAttributes.h +++ b/src/mc/world/level/biome/components/MesaSurfaceAttributes.h @@ -2,7 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" -struct MesaSurfaceAttributes { +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct MesaSurfaceAttributes : public ::BiomeComponentBase { public: // prevent constructor by default MesaSurfaceAttributes& operator=(MesaSurfaceAttributes const&); @@ -11,8 +14,11 @@ struct MesaSurfaceAttributes { public: // NOLINTBEGIN - // symbol: ??1MesaSurfaceAttributes@@QEAA@XZ - MCAPI ~MesaSurfaceAttributes(); + // vIndex: 0, symbol: ??1MesaSurfaceAttributes@@UEAA@XZ + virtual ~MesaSurfaceAttributes(); + + // symbol: ??0MesaSurfaceAttributes@@QEAA@$$QEAU0@@Z + MCAPI MesaSurfaceAttributes(struct MesaSurfaceAttributes&&); // NOLINTEND }; diff --git a/src/mc/world/level/biome/components/SurfaceBuilderComponent.h b/src/mc/world/level/biome/components/SurfaceBuilderComponent.h new file mode 100644 index 0000000000..fb37855a65 --- /dev/null +++ b/src/mc/world/level/biome/components/SurfaceBuilderComponent.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct SurfaceBuilderComponent : public ::BiomeComponentBase { +public: + // prevent constructor by default + SurfaceBuilderComponent& operator=(SurfaceBuilderComponent const&); + SurfaceBuilderComponent(SurfaceBuilderComponent const&); + SurfaceBuilderComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1SurfaceBuilderComponent@@UEAA@XZ + virtual ~SurfaceBuilderComponent() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/SurfaceMaterialAdjustmentAttributes.h b/src/mc/world/level/biome/components/SurfaceMaterialAdjustmentAttributes.h index 28b25ddcde..1941d2a18b 100644 --- a/src/mc/world/level/biome/components/SurfaceMaterialAdjustmentAttributes.h +++ b/src/mc/world/level/biome/components/SurfaceMaterialAdjustmentAttributes.h @@ -2,7 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" -struct SurfaceMaterialAdjustmentAttributes { +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct SurfaceMaterialAdjustmentAttributes : public ::BiomeComponentBase { public: // prevent constructor by default SurfaceMaterialAdjustmentAttributes& operator=(SurfaceMaterialAdjustmentAttributes const&); @@ -11,6 +14,9 @@ struct SurfaceMaterialAdjustmentAttributes { public: // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1SurfaceMaterialAdjustmentAttributes@@UEAA@XZ + virtual ~SurfaceMaterialAdjustmentAttributes() = default; + // symbol: // ?evaluateAdjustments@SurfaceMaterialAdjustmentAttributes@@QEBA?AUSurfaceMaterialAdjustmentEvaluated@@AEAVRenderParams@@V?$not_null@PEAVPerlinSimplexNoise@@@gsl@@AEBVBlockPos@@HH@Z MCAPI struct SurfaceMaterialAdjustmentEvaluated evaluateAdjustments( diff --git a/src/mc/world/level/biome/components/SurfaceMaterialAttributes.h b/src/mc/world/level/biome/components/SurfaceMaterialAttributes.h index 11d4280717..b1b22e32c8 100644 --- a/src/mc/world/level/biome/components/SurfaceMaterialAttributes.h +++ b/src/mc/world/level/biome/components/SurfaceMaterialAttributes.h @@ -2,14 +2,22 @@ #include "mc/_HeaderOutputPredefine.h" -struct SurfaceMaterialAttributes { +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct SurfaceMaterialAttributes : public ::BiomeComponentBase { public: // prevent constructor by default SurfaceMaterialAttributes& operator=(SurfaceMaterialAttributes const&); - SurfaceMaterialAttributes(); public: // NOLINTBEGIN + // vIndex: 0, symbol: ??1SurfaceMaterialAttributes@@UEAA@XZ + virtual ~SurfaceMaterialAttributes(); + + // symbol: ??0SurfaceMaterialAttributes@@QEAA@XZ + MCAPI SurfaceMaterialAttributes(); + // symbol: ??0SurfaceMaterialAttributes@@QEAA@$$QEAU0@@Z MCAPI SurfaceMaterialAttributes(struct SurfaceMaterialAttributes&&); @@ -19,8 +27,5 @@ struct SurfaceMaterialAttributes { // symbol: ??4SurfaceMaterialAttributes@@QEAAAEAU0@$$QEAU0@@Z MCAPI struct SurfaceMaterialAttributes& operator=(struct SurfaceMaterialAttributes&&); - // symbol: ??1SurfaceMaterialAttributes@@QEAA@XZ - MCAPI ~SurfaceMaterialAttributes(); - // NOLINTEND }; diff --git a/src/mc/world/level/biome/components/WorldGenClimateMappingAttributes.h b/src/mc/world/level/biome/components/WorldGenClimateMappingAttributes.h index 040a936a31..72c91d2b66 100644 --- a/src/mc/world/level/biome/components/WorldGenClimateMappingAttributes.h +++ b/src/mc/world/level/biome/components/WorldGenClimateMappingAttributes.h @@ -2,7 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" -class WorldGenClimateMappingAttributes { +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +class WorldGenClimateMappingAttributes : public ::BiomeComponentBase { public: // prevent constructor by default WorldGenClimateMappingAttributes& operator=(WorldGenClimateMappingAttributes const&); @@ -11,6 +14,9 @@ class WorldGenClimateMappingAttributes { public: // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1WorldGenClimateMappingAttributes@@UEAA@XZ + virtual ~WorldGenClimateMappingAttributes() = default; + // symbol: ??4WorldGenClimateMappingAttributes@@QEAAAEAV0@$$QEAV0@@Z MCAPI class WorldGenClimateMappingAttributes& operator=(class WorldGenClimateMappingAttributes&&); diff --git a/src/mc/world/level/biome/components/WorldGenMultiNoiseClimateAttributes.h b/src/mc/world/level/biome/components/WorldGenMultiNoiseClimateAttributes.h new file mode 100644 index 0000000000..5a584447c0 --- /dev/null +++ b/src/mc/world/level/biome/components/WorldGenMultiNoiseClimateAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +class WorldGenMultiNoiseClimateAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + WorldGenMultiNoiseClimateAttributes& operator=(WorldGenMultiNoiseClimateAttributes const&); + WorldGenMultiNoiseClimateAttributes(WorldGenMultiNoiseClimateAttributes const&); + WorldGenMultiNoiseClimateAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1WorldGenMultiNoiseClimateAttributes@@UEAA@XZ + virtual ~WorldGenMultiNoiseClimateAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/vanilla/CappedSurfaceAttributes.h b/src/mc/world/level/biome/components/vanilla/CappedSurfaceAttributes.h index 63378db62f..c5ea19d213 100644 --- a/src/mc/world/level/biome/components/vanilla/CappedSurfaceAttributes.h +++ b/src/mc/world/level/biome/components/vanilla/CappedSurfaceAttributes.h @@ -2,7 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" -struct CappedSurfaceAttributes { +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct CappedSurfaceAttributes : public ::BiomeComponentBase { public: // prevent constructor by default CappedSurfaceAttributes& operator=(CappedSurfaceAttributes const&); @@ -11,6 +14,9 @@ struct CappedSurfaceAttributes { public: // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1CappedSurfaceAttributes@@UEAA@XZ + virtual ~CappedSurfaceAttributes() = default; + // symbol: ?initializeNoise@CappedSurfaceAttributes@@QEAAXI@Z MCAPI void initializeNoise(uint levelSeed); diff --git a/src/mc/world/level/biome/components/vanilla/MountainAttributes.h b/src/mc/world/level/biome/components/vanilla/MountainAttributes.h index e626420bd4..341c58e460 100644 --- a/src/mc/world/level/biome/components/vanilla/MountainAttributes.h +++ b/src/mc/world/level/biome/components/vanilla/MountainAttributes.h @@ -2,7 +2,10 @@ #include "mc/_HeaderOutputPredefine.h" -struct MountainAttributes { +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct MountainAttributes : public ::BiomeComponentBase { public: // MountainAttributes inner types declare // clang-format off @@ -26,14 +29,14 @@ struct MountainAttributes { public: // NOLINTBEGIN + // vIndex: 0, symbol: ??1MountainAttributes@@UEAA@XZ + virtual ~MountainAttributes(); + // symbol: ??0MountainAttributes@@QEAA@$$QEAU0@@Z MCAPI MountainAttributes(struct MountainAttributes&&); // symbol: ??4MountainAttributes@@QEAAAEAU0@$$QEAU0@@Z MCAPI struct MountainAttributes& operator=(struct MountainAttributes&&); - // symbol: ??1MountainAttributes@@QEAA@XZ - MCAPI ~MountainAttributes(); - // NOLINTEND }; diff --git a/src/mc/world/level/biome/components/vanilla/OverworldHeightAttributes.h b/src/mc/world/level/biome/components/vanilla/OverworldHeightAttributes.h new file mode 100644 index 0000000000..845df37233 --- /dev/null +++ b/src/mc/world/level/biome/components/vanilla/OverworldHeightAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +class OverworldHeightAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + OverworldHeightAttributes& operator=(OverworldHeightAttributes const&); + OverworldHeightAttributes(OverworldHeightAttributes const&); + OverworldHeightAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1OverworldHeightAttributes@@UEAA@XZ + virtual ~OverworldHeightAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/components/vanilla/VanillaBiomeTypeAttributes.h b/src/mc/world/level/biome/components/vanilla/VanillaBiomeTypeAttributes.h new file mode 100644 index 0000000000..5a4e22f620 --- /dev/null +++ b/src/mc/world/level/biome/components/vanilla/VanillaBiomeTypeAttributes.h @@ -0,0 +1,21 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/biome/BiomeComponentBase.h" + +struct VanillaBiomeTypeAttributes : public ::BiomeComponentBase { +public: + // prevent constructor by default + VanillaBiomeTypeAttributes& operator=(VanillaBiomeTypeAttributes const&); + VanillaBiomeTypeAttributes(VanillaBiomeTypeAttributes const&); + VanillaBiomeTypeAttributes(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1VanillaBiomeTypeAttributes@@UEAA@XZ + virtual ~VanillaBiomeTypeAttributes() = default; + + // NOLINTEND +}; diff --git a/src/mc/world/level/biome/source/FixedBiomeSource.h b/src/mc/world/level/biome/source/FixedBiomeSource.h index cc3031c0b7..4ef319bd04 100644 --- a/src/mc/world/level/biome/source/FixedBiomeSource.h +++ b/src/mc/world/level/biome/source/FixedBiomeSource.h @@ -1,17 +1,12 @@ #pragma once #include "mc/_HeaderOutputPredefine.h" -#include "mc/world/level/biome/Biome.h" // auto generated inclusion list #include "mc/world/level/levelgen/v1/BiomeSource.h" -class Biome; - class FixedBiomeSource : public ::BiomeSource { public: - const Biome* mFixedBiome; - // prevent constructor by default FixedBiomeSource& operator=(FixedBiomeSource const&); FixedBiomeSource(FixedBiomeSource const&); @@ -35,12 +30,12 @@ class FixedBiomeSource : public ::BiomeSource { // vIndex: 4, symbol: ?containsOnly@FixedBiomeSource@@UEBA_NHHHHV?$span@$$CB_K$0?0@gsl@@@Z virtual bool containsOnly(int, int, int, int, gsl::span allowed) const; - // vIndex: 5, symbol: ?getBiome@FixedBiomeSource@@UEBAPEBVBiome@@HHH@Z - virtual class Biome const* getBiome(int blockX, int blockY, int blockZ) const; - - // vIndex: 6, symbol: ?getBiome@FixedBiomeSource@@UEBAPEBVBiome@@AEBUGetBiomeOptions@@@Z + // vIndex: 5, symbol: ?getBiome@FixedBiomeSource@@UEBAPEBVBiome@@AEBUGetBiomeOptions@@@Z virtual class Biome const* getBiome(struct GetBiomeOptions const&) const; + // vIndex: 6, symbol: ?getBiome@FixedBiomeSource@@UEBAPEBVBiome@@HHH@Z + virtual class Biome const* getBiome(int blockX, int, int blockZ) const; + // vIndex: 7, symbol: ?getBiome@FixedBiomeSource@@UEBAPEBVBiome@@AEBVBlockPos@@@Z virtual class Biome const* getBiome(class BlockPos const& blockPos) const; diff --git a/src/mc/world/level/biome/surface/CappedSurfaceBuilder.h b/src/mc/world/level/biome/surface/CappedSurfaceBuilder.h index c099e8088d..d095ecb40f 100644 --- a/src/mc/world/level/biome/surface/CappedSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/CappedSurfaceBuilder.h @@ -7,9 +7,9 @@ // auto generated forward declare list // clang-format off +class Biome; class Block; class BlockVolume; -class EntityContext; class ISurfaceBuilder; class Pos; // clang-format on @@ -61,8 +61,8 @@ class CappedSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1CappedSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~CappedSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@CappedSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext& entity, uint levelSeed); + // vIndex: 1, symbol: ?init@CappedSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@CappedSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/biome/surface/LegacyMesaSurfaceBuilder.h b/src/mc/world/level/biome/surface/LegacyMesaSurfaceBuilder.h index 9619111961..5c3bd1fc9a 100644 --- a/src/mc/world/level/biome/surface/LegacyMesaSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/LegacyMesaSurfaceBuilder.h @@ -8,7 +8,7 @@ // auto generated forward declare list // clang-format off -class EntityContext; +class Biome; class ISurfaceBuilder; class PerlinSimplexNoise; class Random; @@ -28,8 +28,8 @@ class LegacyMesaSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1LegacyMesaSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~LegacyMesaSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@LegacyMesaSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext& entity, uint levelSeed); + // vIndex: 1, symbol: ?init@LegacyMesaSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@LegacyMesaSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/biome/surface/MesaSurfaceBuilder.h b/src/mc/world/level/biome/surface/MesaSurfaceBuilder.h index b4c2ad66c2..6309529c12 100644 --- a/src/mc/world/level/biome/surface/MesaSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/MesaSurfaceBuilder.h @@ -8,9 +8,9 @@ // auto generated forward declare list // clang-format off +class Biome; class BlockPos; class BlockVolume; -class EntityContext; class ISurfaceBuilder; class Random; struct MesaSurfaceBlocks; @@ -31,8 +31,8 @@ class MesaSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1MesaSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~MesaSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@MesaSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext& entity, uint levelSeed); + // vIndex: 1, symbol: ?init@MesaSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@MesaSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/biome/surface/NetherSurfaceBuilder.h b/src/mc/world/level/biome/surface/NetherSurfaceBuilder.h index 850988d7e3..1cae1ba303 100644 --- a/src/mc/world/level/biome/surface/NetherSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/NetherSurfaceBuilder.h @@ -7,7 +7,7 @@ // auto generated forward declare list // clang-format off -class EntityContext; +class Biome; class ISurfaceBuilder; // clang-format on @@ -24,8 +24,8 @@ class NetherSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1NetherSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~NetherSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@NetherSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext& entity, uint levelSeed); + // vIndex: 1, symbol: ?init@NetherSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@NetherSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/biome/surface/OceanFrozenSurfaceBuilder.h b/src/mc/world/level/biome/surface/OceanFrozenSurfaceBuilder.h index 8b1ba34a2f..407f695c09 100644 --- a/src/mc/world/level/biome/surface/OceanFrozenSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/OceanFrozenSurfaceBuilder.h @@ -7,7 +7,7 @@ // auto generated forward declare list // clang-format off -class EntityContext; +class Biome; class ISurfaceBuilder; // clang-format on @@ -25,8 +25,8 @@ class OceanFrozenSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1OceanFrozenSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~OceanFrozenSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@OceanFrozenSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext& entity, uint levelSeed); + // vIndex: 1, symbol: ?init@OceanFrozenSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@OceanFrozenSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/biome/surface/OverworldDefaultSurfaceBuilder.h b/src/mc/world/level/biome/surface/OverworldDefaultSurfaceBuilder.h index 7a12555c47..7f681b385d 100644 --- a/src/mc/world/level/biome/surface/OverworldDefaultSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/OverworldDefaultSurfaceBuilder.h @@ -7,7 +7,7 @@ // auto generated forward declare list // clang-format off -class EntityContext; +class Biome; class ISurfaceBuilder; // clang-format on @@ -25,8 +25,8 @@ class OverworldDefaultSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1OverworldDefaultSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~OverworldDefaultSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@OverworldDefaultSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext& entity, uint); + // vIndex: 1, symbol: ?init@OverworldDefaultSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@OverworldDefaultSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/biome/surface/SwampSurfaceBuilder.h b/src/mc/world/level/biome/surface/SwampSurfaceBuilder.h index 9f0adc4764..ed3b915398 100644 --- a/src/mc/world/level/biome/surface/SwampSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/SwampSurfaceBuilder.h @@ -7,7 +7,7 @@ // auto generated forward declare list // clang-format off -class EntityContext; +class Biome; class ISurfaceBuilder; // clang-format on @@ -25,8 +25,8 @@ class SwampSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1SwampSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~SwampSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@SwampSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext& entity, uint); + // vIndex: 1, symbol: ?init@SwampSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@SwampSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/biome/surface/TheEndSurfaceBuilder.h b/src/mc/world/level/biome/surface/TheEndSurfaceBuilder.h index 4e6a1f405d..a098a86f04 100644 --- a/src/mc/world/level/biome/surface/TheEndSurfaceBuilder.h +++ b/src/mc/world/level/biome/surface/TheEndSurfaceBuilder.h @@ -7,7 +7,7 @@ // auto generated forward declare list // clang-format off -class EntityContext; +class Biome; class ISurfaceBuilder; // clang-format on @@ -25,8 +25,8 @@ class TheEndSurfaceBuilder : public ::ISurfaceBuilder { // vIndex: 0, symbol: __gen_??1TheEndSurfaceBuilder@VanillaSurfaceBuilders@@UEAA@XZ virtual ~TheEndSurfaceBuilder() = default; - // vIndex: 1, symbol: ?init@TheEndSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVEntityContext@@I@Z - virtual void init(class EntityContext&, uint); + // vIndex: 1, symbol: ?init@TheEndSurfaceBuilder@VanillaSurfaceBuilders@@UEAAXAEAVBiome@@I@Z + virtual void init(class Biome&, uint); // vIndex: 2, symbol: // ?buildSurfaceAt@TheEndSurfaceBuilder@VanillaSurfaceBuilders@@UEBAXAEBUBuildParameters@ISurfaceBuilder@@@Z diff --git a/src/mc/world/level/block/AbstractCandleBlock.h b/src/mc/world/level/block/AbstractCandleBlock.h index 17994de080..a1c20fc805 100644 --- a/src/mc/world/level/block/AbstractCandleBlock.h +++ b/src/mc/world/level/block/AbstractCandleBlock.h @@ -43,32 +43,33 @@ class AbstractCandleBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@AbstractCandleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 137, symbol: ?getLightEmission@AbstractCandleBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@AbstractCandleBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const& block) const; - // vIndex: 150, symbol: ?tick@AbstractCandleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@AbstractCandleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 166, symbol: ?_onHitByActivatingAttack@AbstractCandleBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // vIndex: 160, symbol: + // ?_onHitByActivatingAttack@AbstractCandleBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; - // vIndex: 167, symbol: ?entityInside@AbstractCandleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@AbstractCandleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; - // vIndex: 168, symbol: ?_getNumCandles@AbstractCandleBlock@@MEBAHAEBVBlock@@@Z + // vIndex: 163, symbol: ?_getNumCandles@AbstractCandleBlock@@MEBAHAEBVBlock@@@Z virtual int _getNumCandles(class Block const&) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?_iterateCandles@AbstractCandleBlock@@MEBAXAEBVBlock@@AEBVBlockPos@@V?$function@$$A6AXAEBVVec3@@H@Z@std@@@Z virtual void _iterateCandles(class Block const&, class BlockPos const&, std::function callback) const; - // vIndex: 170, symbol: ?_tryLightOnFire@AbstractCandleBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + // vIndex: 165, symbol: ?_tryLightOnFire@AbstractCandleBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z virtual void _tryLightOnFire(class BlockSource&, class BlockPos const&, class Actor*) const; // symbol: diff --git a/src/mc/world/level/block/AcaciaLeavesBlock.h b/src/mc/world/level/block/AcaciaLeavesBlock.h new file mode 100644 index 0000000000..c1e8636339 --- /dev/null +++ b/src/mc/world/level/block/AcaciaLeavesBlock.h @@ -0,0 +1,42 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/WeakPtr.h" +#include "mc/common/wrapper/optional_ref.h" +#include "mc/enums/FertilizerType.h" +#include "mc/enums/Flip.h" +#include "mc/enums/ShapeType.h" +#include "mc/world/Direction.h" +#include "mc/world/level/block/LeavesBlock.h" +#include "mc/world/level/block/utils/BlockProperty.h" +#include "mc/world/level/block/utils/BlockRenderLayer.h" +#include "mc/world/level/block/utils/BlockSupportType.h" + +// auto generated forward declare list +// clang-format off +namespace mce { class Color; } +// clang-format on + +class AcaciaLeavesBlock : public ::LeavesBlock { +public: + // prevent constructor by default + AcaciaLeavesBlock& operator=(AcaciaLeavesBlock const&); + AcaciaLeavesBlock(AcaciaLeavesBlock const&); + AcaciaLeavesBlock(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1AcaciaLeavesBlock@@UEAA@XZ + virtual ~AcaciaLeavesBlock() = default; + + // vIndex: 128, symbol: ?getVariant@AcaciaLeavesBlock@@UEBAHAEBVBlock@@@Z + virtual int getVariant(class Block const&) const; + + // symbol: + // ??0AcaciaLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z + MCAPI AcaciaLeavesBlock(std::string const&, int, class WeakPtr); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/ActivatorRailBlock.h b/src/mc/world/level/block/ActivatorRailBlock.h index d0a484ac07..99fafc11bf 100644 --- a/src/mc/world/level/block/ActivatorRailBlock.h +++ b/src/mc/world/level/block/ActivatorRailBlock.h @@ -34,7 +34,7 @@ class ActivatorRailBlock : public ::BaseRailBlock { virtual void onRedstoneUpdate(class BlockSource& source, class BlockPos const& pos, int strength, bool isFirstTime) const; - // vIndex: 129, symbol: ?getVariant@ActivatorRailBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ActivatorRailBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; // symbol: ??0ActivatorRailBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ActorBlock.h b/src/mc/world/level/block/ActorBlock.h index 9f290bc122..f609c56040 100644 --- a/src/mc/world/level/block/ActorBlock.h +++ b/src/mc/world/level/block/ActorBlock.h @@ -34,7 +34,7 @@ class ActorBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 105, symbol: ?triggerEvent@ActorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z + // vIndex: 104, symbol: ?triggerEvent@ActorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z virtual void triggerEvent(class BlockSource& region, class BlockPos const& pos, int b0, int b1) const; // NOLINTEND diff --git a/src/mc/world/level/block/AirBlock.h b/src/mc/world/level/block/AirBlock.h index 775bd0b352..6f0a018714 100644 --- a/src/mc/world/level/block/AirBlock.h +++ b/src/mc/world/level/block/AirBlock.h @@ -107,10 +107,10 @@ class AirBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 135, symbol: ?animateTick@AirBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 134, symbol: ?animateTick@AirBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 150, symbol: ?tick@AirBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@AirBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: ??0AirBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z diff --git a/src/mc/world/level/block/AmethystClusterBlock.h b/src/mc/world/level/block/AmethystClusterBlock.h index 1c7b2ed352..d660fbbb82 100644 --- a/src/mc/world/level/block/AmethystClusterBlock.h +++ b/src/mc/world/level/block/AmethystClusterBlock.h @@ -50,21 +50,15 @@ class AmethystClusterBlock : public ::AmethystBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 136, symbol: ?init@AmethystClusterBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@AmethystClusterBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 150, symbol: ?tick@AmethystClusterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@AmethystClusterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@AmethystClusterBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@AmethystClusterBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@AmethystClusterBlock@@EEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@AmethystClusterBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - // symbol: ??0AmethystClusterBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HHH@Z MCAPI AmethystClusterBlock(std::string const& nameId, int id, int height, int); diff --git a/src/mc/world/level/block/AnvilBlock.h b/src/mc/world/level/block/AnvilBlock.h index fbc0b41081..8d85802a88 100644 --- a/src/mc/world/level/block/AnvilBlock.h +++ b/src/mc/world/level/block/AnvilBlock.h @@ -55,39 +55,36 @@ class AnvilBlock : public ::FallingBlock { // vIndex: 89, symbol: ?breaksFallingBlocks@AnvilBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 96, symbol: ?asItemInstance@AnvilBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@AnvilBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@AnvilBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@AnvilBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@AnvilBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@AnvilBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@AnvilBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 135, symbol: ?animateTick@AnvilBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 134, symbol: ?animateTick@AnvilBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 138, symbol: ?canBeSilkTouched@AnvilBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 152, symbol: ?isInteractiveBlock@AnvilBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@AnvilBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@AnvilBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@AnvilBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 168, symbol: ?getDustColor@AnvilBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@AnvilBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@AnvilBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; - // vIndex: 171, symbol: ?onLand@AnvilBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 166, symbol: ?onLand@AnvilBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onLand(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0AnvilBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/AzaleaLeavesBlock.h b/src/mc/world/level/block/AzaleaLeavesBlock.h index b57f4b835c..2b6b67068b 100644 --- a/src/mc/world/level/block/AzaleaLeavesBlock.h +++ b/src/mc/world/level/block/AzaleaLeavesBlock.h @@ -31,21 +31,21 @@ class AzaleaLeavesBlock : public ::LeavesBlock { // vIndex: 0, symbol: __gen_??1AzaleaLeavesBlock@@UEAA@XZ virtual ~AzaleaLeavesBlock() = default; - // vIndex: 122, symbol: ?getColor@AzaleaLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@AzaleaLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource&, class BlockPos const&, class Block const&) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@AzaleaLeavesBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@AzaleaLeavesBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 129, symbol: ?getVariant@AzaleaLeavesBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@AzaleaLeavesBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const&) const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@AzaleaLeavesBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const&, class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: + // vIndex: 159, symbol: // ?getMapColor@AzaleaLeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; diff --git a/src/mc/world/level/block/BambooSaplingBlock.h b/src/mc/world/level/block/BambooSaplingBlock.h index 8dcb260a46..419155c924 100644 --- a/src/mc/world/level/block/BambooSaplingBlock.h +++ b/src/mc/world/level/block/BambooSaplingBlock.h @@ -56,19 +56,19 @@ class BambooSaplingBlock : public ::SaplingBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@BambooSaplingBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BambooSaplingBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@BambooSaplingBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@BambooSaplingBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@BambooSaplingBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BambooSaplingBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 151, symbol: ?randomTick@BambooSaplingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@BambooSaplingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@BambooSaplingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BambooSaplingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0BambooSaplingBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BambooStalkBlock.h b/src/mc/world/level/block/BambooStalkBlock.h index adfc94a3f6..a8ded62326 100644 --- a/src/mc/world/level/block/BambooStalkBlock.h +++ b/src/mc/world/level/block/BambooStalkBlock.h @@ -78,23 +78,20 @@ class BambooStalkBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@BambooStalkBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@BambooStalkBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock(class Actor const& by, class BlockPos const& pos, uchar, class Vec3 const&, int) const; - // vIndex: 138, symbol: ?canBeSilkTouched@BambooStalkBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@BambooStalkBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BambooStalkBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@BambooStalkBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BambooStalkBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 151, symbol: ?randomTick@BambooStalkBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@BambooStalkBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@BambooStalkBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BambooStalkBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0BambooStalkBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BannerBlock.h b/src/mc/world/level/block/BannerBlock.h index a073120c52..5f423bcb7d 100644 --- a/src/mc/world/level/block/BannerBlock.h +++ b/src/mc/world/level/block/BannerBlock.h @@ -47,19 +47,19 @@ class BannerBlock : public ::ActorBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@BannerBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BannerBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const* blockActor) const; - // vIndex: 129, symbol: ?getVariant@BannerBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BannerBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@BannerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BannerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@BannerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BannerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@BannerBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BannerBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0BannerBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/BarrelBlock.h b/src/mc/world/level/block/BarrelBlock.h index 5c4680f5e7..52da81f175 100644 --- a/src/mc/world/level/block/BarrelBlock.h +++ b/src/mc/world/level/block/BarrelBlock.h @@ -36,27 +36,27 @@ class BarrelBlock : public ::FaceDirectionalBlock { // vIndex: 46, symbol: ?isSignalSource@BarrelBlock@@UEBA_NXZ virtual bool isSignalSource() const; - // vIndex: 111, symbol: ?hasComparatorSignal@BarrelBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@BarrelBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@BarrelBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@BarrelBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 129, symbol: ?getVariant@BarrelBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BarrelBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 133, symbol: ?getFaceFlip@BarrelBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@BarrelBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar face, class Block const& block) const; - // vIndex: 144, symbol: ?onRemove@BarrelBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@BarrelBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@BarrelBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@BarrelBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@BarrelBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BarrelBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0BarrelBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z diff --git a/src/mc/world/level/block/BarrierBlock.h b/src/mc/world/level/block/BarrierBlock.h index fcbc129293..6156500195 100644 --- a/src/mc/world/level/block/BarrierBlock.h +++ b/src/mc/world/level/block/BarrierBlock.h @@ -36,7 +36,7 @@ class BarrierBlock : public ::BlockLegacy { // vIndex: 56, symbol: ?canContainLiquid@BarrierBlock@@UEBA_NXZ virtual bool canContainLiquid() const; - // vIndex: 127, symbol: ?getShadeBrightness@BarrierBlock@@UEBAMAEBVBlock@@@Z + // vIndex: 126, symbol: ?getShadeBrightness@BarrierBlock@@UEBAMAEBVBlock@@@Z virtual float getShadeBrightness(class Block const&) const; // symbol: ??0BarrierBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BasePressurePlateBlock.h b/src/mc/world/level/block/BasePressurePlateBlock.h index a0886f2025..28fe6af87c 100644 --- a/src/mc/world/level/block/BasePressurePlateBlock.h +++ b/src/mc/world/level/block/BasePressurePlateBlock.h @@ -60,49 +60,46 @@ class BasePressurePlateBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 100, symbol: ?isAttachedTo@BasePressurePlateBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z + // vIndex: 99, symbol: ?isAttachedTo@BasePressurePlateBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z virtual bool isAttachedTo(class BlockSource& region, class BlockPos const& pos, class BlockPos& outAttachedTo) const; - // vIndex: 102, symbol: + // vIndex: 101, symbol: // ?shouldTriggerEntityInside@BasePressurePlateBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual bool shouldTriggerEntityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; - // vIndex: 129, symbol: ?getVariant@BasePressurePlateBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BasePressurePlateBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 130, symbol: ?canSpawnOn@BasePressurePlateBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@BasePressurePlateBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 147, symbol: ?onPlace@BasePressurePlateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BasePressurePlateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@BasePressurePlateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BasePressurePlateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@BasePressurePlateBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BasePressurePlateBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 165, symbol: ?getSilkTouchItemInstance@BasePressurePlateBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - - // vIndex: 167, symbol: ?entityInside@BasePressurePlateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@BasePressurePlateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; - // vIndex: 168, symbol: ?getTickDelay@BasePressurePlateBlock@@UEBAHXZ + // vIndex: 163, symbol: ?getTickDelay@BasePressurePlateBlock@@UEBAHXZ virtual int getTickDelay() const; - // vIndex: 169, symbol: ?getSignalStrength@PressurePlateBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 164, symbol: ?getSignalStrength@PressurePlateBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getSignalStrength(class BlockSource& region, class BlockPos const& pos) const = 0; - // vIndex: 170, symbol: ?getSignalForData@PressurePlateBlock@@MEBAHH@Z + // vIndex: 165, symbol: ?getSignalForData@PressurePlateBlock@@MEBAHH@Z virtual int getSignalForData(int data) const = 0; - // vIndex: 171, symbol: ?getRedstoneSignal@PressurePlateBlock@@MEBAHH@Z + // vIndex: 166, symbol: ?getRedstoneSignal@PressurePlateBlock@@MEBAHH@Z virtual int getRedstoneSignal(int signal) const = 0; - // vIndex: 172, symbol: ?getSensitiveAABB@BasePressurePlateBlock@@MEBA?BVAABB@@AEBVBlockPos@@@Z + // vIndex: 167, symbol: ?getSensitiveAABB@BasePressurePlateBlock@@MEBA?BVAABB@@AEBVBlockPos@@@Z virtual class AABB const getSensitiveAABB(class BlockPos const& pos) const; // NOLINTEND diff --git a/src/mc/world/level/block/BaseRailBlock.h b/src/mc/world/level/block/BaseRailBlock.h index 3fa9a7f13d..d359596297 100644 --- a/src/mc/world/level/block/BaseRailBlock.h +++ b/src/mc/world/level/block/BaseRailBlock.h @@ -114,22 +114,22 @@ class BaseRailBlock : public ::BlockLegacy { // vIndex: 92, symbol: ?neighborChanged@BaseRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@1@Z virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const&) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@BaseRailBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@BaseRailBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 130, symbol: ?canSpawnOn@BaseRailBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@BaseRailBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 147, symbol: ?onPlace@BaseRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BaseRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@BaseRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BaseRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@BaseRailBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BaseRailBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@BaseRailBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const&, class BlockSource& region, class BlockPos const& pos) const; diff --git a/src/mc/world/level/block/BeaconBlock.h b/src/mc/world/level/block/BeaconBlock.h index 61c5cbe73a..8bbc499efe 100644 --- a/src/mc/world/level/block/BeaconBlock.h +++ b/src/mc/world/level/block/BeaconBlock.h @@ -33,10 +33,10 @@ class BeaconBlock : public ::ActorBlock { // vIndex: 56, symbol: ?canContainLiquid@BeaconBlock@@UEBA_NXZ virtual bool canContainLiquid() const; - // vIndex: 152, symbol: ?isInteractiveBlock@BeaconBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@BeaconBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@BeaconBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BeaconBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0BeaconBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BedBlock.h b/src/mc/world/level/block/BedBlock.h index ad89db52b1..f1a2d541e3 100644 --- a/src/mc/world/level/block/BedBlock.h +++ b/src/mc/world/level/block/BedBlock.h @@ -15,6 +15,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -66,44 +67,43 @@ class BedBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 96, symbol: ?asItemInstance@BedBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BedBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const* blockActor) const; - // vIndex: 115, symbol: ?canSpawnAt@BedBlock@@UEBA_NAEBVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 114, symbol: ?canSpawnAt@BedBlock@@UEBA_NAEBVBlockSource@@AEBVBlockPos@@@Z virtual bool canSpawnAt(class BlockSource const& region, class BlockPos const& pos) const; - // vIndex: 128, symbol: ?telemetryVariant@BedBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 127, symbol: ?telemetryVariant@BedBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int telemetryVariant(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@BedBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BedBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@BedBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@BedBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@BedBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@BedBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 147, symbol: ?onPlace@BedBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BedBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 148, symbol: ?onFallOn@BedBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; - - // vIndex: 152, symbol: ?isInteractiveBlock@BedBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@BedBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@BedBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BedBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 162, symbol: ?getMapColor@BedBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@BedBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& source, class BlockPos const& pos, class Block const& block) const; // symbol: ??0BedBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI BedBlock(std::string const& nameId, int id); + // symbol: ?onFallOn@BedBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // symbol: // ?findWakeupPosition@BedBlock@@SA?AV?$optional@VBlockPos@@@std@@AEAVBlockSource@@AEBVBlockPos@@AEBV?$optional@VVec3@@@3@@Z MCAPI static std::optional diff --git a/src/mc/world/level/block/BedrockBlock.h b/src/mc/world/level/block/BedrockBlock.h index 1bff10e48b..2d47f77978 100644 --- a/src/mc/world/level/block/BedrockBlock.h +++ b/src/mc/world/level/block/BedrockBlock.h @@ -33,12 +33,9 @@ class BedrockBlock : public ::BlockLegacy { // vIndex: 47, symbol: ?canBeOriginalSurface@BedrockBlock@@UEBA_NXZ virtual bool canBeOriginalSurface() const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@BedrockBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@BedrockBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 165, symbol: ?getSilkTouchItemInstance@BedrockBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - // symbol: ??0BedrockBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI BedrockBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/BeehiveBlock.h b/src/mc/world/level/block/BeehiveBlock.h index 30624f6b50..6bda81b770 100644 --- a/src/mc/world/level/block/BeehiveBlock.h +++ b/src/mc/world/level/block/BeehiveBlock.h @@ -37,7 +37,7 @@ class BeehiveBlock : public ::FaceDirectionalActorBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 106, symbol: + // vIndex: 105, symbol: // ?executeEvent@BeehiveBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVActor@@@Z virtual void executeEvent( class BlockSource& region, @@ -47,24 +47,24 @@ class BeehiveBlock : public ::FaceDirectionalActorBlock { class Actor& sourceEntity ) const; - // vIndex: 111, symbol: ?hasComparatorSignal@BeehiveBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@BeehiveBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@BeehiveBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@BeehiveBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 129, symbol: ?getVariant@BeehiveBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BeehiveBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@BeehiveBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@BeehiveBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@BeehiveBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@BeehiveBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 154, symbol: ?use@BeehiveBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BeehiveBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0BeehiveBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BeetrootBlock.h b/src/mc/world/level/block/BeetrootBlock.h index 3d09b8e254..6a0a3a2bcf 100644 --- a/src/mc/world/level/block/BeetrootBlock.h +++ b/src/mc/world/level/block/BeetrootBlock.h @@ -41,10 +41,10 @@ class BeetrootBlock : public ::CropBlock { virtual class AABB const& getOutline(class Block const&, class IConstBlockSource const&, class BlockPos const&, class AABB&) const; - // vIndex: 129, symbol: ?getVariant@BeetrootBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BeetrootBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 170, symbol: ?getBaseSeed@BeetrootBlock@@UEBA?BVItemInstance@@XZ + // vIndex: 165, symbol: ?getBaseSeed@BeetrootBlock@@UEBA?BVItemInstance@@XZ virtual class ItemInstance const getBaseSeed() const; // symbol: ??0BeetrootBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BellBlock.h b/src/mc/world/level/block/BellBlock.h index ebadd700e1..4fd74f9cd3 100644 --- a/src/mc/world/level/block/BellBlock.h +++ b/src/mc/world/level/block/BellBlock.h @@ -56,7 +56,7 @@ class BellBlock : public ::ActorBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@BellBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@BellBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -65,28 +65,25 @@ class BellBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 147, symbol: ?onPlace@BellBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BellBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@BellBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BellBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@BellBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@BellBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@BellBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BellBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@BellBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BellBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 165, symbol: ?getSilkTouchItemInstance@BellBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; + // vIndex: 160, symbol: ?_onHitByActivatingAttack@BellBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; - // vIndex: 166, symbol: ?_onHitByActivatingAttack@BellBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; - - // vIndex: 167, symbol: ?entityInside@BellBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@BellBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& actor) const; // symbol: ??0BellBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BigDripleafBlock.h b/src/mc/world/level/block/BigDripleafBlock.h index f0deb36ed3..bea8ccff1d 100644 --- a/src/mc/world/level/block/BigDripleafBlock.h +++ b/src/mc/world/level/block/BigDripleafBlock.h @@ -79,22 +79,19 @@ class BigDripleafBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 136, symbol: ?init@BigDripleafBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@BigDripleafBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 138, symbol: ?canBeSilkTouched@BigDripleafBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@BigDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BigDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@BigDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BigDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@BigDripleafBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BigDripleafBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 167, symbol: ?entityInside@BigDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@BigDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0BigDripleafBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BirchLeavesBlock.h b/src/mc/world/level/block/BirchLeavesBlock.h new file mode 100644 index 0000000000..12c828b80b --- /dev/null +++ b/src/mc/world/level/block/BirchLeavesBlock.h @@ -0,0 +1,53 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/WeakPtr.h" +#include "mc/common/wrapper/optional_ref.h" +#include "mc/enums/FertilizerType.h" +#include "mc/enums/Flip.h" +#include "mc/enums/ShapeType.h" +#include "mc/world/Direction.h" +#include "mc/world/level/block/LeavesBlock.h" +#include "mc/world/level/block/utils/BlockProperty.h" +#include "mc/world/level/block/utils/BlockRenderLayer.h" +#include "mc/world/level/block/utils/BlockSupportType.h" + +// auto generated forward declare list +// clang-format off +namespace mce { class Color; } +// clang-format on + +class BirchLeavesBlock : public ::LeavesBlock { +public: + // prevent constructor by default + BirchLeavesBlock& operator=(BirchLeavesBlock const&); + BirchLeavesBlock(BirchLeavesBlock const&); + BirchLeavesBlock(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BirchLeavesBlock@@UEAA@XZ + virtual ~BirchLeavesBlock() = default; + + // vIndex: 121, symbol: ?getColor@BirchLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual int getColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // vIndex: 128, symbol: ?getVariant@BirchLeavesBlock@@UEBAHAEBVBlock@@@Z + virtual int getVariant(class Block const&) const; + + // vIndex: 155, symbol: + // ?getRenderLayer@BirchLeavesBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z + virtual ::BlockRenderLayer getRenderLayer(class Block const&, class BlockSource&, class BlockPos const&) const; + + // vIndex: 159, symbol: + // ?getMapColor@BirchLeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // symbol: + // ??0BirchLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z + MCAPI BirchLeavesBlock(std::string const&, int, class WeakPtr); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/BlastFurnaceBlock.h b/src/mc/world/level/block/BlastFurnaceBlock.h index e0603a8023..e5a6a2a178 100644 --- a/src/mc/world/level/block/BlastFurnaceBlock.h +++ b/src/mc/world/level/block/BlastFurnaceBlock.h @@ -30,10 +30,10 @@ class BlastFurnaceBlock : public ::FurnaceBlock { // vIndex: 0, symbol: __gen_??1BlastFurnaceBlock@@UEAA@XZ virtual ~BlastFurnaceBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@BlastFurnaceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BlastFurnaceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 154, symbol: ?use@BlastFurnaceBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BlastFurnaceBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0BlastFurnaceBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/Block.h b/src/mc/world/level/block/Block.h index 5250d7305c..c4243a3596 100644 --- a/src/mc/world/level/block/Block.h +++ b/src/mc/world/level/block/Block.h @@ -8,6 +8,7 @@ #include "mc/enums/ShapeType.h" #include "mc/world/level/block/BlockLegacy.h" #include "mc/world/level/block/utils/BlockActorType.h" +#include "mc/world/level/block/utils/BlockClientPredictionOverrides.h" #include "mc/world/level/block/utils/BlockProperty.h" #include "mc/world/level/block/utils/BlockRenderLayer.h" #include "mc/world/level/block/utils/BlockSupportType.h" @@ -222,6 +223,9 @@ class Block { // symbol: ?getBurnOdds@Block@@QEBAHXZ MCAPI int getBurnOdds() const; + // symbol: ?getClientPredictionOverride@Block@@QEBA_NW4BlockClientPredictionOverrides@@@Z + MCAPI bool getClientPredictionOverride(::BlockClientPredictionOverrides) const; + // symbol: // ?getCollisionShape@Block@@QEBA_NAEAVAABB@@AEBVIConstBlockSource@@AEBVBlockPos@@V?$optional_ref@$$CBVGetCollisionShapeInterface@@@@@Z MCAPI bool getCollisionShape( @@ -507,8 +511,8 @@ class Block { onFertilized(class BlockSource& region, class BlockPos const& pos, class Actor* entity, ::FertilizerType fType) const; - // symbol: ?onHitByActivatingAttack@Block@@QEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - MCAPI void onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // symbol: ?onHitByActivatingAttack@Block@@QEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + MCAPI void onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; // symbol: ?onLightningHit@Block@@QEBAXAEAVBlockSource@@AEBVBlockPos@@@Z MCAPI void onLightningHit(class BlockSource& region, class BlockPos const& pos) const; @@ -516,8 +520,8 @@ class Block { // symbol: ?onPlace@Block@@QEBAXAEAVBlockSource@@AEBVBlockPos@@AEBV1@@Z MCAPI void onPlace(class BlockSource& region, class BlockPos const& pos, class Block const& previousBlock) const; - // symbol: ?onPlayerPlacing@Block@@QEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@E@Z - MCAPI void + // symbol: ?onPlayerPlacing@Block@@QEBAPEBV1@AEAVBlockSource@@AEBVBlockPos@@AEAVActor@@E@Z + MCAPI class Block const* onPlayerPlacing(class BlockSource& region, class BlockPos const& pos, class Actor& actor, uchar face) const; // symbol: ?onProjectileHit@Block@@QEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVActor@@@Z diff --git a/src/mc/world/level/block/BlockDescriptor.h b/src/mc/world/level/block/BlockDescriptor.h index 24a6003692..ffaebce2fe 100644 --- a/src/mc/world/level/block/BlockDescriptor.h +++ b/src/mc/world/level/block/BlockDescriptor.h @@ -119,6 +119,9 @@ class BlockDescriptor { // symbol: ??8BlockDescriptor@@QEBA_NAEBV0@@Z MCAPI bool operator==(class BlockDescriptor const& rhs) const; + // symbol: ?setContentLogOnError@BlockDescriptor@@QEBAX_N@Z + MCAPI void setContentLogOnError(bool) const; + // symbol: // ?toCompoundTag@BlockDescriptor@@QEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@XZ MCAPI std::unique_ptr toCompoundTag() const; diff --git a/src/mc/world/level/block/BlockLegacy.h b/src/mc/world/level/block/BlockLegacy.h index b0cdfbdda4..d4c31aa7ea 100644 --- a/src/mc/world/level/block/BlockLegacy.h +++ b/src/mc/world/level/block/BlockLegacy.h @@ -15,6 +15,7 @@ #include "mc/enums/ShapeType.h" #include "mc/world/Direction.h" #include "mc/world/level/block/utils/BlockActorType.h" +#include "mc/world/level/block/utils/BlockClientPredictionOverrides.h" #include "mc/world/level/block/utils/BlockProperty.h" #include "mc/world/level/block/utils/BlockRenderLayer.h" #include "mc/world/level/block/utils/BlockShape.h" @@ -23,6 +24,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace BlockTrait { class IGetPlacementBlockCallback; } namespace BlockTrait { class ITrait; } namespace mce { class Color; } @@ -521,16 +523,10 @@ class BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 95, symbol: - // ?spawnResources@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z - virtual void - spawnResources(class BlockSource& region, class BlockPos const& pos, class Block const& block, class Randomize& randomize, struct ResourceDropsContext const&) - const; - - // vIndex: 96, symbol: ?asItemInstance@BlockLegacy@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BlockLegacy@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 97, symbol: + // vIndex: 96, symbol: // ?trySpawnResourcesOnExplosion@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAVRandomize@@M@Z virtual void trySpawnResourcesOnExplosion( class BlockSource& region, @@ -540,7 +536,7 @@ class BlockLegacy { float explosionRadius ) const; - // vIndex: 98, symbol: ?getPlacementBlock@BlockLegacy@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@BlockLegacy@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -549,32 +545,32 @@ class BlockLegacy { int itemValue ) const; - // vIndex: 99, symbol: ?calcVariant@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVColor@mce@@@Z + // vIndex: 98, symbol: ?calcVariant@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVColor@mce@@@Z virtual int calcVariant(class BlockSource& region, class BlockPos const& pos, class mce::Color const& baseColor) const; - // vIndex: 100, symbol: ?isAttachedTo@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z + // vIndex: 99, symbol: ?isAttachedTo@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z virtual bool isAttachedTo(class BlockSource& region, class BlockPos const& pos, class BlockPos& outAttachedTo) const; - // vIndex: 101, symbol: ?attack@BlockLegacy@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z + // vIndex: 100, symbol: ?attack@BlockLegacy@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z virtual bool attack(class Player* player, class BlockPos const& pos) const; - // vIndex: 102, symbol: ?shouldTriggerEntityInside@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 101, symbol: ?shouldTriggerEntityInside@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual bool shouldTriggerEntityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; - // vIndex: 103, symbol: ?canBeBuiltOver@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlockItem@@@Z + // vIndex: 102, symbol: ?canBeBuiltOver@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlockItem@@@Z virtual bool canBeBuiltOver(class BlockSource& region, class BlockPos const& pos, class BlockItem const& newItem) const; - // vIndex: 104, symbol: ?canBeBuiltOver@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 103, symbol: ?canBeBuiltOver@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canBeBuiltOver(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 105, symbol: ?triggerEvent@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z + // vIndex: 104, symbol: ?triggerEvent@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z virtual void triggerEvent(class BlockSource& region, class BlockPos const& pos, int b0, int b1) const; - // vIndex: 106, symbol: + // vIndex: 105, symbol: // ?executeEvent@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVActor@@@Z virtual void executeEvent( class BlockSource& region, @@ -584,195 +580,185 @@ class BlockLegacy { class Actor& sourceEntity ) const; - // vIndex: 107, symbol: ?getMobToSpawn@BlockLegacy@@UEBAPEBVMobSpawnerData@@AEBVSpawnConditions@@AEAVBlockSource@@@Z + // vIndex: 106, symbol: ?getMobToSpawn@BlockLegacy@@UEBAPEBVMobSpawnerData@@AEBVSpawnConditions@@AEAVBlockSource@@@Z virtual class MobSpawnerData const* getMobToSpawn(class SpawnConditions const& conditions, class BlockSource& region) const; - // vIndex: 108, symbol: ?shouldStopFalling@BlockLegacy@@UEBA_NAEAVActor@@@Z + // vIndex: 107, symbol: ?shouldStopFalling@BlockLegacy@@UEBA_NAEAVActor@@@Z virtual bool shouldStopFalling(class Actor& entity) const; - // vIndex: 109, symbol: ?pushesUpFallingBlocks@BlockLegacy@@UEBA_NXZ + // vIndex: 108, symbol: ?pushesUpFallingBlocks@BlockLegacy@@UEBA_NXZ virtual bool pushesUpFallingBlocks() const; - // vIndex: 110, symbol: ?canHaveExtraData@BlockLegacy@@UEBA_NXZ + // vIndex: 109, symbol: ?canHaveExtraData@BlockLegacy@@UEBA_NXZ virtual bool canHaveExtraData() const; - // vIndex: 111, symbol: ?hasComparatorSignal@BlockLegacy@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@BlockLegacy@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 113, symbol: ?canSlide@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 112, symbol: ?canSlide@BlockLegacy@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSlide(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 114, symbol: ?canInstatick@BlockLegacy@@UEBA_NXZ + // vIndex: 113, symbol: ?canInstatick@BlockLegacy@@UEBA_NXZ virtual bool canInstatick() const; - // vIndex: 115, symbol: ?canSpawnAt@BlockLegacy@@UEBA_NAEBVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 114, symbol: ?canSpawnAt@BlockLegacy@@UEBA_NAEBVBlockSource@@AEBVBlockPos@@@Z virtual bool canSpawnAt(class BlockSource const& region, class BlockPos const& pos) const; - // vIndex: 116, symbol: ?notifySpawnedAt@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 115, symbol: ?notifySpawnedAt@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void notifySpawnedAt(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 117, symbol: ?causesFreezeEffect@BlockLegacy@@UEBA_NXZ + // vIndex: 116, symbol: ?causesFreezeEffect@BlockLegacy@@UEBA_NXZ virtual bool causesFreezeEffect() const; - // vIndex: 118, symbol: ?getIconYOffset@BlockLegacy@@UEBAHXZ + // vIndex: 117, symbol: ?getIconYOffset@BlockLegacy@@UEBAHXZ virtual int getIconYOffset() const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@BlockLegacy@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@BlockLegacy@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@BlockLegacy@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 121, symbol: ?getColor@BlockLegacy@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@BlockLegacy@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 123, symbol: ?getColorAtPos@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 122, symbol: ?getColorAtPos@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getColorAtPos(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 124, symbol: ?getColorForParticle@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 123, symbol: ?getColorForParticle@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColorForParticle(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 125, symbol: ?isSeasonTinted@BlockLegacy@@UEBA_NAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 124, symbol: ?isSeasonTinted@BlockLegacy@@UEBA_NAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual bool isSeasonTinted(class Block const& block, class BlockSource& region, class BlockPos const& p) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@BlockLegacy@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@BlockLegacy@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 127, symbol: ?getShadeBrightness@BlockLegacy@@UEBAMAEBVBlock@@@Z + // vIndex: 126, symbol: ?getShadeBrightness@BlockLegacy@@UEBAMAEBVBlock@@@Z virtual float getShadeBrightness(class Block const& block) const; - // vIndex: 128, symbol: ?telemetryVariant@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 127, symbol: ?telemetryVariant@BlockLegacy@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int telemetryVariant(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@BlockLegacy@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BlockLegacy@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 130, symbol: ?canSpawnOn@BlockLegacy@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@BlockLegacy@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 131, symbol: ?getRenderBlock@BlockLegacy@@UEBAAEBVBlock@@XZ + // vIndex: 130, symbol: ?getRenderBlock@BlockLegacy@@UEBAAEBVBlock@@XZ virtual class Block const& getRenderBlock() const; - // vIndex: 132, symbol: ?getMappedFace@BlockLegacy@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@BlockLegacy@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 133, symbol: ?getFaceFlip@BlockLegacy@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@BlockLegacy@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar face, class Block const& block) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 135, symbol: ?animateTick@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 134, symbol: ?animateTick@BlockLegacy@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 136, symbol: ?init@BlockLegacy@@UEAAAEAV1@XZ + // vIndex: 135, symbol: ?init@BlockLegacy@@UEAAAEAV1@XZ virtual class BlockLegacy& init(); - // vIndex: 137, symbol: ?getLightEmission@BlockLegacy@@MEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@BlockLegacy@@MEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@BlockLegacy@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 139, symbol: ?tryLegacyUpgrade@BlockLegacy@@UEBAPEBVBlock@@G@Z + // vIndex: 137, symbol: ?tryLegacyUpgrade@BlockLegacy@@UEBAPEBVBlock@@G@Z virtual class Block const* tryLegacyUpgrade(ushort) const; - // vIndex: 140, symbol: ?dealsContactDamage@BlockLegacy@@UEBA_NAEBVActor@@AEBVBlock@@_N@Z + // vIndex: 138, symbol: ?dealsContactDamage@BlockLegacy@@UEBA_NAEBVActor@@AEBVBlock@@_N@Z virtual bool dealsContactDamage(class Actor const& actor, class Block const& block, bool isPathFinding) const; - // vIndex: 141, symbol: ?tryGetInfested@BlockLegacy@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 139, symbol: ?tryGetInfested@BlockLegacy@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetInfested(class Block const&) const; - // vIndex: 142, symbol: ?tryGetUninfested@BlockLegacy@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 140, symbol: ?tryGetUninfested@BlockLegacy@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetUninfested(class Block const&) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@BlockLegacy@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@BlockLegacy@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 144, symbol: ?onRemove@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 145, symbol: ?onExploded@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + // vIndex: 143, symbol: ?onExploded@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z virtual void onExploded(class BlockSource& region, class BlockPos const& pos, class Actor* entitySource) const; - // vIndex: 146, symbol: ?onStandOn@BlockLegacy@@MEBAXAEAVEntityContext@@AEBVBlockPos@@@Z + // vIndex: 144, symbol: ?onStandOn@BlockLegacy@@MEBAXAEAVEntityContext@@AEBVBlockPos@@@Z virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 148, symbol: ?onFallOn@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; - - // vIndex: 149, symbol: ?shouldTickOnSetBlock@BlockLegacy@@MEBA_NXZ + // vIndex: 146, symbol: ?shouldTickOnSetBlock@BlockLegacy@@MEBA_NXZ virtual bool shouldTickOnSetBlock() const; - // vIndex: 150, symbol: ?tick@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@BlockLegacy@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@BlockLegacy@@MEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@BlockLegacy@@MEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 153, symbol: ?use@BlockLegacy@@MEBA_NAEAVPlayer@@AEBVBlockPos@@EV?$optional@VVec3@@@std@@@Z + // vIndex: 150, symbol: ?use@BlockLegacy@@MEBA_NAEAVPlayer@@AEBVBlockPos@@EV?$optional@VVec3@@@std@@@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face, std::optional) const; - // vIndex: 154, symbol: ?use@BlockLegacy@@MEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BlockLegacy@@MEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player&, class BlockPos const&, uchar) const; - // vIndex: 155, symbol: ?allowStateMismatchOnPlacement@BlockLegacy@@MEBA_NAEBVBlock@@0@Z + // vIndex: 152, symbol: ?allowStateMismatchOnPlacement@BlockLegacy@@MEBA_NAEBVBlock@@0@Z virtual bool allowStateMismatchOnPlacement(class Block const&, class Block const&) const; - // vIndex: 156, symbol: ?canSurvive@BlockLegacy@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BlockLegacy@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 157, symbol: ?getRenderLayer@BlockLegacy@@MEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@BlockLegacy@@MEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@BlockLegacy@@MEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; - // vIndex: 159, symbol: ?getExtraRenderLayers@BlockLegacy@@MEBAHXZ + // vIndex: 156, symbol: ?getExtraRenderLayers@BlockLegacy@@MEBAHXZ virtual int getExtraRenderLayers() const; - // vIndex: 160, symbol: ?getLight@BlockLegacy@@MEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 157, symbol: ?getLight@BlockLegacy@@MEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLight(class Block const&) const; - // vIndex: 161, symbol: ?getEmissiveBrightness@BlockLegacy@@MEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 158, symbol: ?getEmissiveBrightness@BlockLegacy@@MEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getEmissiveBrightness(class Block const&) const; - // vIndex: 162, symbol: ?getMapColor@BlockLegacy@@MEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@BlockLegacy@@MEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const&) const; - // vIndex: 163, symbol: ?getResourceItem@BlockLegacy@@MEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 164, symbol: ?getResourceCount@BlockLegacy@@MEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@BlockLegacy@@MEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; + // vIndex: 160, symbol: ?_onHitByActivatingAttack@BlockLegacy@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; - // vIndex: 166, symbol: ?_onHitByActivatingAttack@BlockLegacy@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // vIndex: 161, symbol: + // ?_spawnAfterBreak@BlockLegacy@@EEBAXAEAVBlockSource@@AEBVBlock@@AEBVBlockPos@@AEBUResourceDropsContext@@@Z + virtual void + _spawnAfterBreak(class BlockSource&, class Block const&, class BlockPos const&, struct ResourceDropsContext const&) + const; - // vIndex: 167, symbol: ?entityInside@BlockLegacy@@EEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@BlockLegacy@@EEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource&, class BlockPos const&, class Actor&) const; // symbol: ??0BlockLegacy@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z @@ -899,6 +885,9 @@ class BlockLegacy { // symbol: ?hasProperty@BlockLegacy@@QEBA_NW4BlockProperty@@@Z MCAPI bool hasProperty(::BlockProperty type) const; + // symbol: ?hasResourceDropsStrategy@BlockLegacy@@QEBA_NXZ + MCAPI bool hasResourceDropsStrategy() const; + // symbol: ?hasState@BlockLegacy@@QEBA_NAEBVBlockState@@@Z MCAPI bool hasState(class BlockState const& stateType) const; @@ -953,6 +942,9 @@ class BlockLegacy { // symbol: ?setCategory@BlockLegacy@@QEAAAEAV1@W4CreativeItemCategory@@@Z MCAPI class BlockLegacy& setCategory(::CreativeItemCategory creativeCategory); + // symbol: ?setClientPredictionOverride@BlockLegacy@@QEAAXW4BlockClientPredictionOverrides@@_N@Z + MCAPI void setClientPredictionOverride(::BlockClientPredictionOverrides, bool); + // symbol: ?setCreativeEnumState@BlockLegacy@@QEAAAEAV1@AEBVBlockState@@@Z MCAPI class BlockLegacy& setCreativeEnumState(class BlockState const& state); @@ -1040,6 +1032,12 @@ class BlockLegacy { // symbol: ?shouldTriggerOnStandOn@BlockLegacy@@QEBA_NAEAVActor@@AEBVBlockPos@@@Z MCAPI bool shouldTriggerOnStandOn(class Actor& entity, class BlockPos const& pos) const; + // symbol: + // ?spawnResources@BlockLegacy@@QEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z + MCAPI void + spawnResources(class BlockSource& region, class BlockPos const& pos, class Block const& block, class Randomize& randomize, struct ResourceDropsContext const&) + const; + // symbol: ?tryGetStateFromLegacyData@BlockLegacy@@QEBAPEBVBlock@@G@Z MCAPI class Block const* tryGetStateFromLegacyData(ushort) const; @@ -1109,8 +1107,8 @@ class BlockLegacy { // symbol: ?getFriction@BlockLegacy@@IEBAMXZ MCAPI float getFriction() const; - // symbol: ?playerDestroy@BlockLegacy@@IEBAXAEAVPlayer@@AEBVBlockPos@@AEBVBlock@@@Z - MCAPI void playerDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; + // symbol: ?onFallOnBase@BlockLegacy@@IEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOnBase(struct BlockEvents::BlockFallOnEvent&) const; // NOLINTEND @@ -1138,10 +1136,5 @@ class BlockLegacy { // symbol: ?_trySetStateFromAlteredStateCollection@BlockLegacy@@AEBAPEBVBlock@@_KHG@Z MCAPI class Block const* _trySetStateFromAlteredStateCollection(uint64 stateId, int val, ushort) const; - // symbol: ?initParams@BlockLegacy@@AEBAXAEAVRenderParams@@AEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z - MCAPI void - initParams(class RenderParams& params, class BlockSource& region, class BlockPos const& pos, class Actor* actor) - const; - // NOLINTEND }; diff --git a/src/mc/world/level/block/BookshelfBlock.h b/src/mc/world/level/block/BookshelfBlock.h index bc26bbd1c3..3cecb73217 100644 --- a/src/mc/world/level/block/BookshelfBlock.h +++ b/src/mc/world/level/block/BookshelfBlock.h @@ -30,15 +30,9 @@ class BookshelfBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1BookshelfBlock@@UEAA@XZ virtual ~BookshelfBlock() = default; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@BookshelfBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@BookshelfBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 163, symbol: ?getResourceItem@BookshelfBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@BookshelfBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: ??0BookshelfBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI BookshelfBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/BorderBlock.h b/src/mc/world/level/block/BorderBlock.h index e5c1618ca6..a4be325761 100644 --- a/src/mc/world/level/block/BorderBlock.h +++ b/src/mc/world/level/block/BorderBlock.h @@ -41,25 +41,22 @@ class BorderBlock : public ::WallBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@BorderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@BorderBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 129, symbol: ?getVariant@BorderBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@BorderBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@BorderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@BorderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 144, symbol: ?onRemove@BorderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@BorderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@BorderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BorderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@BorderBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0BorderBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI BorderBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/BrewingStandBlock.h b/src/mc/world/level/block/BrewingStandBlock.h index 87f480ce8c..17af369c6f 100644 --- a/src/mc/world/level/block/BrewingStandBlock.h +++ b/src/mc/world/level/block/BrewingStandBlock.h @@ -75,32 +75,32 @@ class BrewingStandBlock : public ::ActorBlock { virtual bool checkIsPathable(class Actor& entity, class BlockPos const& lastPathPos, class BlockPos const& pathPos) const; - // vIndex: 96, symbol: ?asItemInstance@BrewingStandBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BrewingStandBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 111, symbol: ?hasComparatorSignal@BrewingStandBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@BrewingStandBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@BrewingStandBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@BrewingStandBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@BrewingStandBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@BrewingStandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 144, symbol: ?onRemove@BrewingStandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@BrewingStandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@BrewingStandBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@BrewingStandBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@BrewingStandBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@BrewingStandBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0BrewingStandBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/BubbleColumnBlock.h b/src/mc/world/level/block/BubbleColumnBlock.h index d868c84abb..701013fce5 100644 --- a/src/mc/world/level/block/BubbleColumnBlock.h +++ b/src/mc/world/level/block/BubbleColumnBlock.h @@ -77,28 +77,25 @@ class BubbleColumnBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@BubbleColumnBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@BubbleColumnBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@BubbleColumnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 147, symbol: ?onPlace@BubbleColumnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@BubbleColumnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 149, symbol: ?shouldTickOnSetBlock@BubbleColumnBlock@@UEBA_NXZ + // vIndex: 146, symbol: ?shouldTickOnSetBlock@BubbleColumnBlock@@UEBA_NXZ virtual bool shouldTickOnSetBlock() const; - // vIndex: 150, symbol: ?tick@BubbleColumnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BubbleColumnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@BubbleColumnBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BubbleColumnBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 164, symbol: ?getResourceCount@BubbleColumnBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: ??0BubbleColumnBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI BubbleColumnBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/BuddingAmethystBlock.h b/src/mc/world/level/block/BuddingAmethystBlock.h index cf124714d1..5e383ba1c2 100644 --- a/src/mc/world/level/block/BuddingAmethystBlock.h +++ b/src/mc/world/level/block/BuddingAmethystBlock.h @@ -33,13 +33,10 @@ class BuddingAmethystBlock : public ::AmethystBlock { // vIndex: 48, symbol: ?isSilentWhenJumpingOff@BuddingAmethystBlock@@UEBA_NXZ virtual bool isSilentWhenJumpingOff() const; - // vIndex: 96, symbol: ?asItemInstance@BuddingAmethystBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@BuddingAmethystBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 138, symbol: ?canBeSilkTouched@BuddingAmethystBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 151, symbol: ?randomTick@BuddingAmethystBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@BuddingAmethystBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: diff --git a/src/mc/world/level/block/BushBlock.h b/src/mc/world/level/block/BushBlock.h index bbe923e0ad..73bba8f324 100644 --- a/src/mc/world/level/block/BushBlock.h +++ b/src/mc/world/level/block/BushBlock.h @@ -46,16 +46,16 @@ class BushBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 150, symbol: ?tick@BushBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@BushBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@BushBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@BushBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?checkAlive@BushBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?checkAlive@BushBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void checkAlive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 169, symbol: ?setGrowth@BushBlock@@MEBAAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@AEBV2@GH@Z + // vIndex: 164, symbol: ?setGrowth@BushBlock@@MEBAAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@AEBV2@GH@Z virtual class Block const& setGrowth( class BlockSource& region, class BlockPos const& pos, diff --git a/src/mc/world/level/block/ButtonBlock.h b/src/mc/world/level/block/ButtonBlock.h index 79f91400f0..ccb09685e4 100644 --- a/src/mc/world/level/block/ButtonBlock.h +++ b/src/mc/world/level/block/ButtonBlock.h @@ -80,7 +80,7 @@ class ButtonBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@ButtonBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@ButtonBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -89,35 +89,35 @@ class ButtonBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 100, symbol: ?isAttachedTo@ButtonBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z + // vIndex: 99, symbol: ?isAttachedTo@ButtonBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z virtual bool isAttachedTo(class BlockSource& region, class BlockPos const& pos, class BlockPos& outAttachedTo) const; - // vIndex: 129, symbol: ?getVariant@ButtonBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ButtonBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 130, symbol: ?canSpawnOn@ButtonBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@ButtonBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 147, symbol: ?onPlace@ButtonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ButtonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@ButtonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ButtonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@ButtonBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@ButtonBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@ButtonBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@ButtonBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@ButtonBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@ButtonBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 166, symbol: ?_onHitByActivatingAttack@ButtonBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // vIndex: 160, symbol: ?_onHitByActivatingAttack@ButtonBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; - // vIndex: 167, symbol: ?entityInside@ButtonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@ButtonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor&) const; // symbol: ?buttonPressed@ButtonBlock@@QEBAXAEAVBlockSource@@AEBVBlock@@AEBVVec3@@PEAVActor@@@Z diff --git a/src/mc/world/level/block/CactusBlock.h b/src/mc/world/level/block/CactusBlock.h index c9fb09c0d4..e712bdf94b 100644 --- a/src/mc/world/level/block/CactusBlock.h +++ b/src/mc/world/level/block/CactusBlock.h @@ -51,22 +51,19 @@ class CactusBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@CactusBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@CactusBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 138, symbol: ?canBeSilkTouched@CactusBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 140, symbol: ?dealsContactDamage@CactusBlock@@UEBA_NAEBVActor@@AEBVBlock@@_N@Z + // vIndex: 138, symbol: ?dealsContactDamage@CactusBlock@@UEBA_NAEBVActor@@AEBVBlock@@_N@Z virtual bool dealsContactDamage(class Actor const& actor, class Block const& block, bool isPathFinding) const; - // vIndex: 150, symbol: ?tick@CactusBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CactusBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@CactusBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CactusBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@CactusBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CactusBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0CactusBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CakeBlock.h b/src/mc/world/level/block/CakeBlock.h index f00ef6eb80..76b68f7b96 100644 --- a/src/mc/world/level/block/CakeBlock.h +++ b/src/mc/world/level/block/CakeBlock.h @@ -44,30 +44,27 @@ class CakeBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CakeBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CakeBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 111, symbol: ?hasComparatorSignal@CakeBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@CakeBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@CakeBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@CakeBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 129, symbol: ?getVariant@CakeBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CakeBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@CakeBlock@@EEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@CakeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CakeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 154, symbol: ?use@CakeBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CakeBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar) const; - // vIndex: 156, symbol: ?canSurvive@CakeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CakeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0CakeBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CalibratedSculkSensorBlock.h b/src/mc/world/level/block/CalibratedSculkSensorBlock.h index b69c3df5a7..89b62e2bf7 100644 --- a/src/mc/world/level/block/CalibratedSculkSensorBlock.h +++ b/src/mc/world/level/block/CalibratedSculkSensorBlock.h @@ -33,13 +33,13 @@ class CalibratedSculkSensorBlock : public ::SculkSensorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@CalibratedSculkSensorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@CalibratedSculkSensorBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CalibratedSculkSensorBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@CalibratedSculkSensorBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@CalibratedSculkSensorBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 133, symbol: ?getFaceFlip@CalibratedSculkSensorBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@CalibratedSculkSensorBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar face, class Block const& block) const; // symbol: ??0CalibratedSculkSensorBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CampfireBlock.h b/src/mc/world/level/block/CampfireBlock.h index c741305a60..06405e1e19 100644 --- a/src/mc/world/level/block/CampfireBlock.h +++ b/src/mc/world/level/block/CampfireBlock.h @@ -54,31 +54,28 @@ class CampfireBlock : public ::ActorBlock { // vIndex: 92, symbol: ?neighborChanged@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@1@Z virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const&) const; - // vIndex: 96, symbol: ?asItemInstance@CampfireBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CampfireBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 130, symbol: ?canSpawnOn@CampfireBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@CampfireBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 137, symbol: ?getLightEmission@CampfireBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@CampfireBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@CampfireBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 144, symbol: ?onRemove@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 154, symbol: ?use@CampfireBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CampfireBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 167, symbol: ?entityInside@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@CampfireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0CampfireBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N_N@Z diff --git a/src/mc/world/level/block/CandleBlock.h b/src/mc/world/level/block/CandleBlock.h index b8dfa5d3fd..93089be8f1 100644 --- a/src/mc/world/level/block/CandleBlock.h +++ b/src/mc/world/level/block/CandleBlock.h @@ -39,25 +39,19 @@ class CandleBlock : public ::AbstractCandleBlock { // vIndex: 55, symbol: ?waterSpreadCausesSpawn@CandleBlock@@UEBA_NXZ virtual bool waterSpreadCausesSpawn() const; - // vIndex: 96, symbol: ?asItemInstance@CandleBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CandleBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 152, symbol: ?isInteractiveBlock@CandleBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@CandleBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@CandleBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CandleBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar) const; - // vIndex: 163, symbol: ?getResourceItem@CandleBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 164, symbol: ?getResourceCount@CandleBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const& block, int) const; - - // vIndex: 168, symbol: ?_getNumCandles@CandleBlock@@MEBAHAEBVBlock@@@Z + // vIndex: 163, symbol: ?_getNumCandles@CandleBlock@@MEBAHAEBVBlock@@@Z virtual int _getNumCandles(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?_iterateCandles@CandleBlock@@MEBAXAEBVBlock@@AEBVBlockPos@@V?$function@$$A6AXAEBVVec3@@H@Z@std@@@Z virtual void _iterateCandles( class Block const& block, @@ -65,7 +59,7 @@ class CandleBlock : public ::AbstractCandleBlock { std::function callback ) const; - // vIndex: 170, symbol: ?_tryLightOnFire@CandleBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + // vIndex: 165, symbol: ?_tryLightOnFire@CandleBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z virtual void _tryLightOnFire(class BlockSource& region, class BlockPos const& pos, class Actor* sourceActor) const; // symbol: ??0CandleBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CandleCakeBlock.h b/src/mc/world/level/block/CandleCakeBlock.h index 4fb00d165c..54d796b852 100644 --- a/src/mc/world/level/block/CandleCakeBlock.h +++ b/src/mc/world/level/block/CandleCakeBlock.h @@ -47,33 +47,27 @@ class CandleCakeBlock : public ::AbstractCandleBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CandleCakeBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CandleCakeBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 111, symbol: ?hasComparatorSignal@CandleCakeBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@CandleCakeBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@CandleCakeBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@CandleCakeBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 138, symbol: ?canBeSilkTouched@CandleCakeBlock@@EEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 154, symbol: ?use@CandleCakeBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CandleCakeBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@CandleCakeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CandleCakeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@CandleCakeBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 168, symbol: ?_getNumCandles@CandleCakeBlock@@MEBAHAEBVBlock@@@Z + // vIndex: 163, symbol: ?_getNumCandles@CandleCakeBlock@@MEBAHAEBVBlock@@@Z virtual int _getNumCandles(class Block const&) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?_iterateCandles@CandleCakeBlock@@MEBAXAEBVBlock@@AEBVBlockPos@@V?$function@$$A6AXAEBVVec3@@H@Z@std@@@Z virtual void _iterateCandles( class Block const& block, @@ -81,7 +75,7 @@ class CandleCakeBlock : public ::AbstractCandleBlock { std::function callback ) const; - // vIndex: 170, symbol: ?_tryLightOnFire@CandleCakeBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + // vIndex: 165, symbol: ?_tryLightOnFire@CandleCakeBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z virtual void _tryLightOnFire(class BlockSource& region, class BlockPos const& pos, class Actor* sourceActor) const; // symbol: ??0CandleCakeBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CarpetBlock.h b/src/mc/world/level/block/CarpetBlock.h index 1896495cd5..4781470747 100644 --- a/src/mc/world/level/block/CarpetBlock.h +++ b/src/mc/world/level/block/CarpetBlock.h @@ -51,16 +51,16 @@ class CarpetBlock : public ::BlockLegacy { // vIndex: 92, symbol: ?neighborChanged@CarpetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@1@Z virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const&) const; - // vIndex: 96, symbol: ?asItemInstance@CarpetBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CarpetBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 147, symbol: ?onPlace@CarpetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CarpetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@CarpetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CarpetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@CarpetBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CarpetBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0CarpetBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z diff --git a/src/mc/world/level/block/CarrotBlock.h b/src/mc/world/level/block/CarrotBlock.h index ad456654db..45fd6f9ad2 100644 --- a/src/mc/world/level/block/CarrotBlock.h +++ b/src/mc/world/level/block/CarrotBlock.h @@ -35,18 +35,18 @@ class CarrotBlock : public ::CropBlock { virtual class AABB const& getOutline(class Block const&, class IConstBlockSource const&, class BlockPos const&, class AABB&) const; - // vIndex: 129, symbol: ?getVariant@CarrotBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CarrotBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 157, symbol: ?getRenderLayer@CarrotBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@CarrotBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@CarrotBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; - // vIndex: 170, symbol: ?getBaseSeed@CarrotBlock@@UEBA?BVItemInstance@@XZ + // vIndex: 165, symbol: ?getBaseSeed@CarrotBlock@@UEBA?BVItemInstance@@XZ virtual class ItemInstance const getBaseSeed() const; // symbol: ??0CarrotBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CartographyTableBlock.h b/src/mc/world/level/block/CartographyTableBlock.h index d1d35d2ffe..f940b7c967 100644 --- a/src/mc/world/level/block/CartographyTableBlock.h +++ b/src/mc/world/level/block/CartographyTableBlock.h @@ -33,10 +33,10 @@ class CartographyTableBlock : public ::BlockLegacy { // vIndex: 31, symbol: ?isCraftingBlock@CartographyTableBlock@@UEBA_NXZ virtual bool isCraftingBlock() const; - // vIndex: 152, symbol: ?isInteractiveBlock@CartographyTableBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@CartographyTableBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@CartographyTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CartographyTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0CartographyTableBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CauldronBlock.h b/src/mc/world/level/block/CauldronBlock.h index 77dd3684ed..6d9252d846 100644 --- a/src/mc/world/level/block/CauldronBlock.h +++ b/src/mc/world/level/block/CauldronBlock.h @@ -79,36 +79,39 @@ class CauldronBlock : public ::ActorBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 111, symbol: ?hasComparatorSignal@CauldronBlock@@UEBA_NXZ + // vIndex: 95, symbol: ?asItemInstance@CauldronBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; + + // vIndex: 110, symbol: ?hasComparatorSignal@CauldronBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@CauldronBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@CauldronBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@CauldronBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@CauldronBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 137, symbol: ?getLightEmission@CauldronBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@CauldronBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@CauldronBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CauldronBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@CauldronBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CauldronBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@CauldronBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@CauldronBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@CauldronBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CauldronBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 159, symbol: ?getExtraRenderLayers@CauldronBlock@@UEBAHXZ + // vIndex: 156, symbol: ?getExtraRenderLayers@CauldronBlock@@UEBAHXZ virtual int getExtraRenderLayers() const; - // vIndex: 160, symbol: ?getLight@CauldronBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 157, symbol: ?getLight@CauldronBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLight(class Block const& block) const; // symbol: ??0CauldronBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CaveVinesBlock.h b/src/mc/world/level/block/CaveVinesBlock.h index 4231ddcb11..a4f63f6864 100644 --- a/src/mc/world/level/block/CaveVinesBlock.h +++ b/src/mc/world/level/block/CaveVinesBlock.h @@ -67,10 +67,10 @@ class CaveVinesBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CaveVinesBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CaveVinesBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 106, symbol: + // vIndex: 105, symbol: // ?executeEvent@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVActor@@@Z virtual void executeEvent( class BlockSource& region, @@ -80,33 +80,27 @@ class CaveVinesBlock : public ::BlockLegacy { class Actor& sourceEntity ) const; - // vIndex: 129, symbol: ?getVariant@CaveVinesBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CaveVinesBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const&) const; - // vIndex: 144, symbol: ?onRemove@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CaveVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@CaveVinesBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CaveVinesBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@CaveVinesBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CaveVinesBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@CaveVinesBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@CaveVinesBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: // ??0CaveVinesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HW4CaveVinesVariant@@@Z MCAPI CaveVinesBlock(std::string const& nameId, int id, ::CaveVinesVariant variant); diff --git a/src/mc/world/level/block/ChainBlock.h b/src/mc/world/level/block/ChainBlock.h index 8761b118af..2b1d80e771 100644 --- a/src/mc/world/level/block/ChainBlock.h +++ b/src/mc/world/level/block/ChainBlock.h @@ -42,7 +42,7 @@ class ChainBlock : public ::RotatedPillarBlock { // vIndex: 56, symbol: ?canContainLiquid@ChainBlock@@UEBA_NXZ virtual bool canContainLiquid() const; - // vIndex: 96, symbol: ?asItemInstance@ChainBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ChainBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; // symbol: ??0ChainBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z diff --git a/src/mc/world/level/block/ChemicalHeatBlock.h b/src/mc/world/level/block/ChemicalHeatBlock.h index 55163984fa..f3e01be2cd 100644 --- a/src/mc/world/level/block/ChemicalHeatBlock.h +++ b/src/mc/world/level/block/ChemicalHeatBlock.h @@ -33,13 +33,13 @@ class ChemicalHeatBlock : public ::BlockLegacy { // vIndex: 60, symbol: ?canBeUsedInCommands@ChemicalHeatBlock@@UEBA_NAEBVBaseGameVersion@@@Z virtual bool canBeUsedInCommands(class BaseGameVersion const& requiredBaseGameVersion) const; - // vIndex: 147, symbol: ?onPlace@ChemicalHeatBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ChemicalHeatBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@ChemicalHeatBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ChemicalHeatBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 159, symbol: ?getExtraRenderLayers@ChemicalHeatBlock@@UEBAHXZ + // vIndex: 156, symbol: ?getExtraRenderLayers@ChemicalHeatBlock@@UEBAHXZ virtual int getExtraRenderLayers() const; // symbol: ??0ChemicalHeatBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ChemistryTableBlock.h b/src/mc/world/level/block/ChemistryTableBlock.h index 302d990e35..747680800c 100644 --- a/src/mc/world/level/block/ChemistryTableBlock.h +++ b/src/mc/world/level/block/ChemistryTableBlock.h @@ -46,10 +46,10 @@ class ChemistryTableBlock : public ::ActorBlock { // vIndex: 60, symbol: ?canBeUsedInCommands@ChemistryTableBlock@@UEBA_NAEBVBaseGameVersion@@@Z virtual bool canBeUsedInCommands(class BaseGameVersion const& requiredBaseGameVersion) const; - // vIndex: 96, symbol: ?asItemInstance@ChemistryTableBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ChemistryTableBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: + // vIndex: 97, symbol: // ?getPlacementBlock@ChemistryTableBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, @@ -59,26 +59,26 @@ class ChemistryTableBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@ChemistryTableBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@ChemistryTableBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@ChemistryTableBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@ChemistryTableBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ChemistryTableBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@ChemistryTableBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@ChemistryTableBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 144, symbol: ?onRemove@ChemistryTableBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@ChemistryTableBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@ChemistryTableBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@ChemistryTableBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@ChemistryTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@ChemistryTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0ChemistryTableBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CherryLeavesBlock.h b/src/mc/world/level/block/CherryLeavesBlock.h index c03e0a983e..56efc9f530 100644 --- a/src/mc/world/level/block/CherryLeavesBlock.h +++ b/src/mc/world/level/block/CherryLeavesBlock.h @@ -30,27 +30,27 @@ class CherryLeavesBlock : public ::LeavesBlock { // vIndex: 0, symbol: __gen_??1CherryLeavesBlock@@UEAA@XZ virtual ~CherryLeavesBlock() = default; - // vIndex: 122, symbol: ?getColor@CherryLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@CherryLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 125, symbol: ?isSeasonTinted@CherryLeavesBlock@@UEBA_NAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 124, symbol: ?isSeasonTinted@CherryLeavesBlock@@UEBA_NAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual bool isSeasonTinted(class Block const&, class BlockSource&, class BlockPos const&) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@CherryLeavesBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@CherryLeavesBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 129, symbol: ?getVariant@CherryLeavesBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CherryLeavesBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const&) const; - // vIndex: 135, symbol: ?animateTick@CherryLeavesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 134, symbol: ?animateTick@CherryLeavesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@CherryLeavesBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const&, class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: + // vIndex: 159, symbol: // ?getMapColor@CherryLeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; diff --git a/src/mc/world/level/block/CherrySaplingBlock.h b/src/mc/world/level/block/CherrySaplingBlock.h index 21730bf49c..fda525e641 100644 --- a/src/mc/world/level/block/CherrySaplingBlock.h +++ b/src/mc/world/level/block/CherrySaplingBlock.h @@ -45,22 +45,16 @@ class CherrySaplingBlock : public ::BushBlock { // vIndex: 85, symbol: ?mayPlace@CherrySaplingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 138, symbol: ?canBeSilkTouched@CherrySaplingBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 151, symbol: ?randomTick@CherrySaplingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CherrySaplingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 157, symbol: ?getRenderLayer@CherrySaplingBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@CherrySaplingBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@CherrySaplingBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const&, class BlockSource&, class BlockPos const&) const; - // vIndex: 163, symbol: ?getResourceItem@CherrySaplingBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0CherrySaplingBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI CherrySaplingBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/ChestBlock.h b/src/mc/world/level/block/ChestBlock.h index 8af903b3c9..6f2ae79d25 100644 --- a/src/mc/world/level/block/ChestBlock.h +++ b/src/mc/world/level/block/ChestBlock.h @@ -68,30 +68,30 @@ class ChestBlock : public ::ActorBlock { virtual bool getSecondPart(class IConstBlockSource const& region, class BlockPos const& pos, class BlockPos& out) const; - // vIndex: 111, symbol: ?hasComparatorSignal@ChestBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@ChestBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@ChestBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@ChestBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 132, symbol: ?getMappedFace@ChestBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@ChestBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 136, symbol: ?init@ChestBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@ChestBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 144, symbol: ?onRemove@ChestBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@ChestBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@ChestBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ChestBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@ChestBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@ChestBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@ChestBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@ChestBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: diff --git a/src/mc/world/level/block/ChiseledBookshelfBlock.h b/src/mc/world/level/block/ChiseledBookshelfBlock.h index 8ca231c461..6f7184c902 100644 --- a/src/mc/world/level/block/ChiseledBookshelfBlock.h +++ b/src/mc/world/level/block/ChiseledBookshelfBlock.h @@ -30,27 +30,24 @@ class ChiseledBookshelfBlock : public ::FaceDirectionalActorBlock { // vIndex: 0, symbol: __gen_??1ChiseledBookshelfBlock@@UEAA@XZ virtual ~ChiseledBookshelfBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@ChiseledBookshelfBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ChiseledBookshelfBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 111, symbol: ?hasComparatorSignal@ChiseledBookshelfBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@ChiseledBookshelfBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: + // vIndex: 111, symbol: // ?getComparatorSignal@ChiseledBookshelfBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const&, uchar) const; - // vIndex: 138, symbol: ?canBeSilkTouched@ChiseledBookshelfBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 144, symbol: ?onRemove@ChiseledBookshelfBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@ChiseledBookshelfBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@ChiseledBookshelfBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@ChiseledBookshelfBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 153, symbol: ?use@ChiseledBookshelfBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@EV?$optional@VVec3@@@std@@@Z + // vIndex: 150, symbol: ?use@ChiseledBookshelfBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@EV?$optional@VVec3@@@std@@@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face, std::optional) const; // symbol: ??0ChiseledBookshelfBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ChorusFlowerBlock.h b/src/mc/world/level/block/ChorusFlowerBlock.h index 52770ad2e2..cf8e50e1e1 100644 --- a/src/mc/world/level/block/ChorusFlowerBlock.h +++ b/src/mc/world/level/block/ChorusFlowerBlock.h @@ -52,16 +52,16 @@ class ChorusFlowerBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 129, symbol: ?getVariant@ChorusFlowerBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ChorusFlowerBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 150, symbol: ?tick@ChorusFlowerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ChorusFlowerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@ChorusFlowerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@ChorusFlowerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@ChorusFlowerBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@ChorusFlowerBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0ChorusFlowerBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ChorusPlantBlock.h b/src/mc/world/level/block/ChorusPlantBlock.h index b094a62793..7870c8e5cf 100644 --- a/src/mc/world/level/block/ChorusPlantBlock.h +++ b/src/mc/world/level/block/ChorusPlantBlock.h @@ -64,21 +64,12 @@ class ChorusPlantBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 138, symbol: ?canBeSilkTouched@ChorusPlantBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@ChorusPlantBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ChorusPlantBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@ChorusPlantBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@ChorusPlantBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@ChorusPlantBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@ChorusPlantBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const&, int) const; - // symbol: ??0ChorusPlantBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI ChorusPlantBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/ClayBlock.h b/src/mc/world/level/block/ClayBlock.h index 5656963b64..833b087c34 100644 --- a/src/mc/world/level/block/ClayBlock.h +++ b/src/mc/world/level/block/ClayBlock.h @@ -45,12 +45,6 @@ class ClayBlock : public ::BlockLegacy { virtual bool canBeFertilized(class BlockSource& region, class BlockPos const& pos, class Block const& aboveBlock) const; - // vIndex: 163, symbol: ?getResourceItem@ClayBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@ClayBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: ??0ClayBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI ClayBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/CobblestoneBlock.h b/src/mc/world/level/block/CobblestoneBlock.h index d87884da32..40245ea625 100644 --- a/src/mc/world/level/block/CobblestoneBlock.h +++ b/src/mc/world/level/block/CobblestoneBlock.h @@ -30,7 +30,7 @@ class CobblestoneBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1CobblestoneBlock@@UEAA@XZ virtual ~CobblestoneBlock() = default; - // vIndex: 141, symbol: ?tryGetInfested@CobblestoneBlock@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 139, symbol: ?tryGetInfested@CobblestoneBlock@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetInfested(class Block const& block) const; // symbol: diff --git a/src/mc/world/level/block/CocoaBlock.h b/src/mc/world/level/block/CocoaBlock.h index 75d4ffaf52..94f821ee0e 100644 --- a/src/mc/world/level/block/CocoaBlock.h +++ b/src/mc/world/level/block/CocoaBlock.h @@ -50,10 +50,10 @@ class CocoaBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CocoaBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CocoaBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@CocoaBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@CocoaBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -62,16 +62,13 @@ class CocoaBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 138, symbol: ?canBeSilkTouched@CocoaBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@CocoaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CocoaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 151, symbol: ?randomTick@CocoaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CocoaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@CocoaBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CocoaBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0CocoaBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ColoredTerracottaBlock.h b/src/mc/world/level/block/ColoredTerracottaBlock.h index 8865a71bc4..f15dff63a0 100644 --- a/src/mc/world/level/block/ColoredTerracottaBlock.h +++ b/src/mc/world/level/block/ColoredTerracottaBlock.h @@ -30,12 +30,9 @@ class ColoredTerracottaBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1ColoredTerracottaBlock@@UEAA@XZ virtual ~ColoredTerracottaBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@ColoredTerracottaBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ColoredTerracottaBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 163, symbol: ?getResourceItem@ColoredTerracottaBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - // symbol: // ??0ColoredTerracottaBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI ColoredTerracottaBlock(std::string const& nameId, int id, class Material const& material); diff --git a/src/mc/world/level/block/ColoredTorchBlock.h b/src/mc/world/level/block/ColoredTorchBlock.h index 16d03f757a..8ccafac0d4 100644 --- a/src/mc/world/level/block/ColoredTorchBlock.h +++ b/src/mc/world/level/block/ColoredTorchBlock.h @@ -34,10 +34,10 @@ class ColoredTorchBlock : public ::TorchBlock { // vIndex: 60, symbol: ?canBeUsedInCommands@ColoredTorchBlock@@UEBA_NAEBVBaseGameVersion@@@Z virtual bool canBeUsedInCommands(class BaseGameVersion const& requiredBaseGameVersion) const; - // vIndex: 96, symbol: ?asItemInstance@ColoredTorchBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ColoredTorchBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@ColoredTorchBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@ColoredTorchBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -46,23 +46,20 @@ class ColoredTorchBlock : public ::TorchBlock { int itemValue ) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@ColoredTorchBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@ColoredTorchBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@ColoredTorchBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@ColoredTorchBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ColoredTorchBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@ColoredTorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 163, symbol: ?getResourceItem@ColoredTorchBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - // symbol: // ??0ColoredTorchBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HW4ColoredTorchColor@@@Z MCAPI ColoredTorchBlock(std::string const& nameId, int id, ::ColoredTorchColor baseColor); diff --git a/src/mc/world/level/block/CommandBlock.h b/src/mc/world/level/block/CommandBlock.h index 47e8161b0b..c63e7fd6af 100644 --- a/src/mc/world/level/block/CommandBlock.h +++ b/src/mc/world/level/block/CommandBlock.h @@ -42,10 +42,10 @@ class CommandBlock : public ::ActorBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CommandBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CommandBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@CommandBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@CommandBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -54,33 +54,33 @@ class CommandBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 111, symbol: ?hasComparatorSignal@CommandBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@CommandBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@CommandBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@CommandBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 114, symbol: ?canInstatick@CommandBlock@@UEBA_NXZ + // vIndex: 113, symbol: ?canInstatick@CommandBlock@@UEBA_NXZ virtual bool canInstatick() const; - // vIndex: 129, symbol: ?getVariant@CommandBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CommandBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@CommandBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@CommandBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@CommandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CommandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@CommandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CommandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@CommandBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@CommandBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@CommandBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CommandBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: diff --git a/src/mc/world/level/block/ComparatorBlock.h b/src/mc/world/level/block/ComparatorBlock.h index 1c24a2490f..cf98bfcea5 100644 --- a/src/mc/world/level/block/ComparatorBlock.h +++ b/src/mc/world/level/block/ComparatorBlock.h @@ -57,31 +57,31 @@ class ComparatorBlock : public ::ActorBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@ComparatorBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ComparatorBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 105, symbol: ?triggerEvent@ComparatorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z + // vIndex: 104, symbol: ?triggerEvent@ComparatorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z virtual void triggerEvent(class BlockSource& region, class BlockPos const& pos, int b0, int b1) const; - // vIndex: 129, symbol: ?getVariant@ComparatorBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ComparatorBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 130, symbol: ?canSpawnOn@ComparatorBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@ComparatorBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 147, symbol: ?onPlace@ComparatorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ComparatorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@ComparatorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ComparatorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@ComparatorBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@ComparatorBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@ComparatorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@ComparatorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@ComparatorBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@ComparatorBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0ComparatorBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/ComposterBlock.h b/src/mc/world/level/block/ComposterBlock.h index ba3d16401b..79c7cf50c3 100644 --- a/src/mc/world/level/block/ComposterBlock.h +++ b/src/mc/world/level/block/ComposterBlock.h @@ -70,27 +70,27 @@ class ComposterBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@ComposterBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 111, symbol: ?hasComparatorSignal@ComposterBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@ComposterBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@ComposterBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@ComposterBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 129, symbol: ?getVariant@ComposterBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ComposterBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 144, symbol: ?onRemove@ComposterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@ComposterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@ComposterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ComposterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@ComposterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ComposterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@ComposterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@ComposterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0ComposterBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ConcretePowderBlock.h b/src/mc/world/level/block/ConcretePowderBlock.h index 3609824921..c877c0b7dd 100644 --- a/src/mc/world/level/block/ConcretePowderBlock.h +++ b/src/mc/world/level/block/ConcretePowderBlock.h @@ -34,19 +34,19 @@ class ConcretePowderBlock : public ::FallingBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@ConcretePowderBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ConcretePowderBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 108, symbol: ?shouldStopFalling@ConcretePowderBlock@@UEBA_NAEAVActor@@@Z + // vIndex: 107, symbol: ?shouldStopFalling@ConcretePowderBlock@@UEBA_NAEAVActor@@@Z virtual bool shouldStopFalling(class Actor& entity) const; - // vIndex: 147, symbol: ?onPlace@ConcretePowderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ConcretePowderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?getDustColor@ConcretePowderBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@ConcretePowderBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@ConcretePowderBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; diff --git a/src/mc/world/level/block/CopperBlock.h b/src/mc/world/level/block/CopperBlock.h index ce2052b3b0..5b78de6ba9 100644 --- a/src/mc/world/level/block/CopperBlock.h +++ b/src/mc/world/level/block/CopperBlock.h @@ -37,10 +37,10 @@ class CopperBlock : public ::BlockLegacy { // vIndex: 26, symbol: ?tryGetCopperBehavior@CopperBlock@@UEBAPEBVCopperBehavior@@XZ virtual class CopperBehavior const* tryGetCopperBehavior() const; - // vIndex: 151, symbol: ?randomTick@CopperBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CopperBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@CopperBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CopperBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: diff --git a/src/mc/world/level/block/CopperBulbBlock.h b/src/mc/world/level/block/CopperBulbBlock.h index a4344f38c2..b6b059c111 100644 --- a/src/mc/world/level/block/CopperBulbBlock.h +++ b/src/mc/world/level/block/CopperBulbBlock.h @@ -47,25 +47,25 @@ class CopperBulbBlock : public ::BlockLegacy { // vIndex: 71, symbol: ?setupRedstoneComponent@CopperBulbBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource&, class BlockPos const&) const; - // vIndex: 111, symbol: ?hasComparatorSignal@CopperBulbBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@CopperBulbBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@CopperBulbBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@CopperBulbBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource&, class BlockPos const&, class Block const&, uchar) const; - // vIndex: 137, symbol: ?getLightEmission@CopperBulbBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@CopperBulbBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const&) const; - // vIndex: 147, symbol: ?onPlace@CopperBulbBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CopperBulbBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource&, class BlockPos const&) const; - // vIndex: 150, symbol: ?tick@CopperBulbBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CopperBulbBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 151, symbol: ?randomTick@CopperBulbBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CopperBulbBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 154, symbol: ?use@CopperBulbBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CopperBulbBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player&, class BlockPos const&, uchar) const; // symbol: diff --git a/src/mc/world/level/block/CopperDoorBlock.h b/src/mc/world/level/block/CopperDoorBlock.h index 466b984e0d..526af06062 100644 --- a/src/mc/world/level/block/CopperDoorBlock.h +++ b/src/mc/world/level/block/CopperDoorBlock.h @@ -37,10 +37,10 @@ class CopperDoorBlock : public ::DoorBlock { // vIndex: 26, symbol: ?tryGetCopperBehavior@CopperDoorBlock@@UEBAPEBVCopperBehavior@@XZ virtual class CopperBehavior const* tryGetCopperBehavior() const; - // vIndex: 151, symbol: ?randomTick@CopperDoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CopperDoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 154, symbol: ?use@CopperDoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CopperDoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player&, class BlockPos const&, uchar) const; // symbol: diff --git a/src/mc/world/level/block/CopperTrapDoorBlock.h b/src/mc/world/level/block/CopperTrapDoorBlock.h index 45e766f2ee..350ad8089d 100644 --- a/src/mc/world/level/block/CopperTrapDoorBlock.h +++ b/src/mc/world/level/block/CopperTrapDoorBlock.h @@ -37,10 +37,10 @@ class CopperTrapDoorBlock : public ::TrapDoorBlock { // vIndex: 26, symbol: ?tryGetCopperBehavior@CopperTrapDoorBlock@@UEBAPEBVCopperBehavior@@XZ virtual class CopperBehavior const* tryGetCopperBehavior() const; - // vIndex: 151, symbol: ?randomTick@CopperTrapDoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CopperTrapDoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 154, symbol: ?use@CopperTrapDoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CopperTrapDoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player&, class BlockPos const&, uchar) const; // symbol: diff --git a/src/mc/world/level/block/CoralBlock.h b/src/mc/world/level/block/CoralBlock.h index c25ccf4881..4ec89afdcc 100644 --- a/src/mc/world/level/block/CoralBlock.h +++ b/src/mc/world/level/block/CoralBlock.h @@ -40,31 +40,28 @@ class CoralBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CoralBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CoralBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@CoralBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@CoralBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@CoralBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@CoralBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CoralBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@CoralBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CoralBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@CoralBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CoralBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 162, symbol: ?getMapColor@CoralBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@CoralBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@CoralBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - // symbol: ??0CoralBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI CoralBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/CoralFan.h b/src/mc/world/level/block/CoralFan.h index a5f416826d..788bdeea12 100644 --- a/src/mc/world/level/block/CoralFan.h +++ b/src/mc/world/level/block/CoralFan.h @@ -66,33 +66,33 @@ class CoralFan : public ::BushBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CoralFan@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CoralFan@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@CoralFan@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@CoralFan@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@CoralFan@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 121, symbol: ?getColor@CoralFan@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@CoralFan@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@CoralFan@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@CoralFan@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 129, symbol: ?getVariant@CoralFan@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CoralFan@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@CoralFan@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CoralFan@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@CoralFan@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@CoralFan@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 168, symbol: ?checkAlive@CoralFan@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?checkAlive@CoralFan@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void checkAlive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0CoralFan@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CoralFanHang.h b/src/mc/world/level/block/CoralFanHang.h index 04f8ae32c6..6233321038 100644 --- a/src/mc/world/level/block/CoralFanHang.h +++ b/src/mc/world/level/block/CoralFanHang.h @@ -51,32 +51,23 @@ class CoralFanHang : public ::CoralFan { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CoralFanHang@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CoralFanHang@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@CoralFanHang@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 129, symbol: ?getVariant@CoralFanHang@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CoralFanHang@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@CoralFanHang@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CoralFanHang@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 156, symbol: ?canSurvive@CoralFanHang@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CoralFanHang@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@CoralFanHang@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 164, symbol: ?getResourceCount@CoralFanHang@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@CoralFanHang@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - - // vIndex: 168, symbol: ?checkAlive@CoralFanHang@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?checkAlive@CoralFanHang@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void checkAlive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0CoralFanHang@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CoralPlantBlock.h b/src/mc/world/level/block/CoralPlantBlock.h index 7dcc8ef942..a58e7632bd 100644 --- a/src/mc/world/level/block/CoralPlantBlock.h +++ b/src/mc/world/level/block/CoralPlantBlock.h @@ -64,22 +64,19 @@ class CoralPlantBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 147, symbol: ?onPlace@CoralPlantBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CoralPlantBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@CoralPlantBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CoralPlantBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@CoralPlantBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CoralPlantBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@CoralPlantBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@CoralPlantBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 164, symbol: ?getResourceCount@CoralPlantBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: ??0CoralPlantBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI CoralPlantBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/CrafterBlock.h b/src/mc/world/level/block/CrafterBlock.h index 72a7066985..6e76d9bc1c 100644 --- a/src/mc/world/level/block/CrafterBlock.h +++ b/src/mc/world/level/block/CrafterBlock.h @@ -39,44 +39,44 @@ class CrafterBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@CrafterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource&, class BlockPos const&) const; - // vIndex: 98, symbol: ?getPlacementBlock@CrafterBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@CrafterBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock(class Actor const&, class BlockPos const&, uchar, class Vec3 const&, int) const; - // vIndex: 111, symbol: ?hasComparatorSignal@CrafterBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@CrafterBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@CrafterBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@CrafterBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource&, class BlockPos const&, class Block const&, uchar) const; - // vIndex: 129, symbol: ?getVariant@CrafterBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CrafterBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const&) const; - // vIndex: 131, symbol: ?getRenderBlock@CrafterBlock@@UEBAAEBVBlock@@XZ + // vIndex: 130, symbol: ?getRenderBlock@CrafterBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getRenderBlock() const; - // vIndex: 132, symbol: ?getMappedFace@CrafterBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@CrafterBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar, class Block const&) const; - // vIndex: 133, symbol: ?getFaceFlip@CrafterBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@CrafterBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar, class Block const&) const; - // vIndex: 144, symbol: ?onRemove@CrafterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@CrafterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource&, class BlockPos const&) const; - // vIndex: 147, symbol: ?onPlace@CrafterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@CrafterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource&, class BlockPos const&) const; - // vIndex: 150, symbol: ?tick@CrafterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@CrafterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@CrafterBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@CrafterBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@CrafterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CrafterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player&, class BlockPos const&, uchar) const; - // vIndex: 155, symbol: ?allowStateMismatchOnPlacement@CrafterBlock@@UEBA_NAEBVBlock@@0@Z + // vIndex: 152, symbol: ?allowStateMismatchOnPlacement@CrafterBlock@@UEBA_NAEBVBlock@@0@Z virtual bool allowStateMismatchOnPlacement(class Block const&, class Block const&) const; // symbol: ??0CrafterBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CraftingTableBlock.h b/src/mc/world/level/block/CraftingTableBlock.h index 5e7b1ac1bb..3645d524bd 100644 --- a/src/mc/world/level/block/CraftingTableBlock.h +++ b/src/mc/world/level/block/CraftingTableBlock.h @@ -33,10 +33,10 @@ class CraftingTableBlock : public ::BlockLegacy { // vIndex: 31, symbol: ?isCraftingBlock@CraftingTableBlock@@UEBA_NXZ virtual bool isCraftingBlock() const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@CraftingTableBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@CraftingTableBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 154, symbol: ?use@CraftingTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CraftingTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0CraftingTableBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CropBlock.h b/src/mc/world/level/block/CropBlock.h index 83ae19482d..9d97b295d8 100644 --- a/src/mc/world/level/block/CropBlock.h +++ b/src/mc/world/level/block/CropBlock.h @@ -65,10 +65,10 @@ class CropBlock : public ::BushBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@CropBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@CropBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 106, symbol: + // vIndex: 105, symbol: // ?executeEvent@CropBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVActor@@@Z virtual void executeEvent( class BlockSource& region, @@ -78,19 +78,16 @@ class CropBlock : public ::BushBlock { class Actor& sourceEntity ) const; - // vIndex: 129, symbol: ?getVariant@CropBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@CropBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@CropBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 151, symbol: ?randomTick@CropBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CropBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@CropBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@CropBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 170, symbol: ?getBaseSeed@CropBlock@@MEBA?BVItemInstance@@XZ + // vIndex: 165, symbol: ?getBaseSeed@CropBlock@@MEBA?BVItemInstance@@XZ virtual class ItemInstance const getBaseSeed() const; // symbol: ??0CropBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/CryingObsidianBlock.h b/src/mc/world/level/block/CryingObsidianBlock.h index b22ab1643e..48569d8447 100644 --- a/src/mc/world/level/block/CryingObsidianBlock.h +++ b/src/mc/world/level/block/CryingObsidianBlock.h @@ -30,7 +30,7 @@ class CryingObsidianBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1CryingObsidianBlock@@UEAA@XZ virtual ~CryingObsidianBlock() = default; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@CryingObsidianBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; diff --git a/src/mc/world/level/block/CutCopperSlab.h b/src/mc/world/level/block/CutCopperSlab.h index 248f98fded..decc82ef78 100644 --- a/src/mc/world/level/block/CutCopperSlab.h +++ b/src/mc/world/level/block/CutCopperSlab.h @@ -37,10 +37,10 @@ class CutCopperSlab : public ::SlabBlock { // vIndex: 26, symbol: ?tryGetCopperBehavior@CutCopperSlab@@UEBAPEBVCopperBehavior@@XZ virtual class CopperBehavior const* tryGetCopperBehavior() const; - // vIndex: 151, symbol: ?randomTick@CutCopperSlab@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CutCopperSlab@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@CutCopperSlab@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CutCopperSlab@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: diff --git a/src/mc/world/level/block/CutCopperStairs.h b/src/mc/world/level/block/CutCopperStairs.h index e0a2c6f4ef..2051872021 100644 --- a/src/mc/world/level/block/CutCopperStairs.h +++ b/src/mc/world/level/block/CutCopperStairs.h @@ -37,10 +37,10 @@ class CutCopperStairs : public ::StairBlock { // vIndex: 26, symbol: ?tryGetCopperBehavior@CutCopperStairs@@UEBAPEBVCopperBehavior@@XZ virtual class CopperBehavior const* tryGetCopperBehavior() const; - // vIndex: 151, symbol: ?randomTick@CutCopperStairs@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@CutCopperStairs@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@CutCopperStairs@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@CutCopperStairs@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: diff --git a/src/mc/world/level/block/DarkOakLeavesBlock.h b/src/mc/world/level/block/DarkOakLeavesBlock.h new file mode 100644 index 0000000000..3d322e87ea --- /dev/null +++ b/src/mc/world/level/block/DarkOakLeavesBlock.h @@ -0,0 +1,42 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/WeakPtr.h" +#include "mc/common/wrapper/optional_ref.h" +#include "mc/enums/FertilizerType.h" +#include "mc/enums/Flip.h" +#include "mc/enums/ShapeType.h" +#include "mc/world/Direction.h" +#include "mc/world/level/block/LeavesBlock.h" +#include "mc/world/level/block/utils/BlockProperty.h" +#include "mc/world/level/block/utils/BlockRenderLayer.h" +#include "mc/world/level/block/utils/BlockSupportType.h" + +// auto generated forward declare list +// clang-format off +namespace mce { class Color; } +// clang-format on + +class DarkOakLeavesBlock : public ::LeavesBlock { +public: + // prevent constructor by default + DarkOakLeavesBlock& operator=(DarkOakLeavesBlock const&); + DarkOakLeavesBlock(DarkOakLeavesBlock const&); + DarkOakLeavesBlock(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1DarkOakLeavesBlock@@UEAA@XZ + virtual ~DarkOakLeavesBlock() = default; + + // vIndex: 128, symbol: ?getVariant@DarkOakLeavesBlock@@UEBAHAEBVBlock@@@Z + virtual int getVariant(class Block const&) const; + + // symbol: + // ??0DarkOakLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z + MCAPI DarkOakLeavesBlock(std::string const&, int, class WeakPtr); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/DaylightDetectorBlock.h b/src/mc/world/level/block/DaylightDetectorBlock.h index 3bdc90283a..fdaaa7b18b 100644 --- a/src/mc/world/level/block/DaylightDetectorBlock.h +++ b/src/mc/world/level/block/DaylightDetectorBlock.h @@ -47,22 +47,22 @@ class DaylightDetectorBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@DaylightDetectorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@DaylightDetectorBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@DaylightDetectorBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 144, symbol: ?onRemove@DaylightDetectorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@DaylightDetectorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@DaylightDetectorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@DaylightDetectorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@DaylightDetectorBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@DaylightDetectorBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@DaylightDetectorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@DaylightDetectorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 168, symbol: ?updateSignalStrength@DaylightDetectorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?updateSignalStrength@DaylightDetectorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void updateSignalStrength(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0DaylightDetectorBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/DeadBushBlock.h b/src/mc/world/level/block/DeadBushBlock.h index 27135e1be7..778002e591 100644 --- a/src/mc/world/level/block/DeadBushBlock.h +++ b/src/mc/world/level/block/DeadBushBlock.h @@ -33,12 +33,6 @@ class DeadBushBlock : public ::BushBlock { // vIndex: 86, symbol: ?mayPlaceOn@DeadBushBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 138, symbol: ?canBeSilkTouched@DeadBushBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 163, symbol: ?getResourceItem@DeadBushBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0DeadBushBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI DeadBushBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/DecoratedPotBlock.h b/src/mc/world/level/block/DecoratedPotBlock.h index c84b1d0334..ba9cb61332 100644 --- a/src/mc/world/level/block/DecoratedPotBlock.h +++ b/src/mc/world/level/block/DecoratedPotBlock.h @@ -46,22 +46,22 @@ class DecoratedPotBlock : public ::FaceDirectionalActorBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 96, symbol: ?asItemInstance@DecoratedPotBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@DecoratedPotBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const* blockActor) const; - // vIndex: 111, symbol: ?hasComparatorSignal@DecoratedPotBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@DecoratedPotBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@DecoratedPotBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@DecoratedPotBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource&, class BlockPos const&, class Block const&, uchar) const; - // vIndex: 144, symbol: ?onRemove@DecoratedPotBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@DecoratedPotBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource&, class BlockPos const&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@DecoratedPotBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@DecoratedPotBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@DecoratedPotBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@DecoratedPotBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player&, class BlockPos const&, uchar) const; // symbol: ??0DecoratedPotBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/DeepslateBlock.h b/src/mc/world/level/block/DeepslateBlock.h index a377265763..65b7283f01 100644 --- a/src/mc/world/level/block/DeepslateBlock.h +++ b/src/mc/world/level/block/DeepslateBlock.h @@ -33,15 +33,9 @@ class DeepslateBlock : public ::RotatedPillarBlock { // vIndex: 47, symbol: ?canBeOriginalSurface@DeepslateBlock@@UEBA_NXZ virtual bool canBeOriginalSurface() const; - // vIndex: 141, symbol: ?tryGetInfested@DeepslateBlock@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 139, symbol: ?tryGetInfested@DeepslateBlock@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetInfested(class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@DeepslateBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@DeepslateBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - // symbol: ??0DeepslateBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI DeepslateBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/DeepslateRedStoneOreBlock.h b/src/mc/world/level/block/DeepslateRedStoneOreBlock.h index 6c810c329a..9659b84549 100644 --- a/src/mc/world/level/block/DeepslateRedStoneOreBlock.h +++ b/src/mc/world/level/block/DeepslateRedStoneOreBlock.h @@ -30,16 +30,13 @@ class DeepslateRedStoneOreBlock : public ::RedStoneOreBlock { // vIndex: 0, symbol: __gen_??1DeepslateRedStoneOreBlock@@UEAA@XZ virtual ~DeepslateRedStoneOreBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@DeepslateRedStoneOreBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@DeepslateRedStoneOreBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 150, symbol: ?tick@DeepslateRedStoneOreBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@DeepslateRedStoneOreBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 165, symbol: ?getSilkTouchItemInstance@DeepslateRedStoneOreBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - - // vIndex: 168, symbol: ?_lightUpBlock@DeepslateRedStoneOreBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?_lightUpBlock@DeepslateRedStoneOreBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void _lightUpBlock(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0DeepslateRedStoneOreBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/DetectorRailBlock.h b/src/mc/world/level/block/DetectorRailBlock.h index 7a8d3bc85e..c057c05fba 100644 --- a/src/mc/world/level/block/DetectorRailBlock.h +++ b/src/mc/world/level/block/DetectorRailBlock.h @@ -44,21 +44,21 @@ class DetectorRailBlock : public ::BaseRailBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@DetectorRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 111, symbol: ?hasComparatorSignal@DetectorRailBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@DetectorRailBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@DetectorRailBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@DetectorRailBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 129, symbol: ?getVariant@DetectorRailBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@DetectorRailBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 150, symbol: ?tick@DetectorRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@DetectorRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 167, symbol: ?entityInside@DetectorRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@DetectorRailBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0DetectorRailBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z @@ -71,5 +71,8 @@ class DetectorRailBlock : public ::BaseRailBlock { // symbol: ?_checkPressed@DetectorRailBlock@@AEBAXAEAVBlockSource@@AEBVBlockPos@@@Z MCAPI void _checkPressed(class BlockSource&, class BlockPos const&) const; + // symbol: ?_handlePressed@DetectorRailBlock@@AEBAXAEAVBlockSource@@AEBVBlockPos@@_N@Z + MCAPI void _handlePressed(class BlockSource&, class BlockPos const&, bool) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/DiodeBlock.h b/src/mc/world/level/block/DiodeBlock.h index 05a8d035da..bc7f1efe15 100644 --- a/src/mc/world/level/block/DiodeBlock.h +++ b/src/mc/world/level/block/DiodeBlock.h @@ -43,55 +43,55 @@ class DiodeBlock : public ::BlockLegacy { // vIndex: 85, symbol: ?mayPlace@DiodeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@DiodeBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@DiodeBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 130, symbol: ?canSpawnOn@DiodeBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@DiodeBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 156, symbol: ?canSurvive@DiodeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@DiodeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?getSignal@DiodeBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@H@Z + // vIndex: 163, symbol: ?getSignal@DiodeBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@H@Z virtual int getSignal(class BlockSource& region, class BlockPos const& pos, int dir) const; - // vIndex: 169, symbol: ?isLocked@DiodeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 164, symbol: ?isLocked@DiodeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool isLocked(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 170, symbol: ?isSameDiode@DiodeBlock@@UEBA_NAEBVBlock@@@Z + // vIndex: 165, symbol: ?isSameDiode@DiodeBlock@@UEBA_NAEBVBlock@@@Z virtual bool isSameDiode(class Block const& block) const; - // vIndex: 171, symbol: ?shouldPrioritize@DiodeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 166, symbol: ?shouldPrioritize@DiodeBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool shouldPrioritize(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 172, symbol: ?isOn@DiodeBlock@@MEBA_NXZ + // vIndex: 167, symbol: ?isOn@DiodeBlock@@MEBA_NXZ virtual bool isOn() const; - // vIndex: 173, symbol: ?shouldTurnOn@DiodeBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 168, symbol: ?shouldTurnOn@DiodeBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool shouldTurnOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 174, symbol: ?getInputSignal@DiodeBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 169, symbol: ?getInputSignal@DiodeBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getInputSignal(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 175, symbol: ?isAlternateInput@DiodeBlock@@MEBA_NAEBVBlock@@@Z + // vIndex: 170, symbol: ?isAlternateInput@DiodeBlock@@MEBA_NAEBVBlock@@@Z virtual bool isAlternateInput(class Block const& block) const; - // vIndex: 176, symbol: ?getAlternateSignal@DiodeBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 171, symbol: ?getAlternateSignal@DiodeBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getAlternateSignal(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 177, symbol: ?getOutputSignal@DiodeBlock@@MEBAHAEBVBlock@@@Z + // vIndex: 172, symbol: ?getOutputSignal@DiodeBlock@@MEBAHAEBVBlock@@@Z virtual int getOutputSignal(class Block const& block) const; - // vIndex: 178, symbol: ?getTurnOffDelay@DiodeBlock@@MEBAHAEBVBlock@@@Z + // vIndex: 173, symbol: ?getTurnOffDelay@DiodeBlock@@MEBAHAEBVBlock@@@Z virtual int getTurnOffDelay(class Block const& block) const; - // vIndex: 179, symbol: ?getTurnOnDelay@RepeaterBlock@@MEBAHAEBVBlock@@@Z + // vIndex: 174, symbol: ?getTurnOnDelay@RepeaterBlock@@MEBAHAEBVBlock@@@Z virtual int getTurnOnDelay(class Block const& block) const = 0; - // vIndex: 180, symbol: ?getOnBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z + // vIndex: 175, symbol: ?getOnBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z virtual class Block const* getOnBlock(class Block const* block) const = 0; - // vIndex: 181, symbol: ?getOffBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z + // vIndex: 176, symbol: ?getOffBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z virtual class Block const* getOffBlock(class Block const* block) const = 0; // symbol: ??0DiodeBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/DirtBlock.h b/src/mc/world/level/block/DirtBlock.h index 584efd6438..cbab28935a 100644 --- a/src/mc/world/level/block/DirtBlock.h +++ b/src/mc/world/level/block/DirtBlock.h @@ -52,35 +52,29 @@ class DirtBlock : public ::BlockLegacy { virtual bool tryToTill(class BlockSource& region, class BlockPos const& pos, class Actor& entity, class ItemStack& item) const; - // vIndex: 96, symbol: ?asItemInstance@DirtBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@DirtBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@DirtBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@DirtBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@DirtBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@DirtBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@DirtBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@DirtBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@DirtBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 154, symbol: ?use@DirtBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@DirtBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 162, symbol: ?getMapColor@DirtBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@DirtBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@DirtBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@DirtBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: ??0DirtBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI DirtBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/DirtPathBlock.h b/src/mc/world/level/block/DirtPathBlock.h index dd75781e92..da4923861a 100644 --- a/src/mc/world/level/block/DirtPathBlock.h +++ b/src/mc/world/level/block/DirtPathBlock.h @@ -58,18 +58,15 @@ class DirtPathBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 150, symbol: ?tick@DirtPathBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@DirtPathBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 154, symbol: ?use@DirtPathBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@DirtPathBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@DirtPathBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@DirtPathBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@DirtPathBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0DirtPathBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI DirtPathBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/DispenserBlock.h b/src/mc/world/level/block/DispenserBlock.h index 4fce3cc1f4..c100b86544 100644 --- a/src/mc/world/level/block/DispenserBlock.h +++ b/src/mc/world/level/block/DispenserBlock.h @@ -40,7 +40,7 @@ class DispenserBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@DispenserBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 98, symbol: ?getPlacementBlock@DispenserBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@DispenserBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -49,42 +49,42 @@ class DispenserBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 111, symbol: ?hasComparatorSignal@DispenserBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@DispenserBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@DispenserBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@DispenserBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 129, symbol: ?getVariant@DispenserBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@DispenserBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@DispenserBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@DispenserBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 144, symbol: ?onRemove@DispenserBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@DispenserBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@DispenserBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@DispenserBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@DispenserBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@DispenserBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@DispenserBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@DispenserBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@DispenserBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@DispenserBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 155, symbol: ?allowStateMismatchOnPlacement@DispenserBlock@@UEBA_NAEBVBlock@@0@Z + // vIndex: 152, symbol: ?allowStateMismatchOnPlacement@DispenserBlock@@UEBA_NAEBVBlock@@0@Z virtual bool allowStateMismatchOnPlacement(class Block const&, class Block const&) const; - // vIndex: 168, symbol: ?getTickDelay@DispenserBlock@@UEBAHXZ + // vIndex: 163, symbol: ?getTickDelay@DispenserBlock@@UEBAHXZ virtual int getTickDelay() const; - // vIndex: 169, symbol: ?dispenseFrom@DispenserBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 164, symbol: ?dispenseFrom@DispenserBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void dispenseFrom(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0DispenserBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/DoorBlock.h b/src/mc/world/level/block/DoorBlock.h index 38a8c4d5a1..2d1ca9c169 100644 --- a/src/mc/world/level/block/DoorBlock.h +++ b/src/mc/world/level/block/DoorBlock.h @@ -86,43 +86,31 @@ class DoorBlock : public ::BlockLegacy { virtual bool getSecondPart(class IConstBlockSource const& region, class BlockPos const& pos, class BlockPos& out) const; - // vIndex: 96, symbol: ?asItemInstance@DoorBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@DoorBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 129, symbol: ?getVariant@DoorBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@DoorBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@DoorBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@DoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@DoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@DoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@DoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@DoorBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@DoorBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@DoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@DoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@DoorBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@DoorBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@DoorBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 164, symbol: ?getResourceCount@DoorBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@DoorBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - - // vIndex: 166, symbol: ?_onHitByActivatingAttack@DoorBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // vIndex: 160, symbol: ?_onHitByActivatingAttack@DoorBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; - // vIndex: 167, symbol: ?entityInside@DoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@DoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: diff --git a/src/mc/world/level/block/DoublePlantBaseBlock.h b/src/mc/world/level/block/DoublePlantBaseBlock.h index 2600fecd3c..198891406f 100644 --- a/src/mc/world/level/block/DoublePlantBaseBlock.h +++ b/src/mc/world/level/block/DoublePlantBaseBlock.h @@ -78,22 +78,19 @@ class DoublePlantBaseBlock : public ::BushBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@DoublePlantBaseBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@DoublePlantBaseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@DoublePlantBaseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@DoublePlantBaseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@DoublePlantBaseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@DoublePlantBaseBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@DoublePlantBaseBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?checkAlive@DoublePlantBaseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?checkAlive@DoublePlantBaseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void checkAlive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 170, symbol: ?_keepRelevantStateForDropping@DoublePlantBaseBlock@@MEBAAEBVBlock@@AEBV2@@Z + // vIndex: 165, symbol: ?_keepRelevantStateForDropping@DoublePlantBaseBlock@@MEBAAEBVBlock@@AEBV2@@Z virtual class Block const& _keepRelevantStateForDropping(class Block const& block) const; // symbol: ??0DoublePlantBaseBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/DoublePlantBlock.h b/src/mc/world/level/block/DoublePlantBlock.h index ff50cb896a..fcc22069d1 100644 --- a/src/mc/world/level/block/DoublePlantBlock.h +++ b/src/mc/world/level/block/DoublePlantBlock.h @@ -44,38 +44,38 @@ class DoublePlantBlock : public ::DoublePlantBaseBlock { virtual bool canBeFertilized(class BlockSource& region, class BlockPos const& pos, class Block const& aboveBlock) const; - // vIndex: 96, symbol: ?asItemInstance@DoublePlantBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@DoublePlantBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 104, symbol: ?canBeBuiltOver@DoublePlantBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 103, symbol: ?canBeBuiltOver@DoublePlantBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canBeBuiltOver(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@DoublePlantBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@DoublePlantBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@DoublePlantBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 122, symbol: ?getColor@DoublePlantBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@DoublePlantBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 124, symbol: ?getColorForParticle@DoublePlantBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 123, symbol: ?getColorForParticle@DoublePlantBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColorForParticle(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 129, symbol: ?getVariant@DoublePlantBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@DoublePlantBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 157, symbol: ?getRenderLayer@DoublePlantBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@DoublePlantBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@DoublePlantBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; - // vIndex: 170, symbol: ?_keepRelevantStateForDropping@DoublePlantBlock@@MEBAAEBVBlock@@AEBV2@@Z + // vIndex: 165, symbol: ?_keepRelevantStateForDropping@DoublePlantBlock@@MEBAAEBVBlock@@AEBV2@@Z virtual class Block const& _keepRelevantStateForDropping(class Block const& block) const; // symbol: ??0DoublePlantBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/DragonEggBlock.h b/src/mc/world/level/block/DragonEggBlock.h index aebcf11cb8..84ec7cd064 100644 --- a/src/mc/world/level/block/DragonEggBlock.h +++ b/src/mc/world/level/block/DragonEggBlock.h @@ -33,16 +33,16 @@ class DragonEggBlock : public ::FallingBlock { // vIndex: 89, symbol: ?breaksFallingBlocks@DragonEggBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 101, symbol: ?attack@DragonEggBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z + // vIndex: 100, symbol: ?attack@DragonEggBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z virtual bool attack(class Player* player, class BlockPos const& pos) const; - // vIndex: 154, symbol: ?use@DragonEggBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@DragonEggBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 168, symbol: ?getDustColor@DragonEggBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@DragonEggBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@DragonEggBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; diff --git a/src/mc/world/level/block/DropperBlock.h b/src/mc/world/level/block/DropperBlock.h index 719591bf57..74cc22656c 100644 --- a/src/mc/world/level/block/DropperBlock.h +++ b/src/mc/world/level/block/DropperBlock.h @@ -30,7 +30,7 @@ class DropperBlock : public ::DispenserBlock { // vIndex: 0, symbol: __gen_??1DropperBlock@@UEAA@XZ virtual ~DropperBlock() = default; - // vIndex: 169, symbol: ?dispenseFrom@DropperBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 164, symbol: ?dispenseFrom@DropperBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void dispenseFrom(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0DropperBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ElementBlock.h b/src/mc/world/level/block/ElementBlock.h index 304225ce5c..54a8521aee 100644 --- a/src/mc/world/level/block/ElementBlock.h +++ b/src/mc/world/level/block/ElementBlock.h @@ -34,14 +34,14 @@ class ElementBlock : public ::BlockLegacy { // vIndex: 60, symbol: ?canBeUsedInCommands@ElementBlock@@UEBA_NAEBVBaseGameVersion@@@Z virtual bool canBeUsedInCommands(class BaseGameVersion const& requiredBaseGameVersion) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@ElementBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 139, symbol: ?tryLegacyUpgrade@ElementBlock@@UEBAPEBVBlock@@G@Z + // vIndex: 137, symbol: ?tryLegacyUpgrade@ElementBlock@@UEBAPEBVBlock@@G@Z virtual class Block const* tryLegacyUpgrade(ushort extraData) const; - // vIndex: 162, symbol: ?getMapColor@ElementBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@ElementBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; // symbol: ??0ElementBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HW4ElementType@@@Z diff --git a/src/mc/world/level/block/EnchantingTableBlock.h b/src/mc/world/level/block/EnchantingTableBlock.h index e8a9cd985d..954ae05f42 100644 --- a/src/mc/world/level/block/EnchantingTableBlock.h +++ b/src/mc/world/level/block/EnchantingTableBlock.h @@ -40,10 +40,10 @@ class EnchantingTableBlock : public ::ActorBlock { virtual bool checkIsPathable(class Actor& entity, class BlockPos const& lastPathPos, class BlockPos const& pathPos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@EnchantingTableBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@EnchantingTableBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@EnchantingTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@EnchantingTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0EnchantingTableBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/EndGatewayBlock.h b/src/mc/world/level/block/EndGatewayBlock.h index 57802d7394..d26fcc146d 100644 --- a/src/mc/world/level/block/EndGatewayBlock.h +++ b/src/mc/world/level/block/EndGatewayBlock.h @@ -57,10 +57,10 @@ class EndGatewayBlock : public ::ActorBlock { // vIndex: 77, symbol: ?canRenderSelectionOverlay@EndGatewayBlock@@UEBA_NW4BlockRenderLayer@@@Z virtual bool canRenderSelectionOverlay(::BlockRenderLayer) const; - // vIndex: 96, symbol: ?asItemInstance@EndGatewayBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@EndGatewayBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@EndGatewayBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; diff --git a/src/mc/world/level/block/EndPortalBlock.h b/src/mc/world/level/block/EndPortalBlock.h index bbd8f536fa..1cd7c1c558 100644 --- a/src/mc/world/level/block/EndPortalBlock.h +++ b/src/mc/world/level/block/EndPortalBlock.h @@ -15,6 +15,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -53,21 +54,23 @@ class EndPortalBlock : public ::ActorBlock { // vIndex: 77, symbol: ?canRenderSelectionOverlay@EndPortalBlock@@UEBA_NW4BlockRenderLayer@@@Z virtual bool canRenderSelectionOverlay(::BlockRenderLayer) const; - // vIndex: 96, symbol: ?asItemInstance@EndPortalBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@EndPortalBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@EndPortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@EndPortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 148, symbol: ?onFallOn@EndPortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@EndPortalBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 167, symbol: ?entityInside@EndPortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@EndPortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0EndPortalBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI EndPortalBlock(std::string const& nameId, int id); + // symbol: ?onFallOn@EndPortalBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/EndPortalFrameBlock.h b/src/mc/world/level/block/EndPortalFrameBlock.h index ada0d12e76..b0e82f7915 100644 --- a/src/mc/world/level/block/EndPortalFrameBlock.h +++ b/src/mc/world/level/block/EndPortalFrameBlock.h @@ -54,29 +54,23 @@ class EndPortalFrameBlock : public ::BlockLegacy { // vIndex: 23, symbol: ?canProvideSupport@EndPortalFrameBlock@@UEBA_NAEBVBlock@@EW4BlockSupportType@@@Z virtual bool canProvideSupport(class Block const&, uchar face, ::BlockSupportType) const; - // vIndex: 111, symbol: ?hasComparatorSignal@EndPortalFrameBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@EndPortalFrameBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@EndPortalFrameBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@EndPortalFrameBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 144, symbol: ?onRemove@EndPortalFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@EndPortalFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@EndPortalFrameBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@EndPortalFrameBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@EndPortalFrameBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@EndPortalFrameBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 164, symbol: ?getResourceCount@EndPortalFrameBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@EndPortalFrameBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - // symbol: ??0EndPortalFrameBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI EndPortalFrameBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/EndRodBlock.h b/src/mc/world/level/block/EndRodBlock.h index 6572143c73..332ce45abd 100644 --- a/src/mc/world/level/block/EndRodBlock.h +++ b/src/mc/world/level/block/EndRodBlock.h @@ -49,7 +49,7 @@ class EndRodBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@EndRodBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 98, symbol: ?getPlacementBlock@EndRodBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@EndRodBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -58,13 +58,13 @@ class EndRodBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@EndRodBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@EndRodBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@EndRodBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@EndRodBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@EndRodBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@EndRodBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; diff --git a/src/mc/world/level/block/EnderChestBlock.h b/src/mc/world/level/block/EnderChestBlock.h index 54a1b42c91..575da12b00 100644 --- a/src/mc/world/level/block/EnderChestBlock.h +++ b/src/mc/world/level/block/EnderChestBlock.h @@ -30,13 +30,10 @@ class EnderChestBlock : public ::ChestBlock { // vIndex: 0, symbol: __gen_??1EnderChestBlock@@UEAA@XZ virtual ~EnderChestBlock() = default; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@EnderChestBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@EnderChestBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - // symbol: ??0EnderChestBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI EnderChestBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/FaceDirectionalActorBlock.h b/src/mc/world/level/block/FaceDirectionalActorBlock.h index bec708df0f..a094c52092 100644 --- a/src/mc/world/level/block/FaceDirectionalActorBlock.h +++ b/src/mc/world/level/block/FaceDirectionalActorBlock.h @@ -30,7 +30,7 @@ class FaceDirectionalActorBlock : public ::ActorBlock { // vIndex: 0, symbol: ??1FaceDirectionalActorBlock@@UEAA@XZ virtual ~FaceDirectionalActorBlock(); - // vIndex: 98, symbol: + // vIndex: 97, symbol: // ?getPlacementBlock@FaceDirectionalActorBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, @@ -40,13 +40,13 @@ class FaceDirectionalActorBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 131, symbol: ?getRenderBlock@FaceDirectionalActorBlock@@UEBAAEBVBlock@@XZ + // vIndex: 130, symbol: ?getRenderBlock@FaceDirectionalActorBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getRenderBlock() const; - // vIndex: 132, symbol: ?getMappedFace@FaceDirectionalActorBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@FaceDirectionalActorBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 133, symbol: ?getFaceFlip@FaceDirectionalActorBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@FaceDirectionalActorBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar face, class Block const& block) const; // symbol: diff --git a/src/mc/world/level/block/FaceDirectionalBlock.h b/src/mc/world/level/block/FaceDirectionalBlock.h index 37aaa830cd..6f42e5ac50 100644 --- a/src/mc/world/level/block/FaceDirectionalBlock.h +++ b/src/mc/world/level/block/FaceDirectionalBlock.h @@ -33,7 +33,7 @@ class FaceDirectionalBlock : public ::BlockLegacy { // vIndex: 49, symbol: ?isValidAuxValue@FaceDirectionalBlock@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 98, symbol: + // vIndex: 97, symbol: // ?getPlacementBlock@FaceDirectionalBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, @@ -43,13 +43,13 @@ class FaceDirectionalBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 131, symbol: ?getRenderBlock@FaceDirectionalBlock@@UEBAAEBVBlock@@XZ + // vIndex: 130, symbol: ?getRenderBlock@FaceDirectionalBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getRenderBlock() const; - // vIndex: 132, symbol: ?getMappedFace@FaceDirectionalBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@FaceDirectionalBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 133, symbol: ?getFaceFlip@FaceDirectionalBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@FaceDirectionalBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar face, class Block const& block) const; // symbol: diff --git a/src/mc/world/level/block/FarmBlock.h b/src/mc/world/level/block/FarmBlock.h index d8041fca96..ee087048b2 100644 --- a/src/mc/world/level/block/FarmBlock.h +++ b/src/mc/world/level/block/FarmBlock.h @@ -54,19 +54,19 @@ class FarmBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 129, symbol: ?getVariant@FarmBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@FarmBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 144, symbol: ?onRemove@FarmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@FarmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@FarmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@FarmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@FarmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@FarmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@FarmBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@FarmBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0FarmBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/FenceBlock.h b/src/mc/world/level/block/FenceBlock.h index ede02ad4f0..d89465fcab 100644 --- a/src/mc/world/level/block/FenceBlock.h +++ b/src/mc/world/level/block/FenceBlock.h @@ -78,17 +78,14 @@ class FenceBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@FenceBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const&, class BaseGameVersion version) const; - // vIndex: 96, symbol: ?asItemInstance@FenceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@FenceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@FenceBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@FenceBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 154, symbol: ?use@FenceBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@FenceBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0FenceBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z diff --git a/src/mc/world/level/block/FenceGateBlock.h b/src/mc/world/level/block/FenceGateBlock.h index a94bab429c..11b15aff61 100644 --- a/src/mc/world/level/block/FenceGateBlock.h +++ b/src/mc/world/level/block/FenceGateBlock.h @@ -69,7 +69,7 @@ class FenceGateBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@FenceGateBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@FenceGateBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -78,20 +78,20 @@ class FenceGateBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 147, symbol: ?onPlace@FenceGateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@FenceGateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@FenceGateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@FenceGateBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@FenceGateBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@FenceGateBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@FenceGateBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@FenceGateBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 166, symbol: ?_onHitByActivatingAttack@FenceGateBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // vIndex: 160, symbol: ?_onHitByActivatingAttack@FenceGateBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; // symbol: ??0FenceGateBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HW4WoodType@@@Z MCAPI FenceGateBlock(std::string const& nameId, int id, ::WoodType woodType); diff --git a/src/mc/world/level/block/FireBlock.h b/src/mc/world/level/block/FireBlock.h index 1aed32c6c9..9dfb04b12f 100644 --- a/src/mc/world/level/block/FireBlock.h +++ b/src/mc/world/level/block/FireBlock.h @@ -60,19 +60,16 @@ class FireBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@FireBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 167, symbol: ?entityInside@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@FireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource&, class BlockPos const&, class Actor& entity) const; // symbol: ??0FireBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/FlowerBlock.h b/src/mc/world/level/block/FlowerBlock.h index 671f4a602c..c5ab051920 100644 --- a/src/mc/world/level/block/FlowerBlock.h +++ b/src/mc/world/level/block/FlowerBlock.h @@ -67,28 +67,28 @@ class FlowerBlock : public ::BushBlock { // vIndex: 86, symbol: ?mayPlaceOn@FlowerBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@FlowerBlock@@MEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@FlowerBlock@@MEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@FlowerBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@FlowerBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@FlowerBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@FlowerBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@FlowerBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 157, symbol: ?getRenderLayer@FlowerBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@FlowerBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@FlowerBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@FlowerBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@FlowerBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; @@ -97,4 +97,11 @@ class FlowerBlock : public ::BushBlock { MCAPI FlowerBlock(std::string const& nameId, int id, ::FlowerBlock::Type type, class Material const& material); // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: ?_randomWalk@FlowerBlock@@AEBA_NAEAVBlockSource@@AEAH11H@Z + MCAPI bool _randomWalk(class BlockSource& region, int& xx, int& yy, int& zz, int j) const; + + // NOLINTEND }; diff --git a/src/mc/world/level/block/FlowerPotBlock.h b/src/mc/world/level/block/FlowerPotBlock.h index c129ef76be..d018d27e5c 100644 --- a/src/mc/world/level/block/FlowerPotBlock.h +++ b/src/mc/world/level/block/FlowerPotBlock.h @@ -52,22 +52,22 @@ class FlowerPotBlock : public ::ActorBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 96, symbol: ?asItemInstance@FlowerPotBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@FlowerPotBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const* blockActor) const; - // vIndex: 144, symbol: ?onRemove@FlowerPotBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@FlowerPotBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@FlowerPotBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@FlowerPotBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@FlowerPotBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@FlowerPotBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@FlowerPotBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@FlowerPotBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar) const; - // vIndex: 156, symbol: ?canSurvive@FlowerPotBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@FlowerPotBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0FlowerPotBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/FrogSpawnBlock.h b/src/mc/world/level/block/FrogSpawnBlock.h index 37f2649424..8afdcd54a7 100644 --- a/src/mc/world/level/block/FrogSpawnBlock.h +++ b/src/mc/world/level/block/FrogSpawnBlock.h @@ -54,23 +54,20 @@ class FrogSpawnBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const&) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@FrogSpawnBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@FrogSpawnBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@FrogSpawnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@FrogSpawnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@FrogSpawnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@FrogSpawnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@FrogSpawnBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@FrogSpawnBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 167, symbol: ?entityInside@FrogSpawnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@FrogSpawnBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0FrogSpawnBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/FrostedIceBlock.h b/src/mc/world/level/block/FrostedIceBlock.h index c6df7215ed..ce3b6af2ae 100644 --- a/src/mc/world/level/block/FrostedIceBlock.h +++ b/src/mc/world/level/block/FrostedIceBlock.h @@ -37,16 +37,13 @@ class FrostedIceBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 96, symbol: ?asItemInstance@FrostedIceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@FrostedIceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 138, symbol: ?canBeSilkTouched@FrostedIceBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@FrostedIceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@FrostedIceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@FrostedIceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@FrostedIceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: ??0FrostedIceBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/FurnaceBlock.h b/src/mc/world/level/block/FurnaceBlock.h index 6d2766a6d0..baa666f7dd 100644 --- a/src/mc/world/level/block/FurnaceBlock.h +++ b/src/mc/world/level/block/FurnaceBlock.h @@ -37,30 +37,30 @@ class FurnaceBlock : public ::ActorBlock { // vIndex: 31, symbol: ?isCraftingBlock@FurnaceBlock@@UEBA_NXZ virtual bool isCraftingBlock() const; - // vIndex: 96, symbol: ?asItemInstance@FurnaceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@FurnaceBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 111, symbol: ?hasComparatorSignal@FurnaceBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@FurnaceBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@FurnaceBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@FurnaceBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 132, symbol: ?getMappedFace@FurnaceBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@FurnaceBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@FurnaceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@FurnaceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 144, symbol: ?onRemove@FurnaceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@FurnaceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@FurnaceBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@FurnaceBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@FurnaceBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@FurnaceBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0FurnaceBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/GildedBlackstoneBlock.h b/src/mc/world/level/block/GildedBlackstoneBlock.h deleted file mode 100644 index dd54a9f9b9..0000000000 --- a/src/mc/world/level/block/GildedBlackstoneBlock.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/BlockLegacy.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class GildedBlackstoneBlock : public ::BlockLegacy { -public: - // prevent constructor by default - GildedBlackstoneBlock& operator=(GildedBlackstoneBlock const&); - GildedBlackstoneBlock(GildedBlackstoneBlock const&); - GildedBlackstoneBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1GildedBlackstoneBlock@@UEAA@XZ - virtual ~GildedBlackstoneBlock() = default; - - // vIndex: 163, symbol: ?getResourceItem@GildedBlackstoneBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance - getResourceItem(class Randomize& randomize, class Block const& block, int bonusLootLevel) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@GildedBlackstoneBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - - // symbol: - // ??0GildedBlackstoneBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z - MCAPI GildedBlackstoneBlock(std::string const& nameId, int id, class Material const& material); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/GlassBlock.h b/src/mc/world/level/block/GlassBlock.h index e3eb47f834..94852bee7e 100644 --- a/src/mc/world/level/block/GlassBlock.h +++ b/src/mc/world/level/block/GlassBlock.h @@ -45,9 +45,6 @@ class GlassBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@GlassBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 164, symbol: ?getResourceCount@GlassBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const& block, int bonusLootLevel) const; - // symbol: // ??0GlassBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@_N22@Z MCAPI GlassBlock(std::string const&, int, class Material const&, bool, bool, bool); diff --git a/src/mc/world/level/block/GlazedTerracottaBlock.h b/src/mc/world/level/block/GlazedTerracottaBlock.h index 453c4a7afc..ceda509e9b 100644 --- a/src/mc/world/level/block/GlazedTerracottaBlock.h +++ b/src/mc/world/level/block/GlazedTerracottaBlock.h @@ -33,7 +33,7 @@ class GlazedTerracottaBlock : public ::FaceDirectionalBlock { // vIndex: 49, symbol: ?isValidAuxValue@GlazedTerracottaBlock@@UEBA_NH@Z virtual bool isValidAuxValue(int value) const; - // vIndex: 98, symbol: + // vIndex: 97, symbol: // ?getPlacementBlock@GlazedTerracottaBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, diff --git a/src/mc/world/level/block/GlowItemFrameBlock.h b/src/mc/world/level/block/GlowItemFrameBlock.h index d5082b6c14..a96603a51b 100644 --- a/src/mc/world/level/block/GlowItemFrameBlock.h +++ b/src/mc/world/level/block/GlowItemFrameBlock.h @@ -30,7 +30,7 @@ class GlowItemFrameBlock : public ::ItemFrameBlock { // vIndex: 0, symbol: __gen_??1GlowItemFrameBlock@@UEAA@XZ virtual ~GlowItemFrameBlock() = default; - // vIndex: 168, symbol: ?getSpawnedItemName@GlowItemFrameBlock@@UEBA?AVHashedString@@XZ + // vIndex: 163, symbol: ?getSpawnedItemName@GlowItemFrameBlock@@UEBA?AVHashedString@@XZ virtual class HashedString getSpawnedItemName() const; // symbol: ??0GlowItemFrameBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/GlowLichenBlock.h b/src/mc/world/level/block/GlowLichenBlock.h index 63690dd1d4..a81a22718e 100644 --- a/src/mc/world/level/block/GlowLichenBlock.h +++ b/src/mc/world/level/block/GlowLichenBlock.h @@ -40,16 +40,13 @@ class GlowLichenBlock : public ::MultifaceBlock { virtual bool canBeFertilized(class BlockSource& region, class BlockPos const& pos, class Block const& aboveBlock) const; - // vIndex: 136, symbol: ?init@GlowLichenBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@GlowLichenBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 138, symbol: ?canBeSilkTouched@GlowLichenBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 168, symbol: ?getMultifaceBlock@GlowLichenBlock@@UEBAAEBVBlock@@XZ + // vIndex: 163, symbol: ?getMultifaceBlock@GlowLichenBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getMultifaceBlock() const; - // vIndex: 169, symbol: ?getMultifaceSpreader@GlowLichenBlock@@UEBAAEBVMultifaceSpreader@@XZ + // vIndex: 164, symbol: ?getMultifaceSpreader@GlowLichenBlock@@UEBAAEBVMultifaceSpreader@@XZ virtual class MultifaceSpreader const& getMultifaceSpreader() const; // symbol: diff --git a/src/mc/world/level/block/GlowstoneBlock.h b/src/mc/world/level/block/GlowstoneBlock.h index 224c19aa23..2215936ab6 100644 --- a/src/mc/world/level/block/GlowstoneBlock.h +++ b/src/mc/world/level/block/GlowstoneBlock.h @@ -34,12 +34,6 @@ class GlowstoneBlock : public ::BlockLegacy { virtual bool dispense(class BlockSource& region, class Container& container, int slot, class Vec3 const& pos, uchar face) const; - // vIndex: 163, symbol: ?getResourceItem@GlowstoneBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@GlowstoneBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const&, int bonusLootLevel) const; - // symbol: // ??0GlowstoneBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI GlowstoneBlock(std::string const& nameId, int id, class Material const& material); diff --git a/src/mc/world/level/block/GrassBlock.h b/src/mc/world/level/block/GrassBlock.h index 5668c119a8..44b5ab99d9 100644 --- a/src/mc/world/level/block/GrassBlock.h +++ b/src/mc/world/level/block/GrassBlock.h @@ -50,29 +50,26 @@ class GrassBlock : public ::BlockLegacy { virtual bool tryToTill(class BlockSource& region, class BlockPos const& pos, class Actor& entity, class ItemStack& item) const; - // vIndex: 99, symbol: ?calcVariant@GrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVColor@mce@@@Z + // vIndex: 98, symbol: ?calcVariant@GrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVColor@mce@@@Z virtual int calcVariant(class BlockSource& region, class BlockPos const& pos, class mce::Color const& baseColor) const; - // vIndex: 121, symbol: ?getColor@GrassBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@GrassBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@GrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@GrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 151, symbol: ?randomTick@GrassBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@GrassBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@GrassBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@GrassBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 162, symbol: ?getMapColor@GrassBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@GrassBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const&) const; - // vIndex: 163, symbol: ?getResourceItem@GrassBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0GrassBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI GrassBlock(std::string const& nameId, int id); @@ -89,5 +86,8 @@ class GrassBlock : public ::BlockLegacy { // symbol: ?_canBeGrass@GrassBlock@@AEBA_NAEBVBlockSource@@AEBVBlockPos@@@Z MCAPI bool _canBeGrass(class BlockSource const& region, class BlockPos const& pos) const; + // symbol: ?_plantGrass@GrassBlock@@AEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAVRandomize@@@Z + MCAPI bool _plantGrass(class BlockSource& region, class BlockPos const&, class Randomize& randomize) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/GravelBlock.h b/src/mc/world/level/block/GravelBlock.h index 3d374dc262..92944e5f64 100644 --- a/src/mc/world/level/block/GravelBlock.h +++ b/src/mc/world/level/block/GravelBlock.h @@ -46,14 +46,10 @@ class GravelBlock : public ::FallingBlock { virtual bool canBeFertilized(class BlockSource& region, class BlockPos const& pos, class Block const& aboveBlock) const; - // vIndex: 163, symbol: ?getResourceItem@GravelBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance - getResourceItem(class Randomize& randomize, class Block const&, int bonusLootLevel) const; - - // vIndex: 168, symbol: ?getDustColor@GravelBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@GravelBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@GravelBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; diff --git a/src/mc/world/level/block/GrindstoneBlock.h b/src/mc/world/level/block/GrindstoneBlock.h index fef08b6d81..ad86bb7661 100644 --- a/src/mc/world/level/block/GrindstoneBlock.h +++ b/src/mc/world/level/block/GrindstoneBlock.h @@ -43,7 +43,7 @@ class GrindstoneBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@GrindstoneBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@GrindstoneBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -52,21 +52,18 @@ class GrindstoneBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 150, symbol: ?tick@GrindstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@GrindstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@GrindstoneBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@GrindstoneBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@GrindstoneBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@GrindstoneBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@GrindstoneBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@GrindstoneBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 165, symbol: ?getSilkTouchItemInstance@GrindstoneBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - // symbol: ??0GrindstoneBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI GrindstoneBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/HangingRootsBlock.h b/src/mc/world/level/block/HangingRootsBlock.h index 3812f2e891..8c90cb95e2 100644 --- a/src/mc/world/level/block/HangingRootsBlock.h +++ b/src/mc/world/level/block/HangingRootsBlock.h @@ -54,10 +54,10 @@ class HangingRootsBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 150, symbol: ?tick@HangingRootsBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@HangingRootsBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@HangingRootsBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@HangingRootsBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0HangingRootsBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/HangingSignBlock.h b/src/mc/world/level/block/HangingSignBlock.h index 628ad6a4d9..ea41e1a0e8 100644 --- a/src/mc/world/level/block/HangingSignBlock.h +++ b/src/mc/world/level/block/HangingSignBlock.h @@ -48,13 +48,13 @@ class HangingSignBlock : public ::SignBlock { // vIndex: 84, symbol: ?mayPlace@HangingSignBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@E@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@HangingSignBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@HangingSignBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?getYRotationInDegrees@HangingSignBlock@@UEBAMAEBVBlock@@@Z + // vIndex: 163, symbol: ?getYRotationInDegrees@HangingSignBlock@@UEBAMAEBVBlock@@@Z virtual float getYRotationInDegrees(class Block const& block) const; - // vIndex: 170, symbol: ?_getItemInstance@HangingSignBlock@@MEBA?AVItemInstance@@XZ + // vIndex: 165, symbol: ?_getItemInstance@HangingSignBlock@@MEBA?AVItemInstance@@XZ virtual class ItemInstance _getItemInstance() const; // symbol: diff --git a/src/mc/world/level/block/HayBlock.h b/src/mc/world/level/block/HayBlock.h index c07a66c0d5..14aee619d6 100644 --- a/src/mc/world/level/block/HayBlock.h +++ b/src/mc/world/level/block/HayBlock.h @@ -15,6 +15,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -30,18 +31,20 @@ class HayBlock : public ::RotatedPillarBlock { // vIndex: 0, symbol: __gen_??1HayBlock@@UEAA@XZ virtual ~HayBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@HayBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@HayBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 129, symbol: ?getVariant@HayBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@HayBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 148, symbol: ?onFallOn@HayBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@HayBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); // symbol: ??0HayBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI HayBlock(std::string const& nameId, int id); + // symbol: ?onFallOn@HayBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/HoneyBlock.h b/src/mc/world/level/block/HoneyBlock.h index d62c18effb..b42c4f944e 100644 --- a/src/mc/world/level/block/HoneyBlock.h +++ b/src/mc/world/level/block/HoneyBlock.h @@ -15,6 +15,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -39,19 +40,21 @@ class HoneyBlock : public ::BlockLegacy { // vIndex: 11, symbol: ?getVisualShape@HoneyBlock@@UEBAAEBVAABB@@AEBVBlock@@AEAV2@@Z virtual class AABB const& getVisualShape(class Block const&, class AABB&) const; - // vIndex: 146, symbol: ?onStandOn@HoneyBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z - virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@HoneyBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 148, symbol: ?onFallOn@HoneyBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; + // vIndex: 144, symbol: ?onStandOn@HoneyBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z + virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; - // vIndex: 159, symbol: ?getExtraRenderLayers@HoneyBlock@@UEBAHXZ + // vIndex: 156, symbol: ?getExtraRenderLayers@HoneyBlock@@UEBAHXZ virtual int getExtraRenderLayers() const; // symbol: ??0HoneyBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI HoneyBlock(std::string const& nameId, int id, class Material const& material); + // symbol: ?onFallOn@HoneyBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // symbol: ?triggerSlidingDownEffects@HoneyBlock@@SAXAEAVActor@@AEBVBlockPos@@AEBVBlock@@@Z MCAPI static void triggerSlidingDownEffects(class Actor& entity, class BlockPos const& pos, class Block const&); diff --git a/src/mc/world/level/block/HoneycombBlock.h b/src/mc/world/level/block/HoneycombBlock.h deleted file mode 100644 index 4c08d4a8a3..0000000000 --- a/src/mc/world/level/block/HoneycombBlock.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/BlockLegacy.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class HoneycombBlock : public ::BlockLegacy { -public: - // prevent constructor by default - HoneycombBlock& operator=(HoneycombBlock const&); - HoneycombBlock(HoneycombBlock const&); - HoneycombBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1HoneycombBlock@@UEAA@XZ - virtual ~HoneycombBlock() = default; - - // symbol: - // ??0HoneycombBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z - MCAPI HoneycombBlock(std::string const& nameId, int id, class Material const& material); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/HopperBlock.h b/src/mc/world/level/block/HopperBlock.h index de31b20221..a3151205a7 100644 --- a/src/mc/world/level/block/HopperBlock.h +++ b/src/mc/world/level/block/HopperBlock.h @@ -76,10 +76,10 @@ class HopperBlock : public ::ActorBlock { // vIndex: 89, symbol: ?breaksFallingBlocks@HopperBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 96, symbol: ?asItemInstance@HopperBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@HopperBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@HopperBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@HopperBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -88,27 +88,27 @@ class HopperBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 111, symbol: ?hasComparatorSignal@HopperBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@HopperBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@HopperBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@HopperBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 144, symbol: ?onRemove@HopperBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@HopperBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@HopperBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@HopperBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@HopperBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@HopperBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@HopperBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@HopperBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 155, symbol: ?allowStateMismatchOnPlacement@HopperBlock@@UEBA_NAEBVBlock@@0@Z + // vIndex: 152, symbol: ?allowStateMismatchOnPlacement@HopperBlock@@UEBA_NAEBVBlock@@0@Z virtual bool allowStateMismatchOnPlacement(class Block const&, class Block const&) const; // symbol: ??0HopperBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/HugeMushroomBlock.h b/src/mc/world/level/block/HugeMushroomBlock.h index 11640204d7..f038be4b76 100644 --- a/src/mc/world/level/block/HugeMushroomBlock.h +++ b/src/mc/world/level/block/HugeMushroomBlock.h @@ -6,7 +6,6 @@ #include "mc/common/wrapper/optional_ref.h" #include "mc/enums/FertilizerType.h" #include "mc/enums/Flip.h" -#include "mc/enums/MushroomOuterType.h" #include "mc/enums/ShapeType.h" #include "mc/world/Direction.h" #include "mc/world/level/block/BlockLegacy.h" @@ -35,30 +34,21 @@ class HugeMushroomBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1HugeMushroomBlock@@UEAA@XZ virtual ~HugeMushroomBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@HugeMushroomBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@HugeMushroomBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@HugeMushroomBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@HugeMushroomBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@HugeMushroomBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 162, symbol: + // vIndex: 159, symbol: // ?getMapColor@HugeMushroomBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& source, class BlockPos const& pos, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@HugeMushroomBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@HugeMushroomBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@HugeMushroomBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: // ??0HugeMushroomBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@W4Type@0@@Z MCAPI HugeMushroomBlock( @@ -69,11 +59,4 @@ class HugeMushroomBlock : public ::BlockLegacy { ); // NOLINTEND - - // private: - // NOLINTBEGIN - // symbol: ?_getBlockItemWithState@HugeMushroomBlock@@AEBA?AVItemInstance@@AEBVBlock@@W4MushroomOuterType@@@Z - MCAPI class ItemInstance _getBlockItemWithState(class Block const& block, ::MushroomOuterType state) const; - - // NOLINTEND }; diff --git a/src/mc/world/level/block/IceBlock.h b/src/mc/world/level/block/IceBlock.h index 0c97c46d6a..c3f27b33a9 100644 --- a/src/mc/world/level/block/IceBlock.h +++ b/src/mc/world/level/block/IceBlock.h @@ -37,15 +37,12 @@ class IceBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@IceBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@IceBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 151, symbol: ?randomTick@IceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@IceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 164, symbol: ?getResourceCount@IceBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: ??0IceBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z MCAPI IceBlock(std::string const& nameId, int id, bool packed); diff --git a/src/mc/world/level/block/InfestedBlock.h b/src/mc/world/level/block/InfestedBlock.h index a9e34ae1e1..72e9270a17 100644 --- a/src/mc/world/level/block/InfestedBlock.h +++ b/src/mc/world/level/block/InfestedBlock.h @@ -30,28 +30,28 @@ class InfestedBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1InfestedBlock@@UEAA@XZ virtual ~InfestedBlock() = default; - // vIndex: 95, symbol: - // ?spawnResources@InfestedBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z - virtual void - spawnResources(class BlockSource& region, class BlockPos const& pos, class Block const&, class Randomize&, struct ResourceDropsContext const&) - const; - - // vIndex: 96, symbol: ?asItemInstance@InfestedBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@InfestedBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@InfestedBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@InfestedBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@InfestedBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@InfestedBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@InfestedBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 142, symbol: ?tryGetUninfested@InfestedBlock@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 140, symbol: ?tryGetUninfested@InfestedBlock@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetUninfested(class Block const& block) const; + // vIndex: 161, symbol: + // ?_spawnAfterBreak@InfestedBlock@@EEBAXAEAVBlockSource@@AEBVBlock@@AEBVBlockPos@@AEBUResourceDropsContext@@@Z + virtual void + _spawnAfterBreak(class BlockSource&, class Block const&, class BlockPos const&, struct ResourceDropsContext const&) + const; + // symbol: ??0InfestedBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI InfestedBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/InfestedDeepslateBlock.h b/src/mc/world/level/block/InfestedDeepslateBlock.h index 2880026c76..656f3737ee 100644 --- a/src/mc/world/level/block/InfestedDeepslateBlock.h +++ b/src/mc/world/level/block/InfestedDeepslateBlock.h @@ -30,7 +30,7 @@ class InfestedDeepslateBlock : public ::RotatedPillarInfestedBlock { // vIndex: 0, symbol: __gen_??1InfestedDeepslateBlock@@UEAA@XZ virtual ~InfestedDeepslateBlock() = default; - // vIndex: 142, symbol: ?tryGetUninfested@InfestedDeepslateBlock@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 140, symbol: ?tryGetUninfested@InfestedDeepslateBlock@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetUninfested(class Block const& block) const; // symbol: diff --git a/src/mc/world/level/block/ItemFrameBlock.h b/src/mc/world/level/block/ItemFrameBlock.h index f859aae839..4981102899 100644 --- a/src/mc/world/level/block/ItemFrameBlock.h +++ b/src/mc/world/level/block/ItemFrameBlock.h @@ -62,16 +62,10 @@ class ItemFrameBlock : public ::ActorBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 95, symbol: - // ?spawnResources@ItemFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z - virtual void - spawnResources(class BlockSource& region, class BlockPos const& pos, class Block const& block, class Randomize& randomize, struct ResourceDropsContext const&) - const; - - // vIndex: 96, symbol: ?asItemInstance@ItemFrameBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@ItemFrameBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const* blockActor) const; - // vIndex: 98, symbol: ?getPlacementBlock@ItemFrameBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@ItemFrameBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -80,36 +74,42 @@ class ItemFrameBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 101, symbol: ?attack@ItemFrameBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z + // vIndex: 100, symbol: ?attack@ItemFrameBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z virtual bool attack(class Player* player, class BlockPos const& pos) const; - // vIndex: 111, symbol: ?hasComparatorSignal@ItemFrameBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@ItemFrameBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@ItemFrameBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@ItemFrameBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 144, symbol: ?onRemove@ItemFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@ItemFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@ItemFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ItemFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@ItemFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ItemFrameBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@ItemFrameBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@ItemFrameBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@ItemFrameBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@ItemFrameBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@ItemFrameBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@ItemFrameBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?getSpawnedItemName@ItemFrameBlock@@UEBA?AVHashedString@@XZ + // vIndex: 161, symbol: + // ?_spawnAfterBreak@ItemFrameBlock@@EEBAXAEAVBlockSource@@AEBVBlock@@AEBVBlockPos@@AEBUResourceDropsContext@@@Z + virtual void + _spawnAfterBreak(class BlockSource&, class Block const&, class BlockPos const&, struct ResourceDropsContext const&) + const; + + // vIndex: 163, symbol: ?getSpawnedItemName@ItemFrameBlock@@UEBA?AVHashedString@@XZ virtual class HashedString getSpawnedItemName() const; // symbol: ??0ItemFrameBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/JigsawBlock.h b/src/mc/world/level/block/JigsawBlock.h index 16eee390ae..1fb8f69e19 100644 --- a/src/mc/world/level/block/JigsawBlock.h +++ b/src/mc/world/level/block/JigsawBlock.h @@ -33,7 +33,7 @@ class JigsawBlock : public ::FaceDirectionalActorBlock { // vIndex: 60, symbol: ?canBeUsedInCommands@JigsawBlock@@UEBA_NAEBVBaseGameVersion@@@Z virtual bool canBeUsedInCommands(class BaseGameVersion const& requiredBaseGameVersion) const; - // vIndex: 98, symbol: ?getPlacementBlock@JigsawBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@JigsawBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -42,19 +42,19 @@ class JigsawBlock : public ::FaceDirectionalActorBlock { int itemValue ) const; - // vIndex: 131, symbol: ?getRenderBlock@JigsawBlock@@UEBAAEBVBlock@@XZ + // vIndex: 130, symbol: ?getRenderBlock@JigsawBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getRenderBlock() const; - // vIndex: 132, symbol: ?getMappedFace@JigsawBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@JigsawBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 133, symbol: ?getFaceFlip@JigsawBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@JigsawBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar face, class Block const& block) const; - // vIndex: 152, symbol: ?isInteractiveBlock@JigsawBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@JigsawBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@JigsawBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@JigsawBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0JigsawBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/JukeboxBlock.h b/src/mc/world/level/block/JukeboxBlock.h index 6a63cf1046..e9d5d7875b 100644 --- a/src/mc/world/level/block/JukeboxBlock.h +++ b/src/mc/world/level/block/JukeboxBlock.h @@ -40,21 +40,21 @@ class JukeboxBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@JukeboxBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 111, symbol: ?hasComparatorSignal@JukeboxBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@JukeboxBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@JukeboxBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@JukeboxBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 144, symbol: ?onRemove@JukeboxBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@JukeboxBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@JukeboxBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@JukeboxBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 154, symbol: ?use@JukeboxBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@JukeboxBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0JukeboxBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/JungleLeavesBlock.h b/src/mc/world/level/block/JungleLeavesBlock.h new file mode 100644 index 0000000000..476d756bf9 --- /dev/null +++ b/src/mc/world/level/block/JungleLeavesBlock.h @@ -0,0 +1,53 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/WeakPtr.h" +#include "mc/common/wrapper/optional_ref.h" +#include "mc/enums/FertilizerType.h" +#include "mc/enums/Flip.h" +#include "mc/enums/ShapeType.h" +#include "mc/world/Direction.h" +#include "mc/world/level/block/LeavesBlock.h" +#include "mc/world/level/block/utils/BlockProperty.h" +#include "mc/world/level/block/utils/BlockRenderLayer.h" +#include "mc/world/level/block/utils/BlockSupportType.h" + +// auto generated forward declare list +// clang-format off +namespace mce { class Color; } +// clang-format on + +class JungleLeavesBlock : public ::LeavesBlock { +public: + // prevent constructor by default + JungleLeavesBlock& operator=(JungleLeavesBlock const&); + JungleLeavesBlock(JungleLeavesBlock const&); + JungleLeavesBlock(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1JungleLeavesBlock@@UEAA@XZ + virtual ~JungleLeavesBlock() = default; + + // vIndex: 121, symbol: ?getColor@JungleLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual int getColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // vIndex: 128, symbol: ?getVariant@JungleLeavesBlock@@UEBAHAEBVBlock@@@Z + virtual int getVariant(class Block const&) const; + + // vIndex: 155, symbol: + // ?getRenderLayer@JungleLeavesBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z + virtual ::BlockRenderLayer getRenderLayer(class Block const&, class BlockSource&, class BlockPos const&) const; + + // vIndex: 159, symbol: + // ?getMapColor@JungleLeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // symbol: + // ??0JungleLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z + MCAPI JungleLeavesBlock(std::string const&, int, class WeakPtr); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/KelpBlock.h b/src/mc/world/level/block/KelpBlock.h index d0f9f3b612..b59ce85205 100644 --- a/src/mc/world/level/block/KelpBlock.h +++ b/src/mc/world/level/block/KelpBlock.h @@ -65,22 +65,22 @@ class KelpBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@KelpBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@KelpBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 121, symbol: ?getColor@KelpBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@KelpBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@KelpBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@KelpBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 147, symbol: ?onPlace@KelpBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@KelpBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@KelpBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@KelpBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@KelpBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@KelpBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0KelpBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/LadderBlock.h b/src/mc/world/level/block/LadderBlock.h index 8102391b78..1eac27f676 100644 --- a/src/mc/world/level/block/LadderBlock.h +++ b/src/mc/world/level/block/LadderBlock.h @@ -56,7 +56,7 @@ class LadderBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@LadderBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@LadderBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -65,13 +65,10 @@ class LadderBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 138, symbol: ?canBeSilkTouched@LadderBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@LadderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@LadderBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@LadderBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@LadderBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0LadderBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/LanternBlock.h b/src/mc/world/level/block/LanternBlock.h index 9def59b71e..c249e9a4c8 100644 --- a/src/mc/world/level/block/LanternBlock.h +++ b/src/mc/world/level/block/LanternBlock.h @@ -47,7 +47,7 @@ class LanternBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@LanternBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@LanternBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -56,18 +56,12 @@ class LanternBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 138, symbol: ?canBeSilkTouched@LanternBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@LanternBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@LanternBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@LanternBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@LanternBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@LanternBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0LanternBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI LanternBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/LeavesBlock.h b/src/mc/world/level/block/LeavesBlock.h index 8dab1c806f..05ba8a6192 100644 --- a/src/mc/world/level/block/LeavesBlock.h +++ b/src/mc/world/level/block/LeavesBlock.h @@ -43,31 +43,31 @@ class LeavesBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@LeavesBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const&, class BaseGameVersion) const; - // vIndex: 98, symbol: ?getPlacementBlock@LeavesBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@LeavesBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock(class Actor const&, class BlockPos const&, uchar, class Vec3 const&, int itemValue) const; - // vIndex: 122, symbol: ?getColor@LeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@LeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 125, symbol: ?isSeasonTinted@LeavesBlock@@UEBA_NAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 124, symbol: ?isSeasonTinted@LeavesBlock@@UEBA_NAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual bool isSeasonTinted(class Block const& block, class BlockSource& region, class BlockPos const& p) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@LeavesBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@LeavesBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 144, symbol: ?onRemove@LeavesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@LeavesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 151, symbol: ?randomTick@LeavesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@LeavesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@LeavesBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const&, class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@LeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@LeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const&) const; diff --git a/src/mc/world/level/block/LecternBlock.h b/src/mc/world/level/block/LecternBlock.h index f6bcf56c5a..08dbfe9c3b 100644 --- a/src/mc/world/level/block/LecternBlock.h +++ b/src/mc/world/level/block/LecternBlock.h @@ -53,30 +53,30 @@ class LecternBlock : public ::ActorBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 98, symbol: ?getPlacementBlock@LecternBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@LecternBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock(class Actor const& by, class BlockPos const& pos, uchar, class Vec3 const&, int) const; - // vIndex: 101, symbol: ?attack@LecternBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z + // vIndex: 100, symbol: ?attack@LecternBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z virtual bool attack(class Player* player, class BlockPos const& pos) const; - // vIndex: 111, symbol: ?hasComparatorSignal@LecternBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@LecternBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@LecternBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@LecternBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const&, uchar) const; - // vIndex: 147, symbol: ?onPlace@LecternBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@LecternBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@LecternBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@LecternBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@LecternBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@LecternBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@LecternBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@LecternBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0LecternBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/LeverBlock.h b/src/mc/world/level/block/LeverBlock.h index ef57a9f6d8..0ea0802726 100644 --- a/src/mc/world/level/block/LeverBlock.h +++ b/src/mc/world/level/block/LeverBlock.h @@ -66,7 +66,7 @@ class LeverBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@LeverBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@LeverBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -75,33 +75,33 @@ class LeverBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 100, symbol: ?isAttachedTo@LeverBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z + // vIndex: 99, symbol: ?isAttachedTo@LeverBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAV3@@Z virtual bool isAttachedTo(class BlockSource& region, class BlockPos const& pos, class BlockPos& outAttachedTo) const; - // vIndex: 130, symbol: ?canSpawnOn@LeverBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@LeverBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 144, symbol: ?onRemove@LeverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@LeverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@LeverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@LeverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@LeverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@LeverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@LeverBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@LeverBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@LeverBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@LeverBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@LeverBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@LeverBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 166, symbol: ?_onHitByActivatingAttack@LeverBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // vIndex: 160, symbol: ?_onHitByActivatingAttack@LeverBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; // symbol: ??0LeverBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI LeverBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/LightBlock.h b/src/mc/world/level/block/LightBlock.h index 86c8396c8e..1fb37af40d 100644 --- a/src/mc/world/level/block/LightBlock.h +++ b/src/mc/world/level/block/LightBlock.h @@ -68,27 +68,27 @@ class LightBlock : public ::BlockLegacy { struct ActorBlockSyncMessage const* syncMsg ) const; - // vIndex: 96, symbol: ?asItemInstance@LightBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@LightBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@LightBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@LightBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock(class Actor const&, class BlockPos const&, uchar, class Vec3 const&, int itemValue) const; - // vIndex: 103, symbol: ?canBeBuiltOver@LightBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlockItem@@@Z + // vIndex: 102, symbol: ?canBeBuiltOver@LightBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlockItem@@@Z virtual bool canBeBuiltOver(class BlockSource& region, class BlockPos const& pos, class BlockItem const& item) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@LightBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@LightBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 136, symbol: ?init@LightBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@LightBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 137, symbol: ?getLightEmission@LightBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@LightBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const& block) const; - // vIndex: 154, symbol: ?use@LightBlock@@MEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@LightBlock@@MEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar) const; // symbol: ??0LightBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z diff --git a/src/mc/world/level/block/LightningRodBlock.h b/src/mc/world/level/block/LightningRodBlock.h index 91558cffc2..8155f2801e 100644 --- a/src/mc/world/level/block/LightningRodBlock.h +++ b/src/mc/world/level/block/LightningRodBlock.h @@ -62,7 +62,7 @@ class LightningRodBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@LightningRodBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 98, symbol: ?getPlacementBlock@LightningRodBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@LightningRodBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -71,14 +71,14 @@ class LightningRodBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@LightningRodBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 147, symbol: ?onPlace@LightningRodBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@LightningRodBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@LightningRodBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@LightningRodBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: diff --git a/src/mc/world/level/block/LiquidBlock.h b/src/mc/world/level/block/LiquidBlock.h index 18878f9428..b09e890f81 100644 --- a/src/mc/world/level/block/LiquidBlock.h +++ b/src/mc/world/level/block/LiquidBlock.h @@ -50,31 +50,25 @@ class LiquidBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 121, symbol: ?getColor@LiquidBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@LiquidBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 123, symbol: ?getColorAtPos@LiquidBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 122, symbol: ?getColorAtPos@LiquidBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getColorAtPos(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@LiquidBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@LiquidBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 134, symbol: ?animateTickBedrockLegacy@LiquidBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@LiquidBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@LiquidBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@LiquidBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@LiquidBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@LiquidBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@LiquidBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 164, symbol: ?getResourceCount@LiquidBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: ??0LiquidBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI LiquidBlock(std::string const& nameId, int id, class Material const& material); diff --git a/src/mc/world/level/block/LiquidBlockDynamic.h b/src/mc/world/level/block/LiquidBlockDynamic.h index e1629f87f9..42534ce283 100644 --- a/src/mc/world/level/block/LiquidBlockDynamic.h +++ b/src/mc/world/level/block/LiquidBlockDynamic.h @@ -30,13 +30,13 @@ class LiquidBlockDynamic : public ::LiquidBlock { // vIndex: 0, symbol: __gen_??1LiquidBlockDynamic@@UEAA@XZ virtual ~LiquidBlockDynamic() = default; - // vIndex: 147, symbol: ?onPlace@LiquidBlockDynamic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@LiquidBlockDynamic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@LiquidBlockDynamic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@LiquidBlockDynamic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 167, symbol: ?entityInside@LiquidBlockDynamic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@LiquidBlockDynamic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource&, class BlockPos const&, class Actor& entity) const; // symbol: diff --git a/src/mc/world/level/block/LiquidBlockStatic.h b/src/mc/world/level/block/LiquidBlockStatic.h index 27c474b4ba..10225a210f 100644 --- a/src/mc/world/level/block/LiquidBlockStatic.h +++ b/src/mc/world/level/block/LiquidBlockStatic.h @@ -34,10 +34,10 @@ class LiquidBlockStatic : public ::LiquidBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 151, symbol: ?randomTick@LiquidBlockStatic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@LiquidBlockStatic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 167, symbol: ?entityInside@LiquidBlockStatic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@LiquidBlockStatic@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource&, class BlockPos const&, class Actor& entity) const; // symbol: diff --git a/src/mc/world/level/block/LogBlock.h b/src/mc/world/level/block/LogBlock.h index 2c7e8fb143..e3b1915911 100644 --- a/src/mc/world/level/block/LogBlock.h +++ b/src/mc/world/level/block/LogBlock.h @@ -31,13 +31,13 @@ class LogBlock : public ::RotatedPillarBlock { // vIndex: 0, symbol: ??1LogBlock@@UEAA@XZ virtual ~LogBlock(); - // vIndex: 144, symbol: ?onRemove@LogBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@LogBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 154, symbol: ?use@LogBlock@@MEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@LogBlock@@MEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar) const; - // vIndex: 162, symbol: ?getMapColor@LogBlock@@MEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@LogBlock@@MEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; diff --git a/src/mc/world/level/block/LoomBlock.h b/src/mc/world/level/block/LoomBlock.h index ea651e0731..b7cc331a64 100644 --- a/src/mc/world/level/block/LoomBlock.h +++ b/src/mc/world/level/block/LoomBlock.h @@ -33,10 +33,10 @@ class LoomBlock : public ::FaceDirectionalBlock { // vIndex: 31, symbol: ?isCraftingBlock@LoomBlock@@UEBA_NXZ virtual bool isCraftingBlock() const; - // vIndex: 152, symbol: ?isInteractiveBlock@LoomBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@LoomBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@LoomBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@LoomBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0LoomBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/MagmaBlock.h b/src/mc/world/level/block/MagmaBlock.h index 54ee5fa19e..84b2eb3168 100644 --- a/src/mc/world/level/block/MagmaBlock.h +++ b/src/mc/world/level/block/MagmaBlock.h @@ -34,22 +34,22 @@ class MagmaBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 129, symbol: ?getVariant@MagmaBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@MagmaBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@MagmaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@MagmaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 149, symbol: ?shouldTickOnSetBlock@MagmaBlock@@UEBA_NXZ + // vIndex: 146, symbol: ?shouldTickOnSetBlock@MagmaBlock@@UEBA_NXZ virtual bool shouldTickOnSetBlock() const; - // vIndex: 150, symbol: ?tick@MagmaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@MagmaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@MagmaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@MagmaBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 161, symbol: ?getEmissiveBrightness@MagmaBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 158, symbol: ?getEmissiveBrightness@MagmaBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getEmissiveBrightness(class Block const&) const; // symbol: ??0MagmaBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/MangrovePropaguleBlock.h b/src/mc/world/level/block/MangrovePropaguleBlock.h index 96e340ef1a..15da500237 100644 --- a/src/mc/world/level/block/MangrovePropaguleBlock.h +++ b/src/mc/world/level/block/MangrovePropaguleBlock.h @@ -59,27 +59,18 @@ class MangrovePropaguleBlock : public ::BushBlock { // vIndex: 86, symbol: ?mayPlaceOn@MangrovePropaguleBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@MangrovePropaguleBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@MangrovePropaguleBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 136, symbol: ?init@MangrovePropaguleBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@MangrovePropaguleBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 151, symbol: ?randomTick@MangrovePropaguleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@MangrovePropaguleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@MangrovePropaguleBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@MangrovePropaguleBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@MangrovePropaguleBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@MangrovePropaguleBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@MangrovePropaguleBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: ??0MangrovePropaguleBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI MangrovePropaguleBlock(std::string const& nameId, int id); @@ -93,8 +84,5 @@ class MangrovePropaguleBlock : public ::BushBlock { // symbol: ?_isFullyGrown@MangrovePropaguleBlock@@AEBA_NAEBVBlock@@@Z MCAPI bool _isFullyGrown(class Block const& block) const; - // symbol: ?_shouldDropMangrovePropaguleItem@MangrovePropaguleBlock@@AEBA_NAEBVBlock@@@Z - MCAPI bool _shouldDropMangrovePropaguleItem(class Block const& block) const; - // NOLINTEND }; diff --git a/src/mc/world/level/block/MobSpawnerBlock.h b/src/mc/world/level/block/MobSpawnerBlock.h index 9b688c9ed4..40f402758e 100644 --- a/src/mc/world/level/block/MobSpawnerBlock.h +++ b/src/mc/world/level/block/MobSpawnerBlock.h @@ -44,7 +44,7 @@ class MobSpawnerBlock : public ::ActorBlock { // vIndex: 56, symbol: ?canContainLiquid@MobSpawnerBlock@@UEBA_NXZ virtual bool canContainLiquid() const; - // vIndex: 152, symbol: ?isInteractiveBlock@MobSpawnerBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@MobSpawnerBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; // symbol: ??0MobSpawnerBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/MudBlock.h b/src/mc/world/level/block/MudBlock.h index 1ef7f10fa9..6a93ef44c0 100644 --- a/src/mc/world/level/block/MudBlock.h +++ b/src/mc/world/level/block/MudBlock.h @@ -48,10 +48,10 @@ class MudBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@MudBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const&, class BaseGameVersion) const; - // vIndex: 144, symbol: ?onRemove@MudBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@MudBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 151, symbol: ?randomTick@MudBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@MudBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: ??0MudBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/MultifaceBlock.h b/src/mc/world/level/block/MultifaceBlock.h index 6813379026..628679a14f 100644 --- a/src/mc/world/level/block/MultifaceBlock.h +++ b/src/mc/world/level/block/MultifaceBlock.h @@ -68,7 +68,7 @@ class MultifaceBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@MultifaceBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@MultifaceBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -77,16 +77,16 @@ class MultifaceBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 150, symbol: ?tick@MultifaceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@MultifaceBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@MultifaceBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@MultifaceBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?getMultifaceBlock@GlowLichenBlock@@UEBAAEBVBlock@@XZ + // vIndex: 163, symbol: ?getMultifaceBlock@GlowLichenBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getMultifaceBlock() const = 0; - // vIndex: 169, symbol: ?getMultifaceSpreader@GlowLichenBlock@@UEBAAEBVMultifaceSpreader@@XZ + // vIndex: 164, symbol: ?getMultifaceSpreader@GlowLichenBlock@@UEBAAEBVMultifaceSpreader@@XZ virtual class MultifaceSpreader const& getMultifaceSpreader() const = 0; // symbol: diff --git a/src/mc/world/level/block/MushroomBlock.h b/src/mc/world/level/block/MushroomBlock.h index 7668c4c68a..c3fba4eb04 100644 --- a/src/mc/world/level/block/MushroomBlock.h +++ b/src/mc/world/level/block/MushroomBlock.h @@ -49,16 +49,16 @@ class MushroomBlock : public ::BushBlock { // vIndex: 86, symbol: ?mayPlaceOn@MushroomBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 151, symbol: ?randomTick@MushroomBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@MushroomBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@MushroomBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@MushroomBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 157, symbol: ?getRenderLayer@MushroomBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@MushroomBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@MushroomBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; diff --git a/src/mc/world/level/block/MyceliumBlock.h b/src/mc/world/level/block/MyceliumBlock.h index b5b5644663..267ef8115c 100644 --- a/src/mc/world/level/block/MyceliumBlock.h +++ b/src/mc/world/level/block/MyceliumBlock.h @@ -30,15 +30,12 @@ class MyceliumBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1MyceliumBlock@@UEAA@XZ virtual ~MyceliumBlock() = default; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@MyceliumBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@MyceliumBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 151, symbol: ?randomTick@MyceliumBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@MyceliumBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 163, symbol: ?getResourceItem@MyceliumBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0MyceliumBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI MyceliumBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/NetherFungusBlock.h b/src/mc/world/level/block/NetherFungusBlock.h index 70d4a0d62e..e00f7cc77c 100644 --- a/src/mc/world/level/block/NetherFungusBlock.h +++ b/src/mc/world/level/block/NetherFungusBlock.h @@ -67,10 +67,10 @@ class NetherFungusBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 150, symbol: ?tick@NetherFungusBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@NetherFungusBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@NetherFungusBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@NetherFungusBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0NetherFungusBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/NetherSproutsBlock.h b/src/mc/world/level/block/NetherSproutsBlock.h index 719bac54e0..4d00b682cf 100644 --- a/src/mc/world/level/block/NetherSproutsBlock.h +++ b/src/mc/world/level/block/NetherSproutsBlock.h @@ -57,16 +57,13 @@ class NetherSproutsBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@NetherSproutsBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@NetherSproutsBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 138, symbol: ?canBeSilkTouched@NetherSproutsBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@NetherSproutsBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@NetherSproutsBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@NetherSproutsBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@NetherSproutsBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0NetherSproutsBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/NetherWartBlock.h b/src/mc/world/level/block/NetherWartBlock.h index 4e21fd369d..98cb2dbfcc 100644 --- a/src/mc/world/level/block/NetherWartBlock.h +++ b/src/mc/world/level/block/NetherWartBlock.h @@ -47,40 +47,17 @@ class NetherWartBlock : public ::BushBlock { // vIndex: 86, symbol: ?mayPlaceOn@NetherWartBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@NetherWartBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@NetherWartBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 138, symbol: ?canBeSilkTouched@NetherWartBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 151, symbol: ?randomTick@NetherWartBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@NetherWartBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@NetherWartBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@NetherWartBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@NetherWartBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@NetherWartBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const& block, int bonusLootLevel) const; - // symbol: ??0NetherWartBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI NetherWartBlock(std::string const& nameId, int id); - // NOLINTEND - -private: - // NOLINTBEGIN - // symbol: ?MAX_AGE@NetherWartBlock@@0HB - MCAPI static int const MAX_AGE; - - // NOLINTEND - - // member accessor -public: - // NOLINTBEGIN - static auto& $MAX_AGE() { return MAX_AGE; } - // NOLINTEND }; diff --git a/src/mc/world/level/block/NewLeavesBlock.h b/src/mc/world/level/block/NewLeavesBlock.h deleted file mode 100644 index 729f69e3eb..0000000000 --- a/src/mc/world/level/block/NewLeavesBlock.h +++ /dev/null @@ -1,52 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/WeakPtr.h" -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/LeavesBlock.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class NewLeavesBlock : public ::LeavesBlock { -public: - // prevent constructor by default - NewLeavesBlock& operator=(NewLeavesBlock const&); - NewLeavesBlock(NewLeavesBlock const&); - NewLeavesBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1NewLeavesBlock@@UEAA@XZ - virtual ~NewLeavesBlock() = default; - - // vIndex: 96, symbol: ?asItemInstance@NewLeavesBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z - virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - - // vIndex: 119, symbol: - // ?buildDescriptionId@NewLeavesBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z - virtual std::string buildDescriptionId(class Block const&) const; - - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@NewLeavesBlock@@UEBA_NXZ - virtual bool isAuxValueRelevantForPicking() const; - - // vIndex: 129, symbol: ?getVariant@NewLeavesBlock@@UEBAHAEBVBlock@@@Z - virtual int getVariant(class Block const& block) const; - - // symbol: - // ??0NewLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z - MCAPI NewLeavesBlock(std::string const& nameId, int id, class WeakPtr sapling); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/NoteBlock.h b/src/mc/world/level/block/NoteBlock.h index 85538117c0..09c61a4eb1 100644 --- a/src/mc/world/level/block/NoteBlock.h +++ b/src/mc/world/level/block/NoteBlock.h @@ -37,19 +37,19 @@ class NoteBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@NoteBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 101, symbol: ?attack@NoteBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z + // vIndex: 100, symbol: ?attack@NoteBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z virtual bool attack(class Player* player, class BlockPos const& pos) const; - // vIndex: 105, symbol: ?triggerEvent@NoteBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z + // vIndex: 104, symbol: ?triggerEvent@NoteBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@HH@Z virtual void triggerEvent(class BlockSource& region, class BlockPos const& pos, int instrument, int note) const; - // vIndex: 147, symbol: ?onPlace@NoteBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@NoteBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@NoteBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@NoteBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@NoteBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@NoteBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0NoteBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/NyliumBlock.h b/src/mc/world/level/block/NyliumBlock.h index 60cb15d6a1..482174acba 100644 --- a/src/mc/world/level/block/NyliumBlock.h +++ b/src/mc/world/level/block/NyliumBlock.h @@ -40,12 +40,9 @@ class NyliumBlock : public ::BlockLegacy { virtual bool canBeFertilized(class BlockSource& region, class BlockPos const& pos, class Block const& aboveBlock) const; - // vIndex: 151, symbol: ?randomTick@NyliumBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@NyliumBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 163, symbol: ?getResourceItem@NyliumBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0NyliumBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI NyliumBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/OakLeavesBlock.h b/src/mc/world/level/block/OakLeavesBlock.h new file mode 100644 index 0000000000..a6bcc44a84 --- /dev/null +++ b/src/mc/world/level/block/OakLeavesBlock.h @@ -0,0 +1,48 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/WeakPtr.h" +#include "mc/common/wrapper/optional_ref.h" +#include "mc/enums/FertilizerType.h" +#include "mc/enums/Flip.h" +#include "mc/enums/ShapeType.h" +#include "mc/world/Direction.h" +#include "mc/world/level/block/LeavesBlock.h" +#include "mc/world/level/block/utils/BlockProperty.h" +#include "mc/world/level/block/utils/BlockRenderLayer.h" +#include "mc/world/level/block/utils/BlockSupportType.h" + +// auto generated forward declare list +// clang-format off +namespace mce { class Color; } +// clang-format on + +class OakLeavesBlock : public ::LeavesBlock { +public: + // prevent constructor by default + OakLeavesBlock& operator=(OakLeavesBlock const&); + OakLeavesBlock(OakLeavesBlock const&); + OakLeavesBlock(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1OakLeavesBlock@@UEAA@XZ + virtual ~OakLeavesBlock() = default; + + // vIndex: 121, symbol: ?getColor@OakLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual int getColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // vIndex: 128, symbol: ?getVariant@OakLeavesBlock@@UEBAHAEBVBlock@@@Z + virtual int getVariant(class Block const&) const; + + // vIndex: 159, symbol: ?getMapColor@OakLeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // symbol: + // ??0OakLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z + MCAPI OakLeavesBlock(std::string const&, int, class WeakPtr); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/ObserverBlock.h b/src/mc/world/level/block/ObserverBlock.h index f3c6f23659..362265a553 100644 --- a/src/mc/world/level/block/ObserverBlock.h +++ b/src/mc/world/level/block/ObserverBlock.h @@ -54,28 +54,28 @@ class ObserverBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 129, symbol: ?getVariant@ObserverBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@ObserverBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 131, symbol: ?getRenderBlock@ObserverBlock@@UEBAAEBVBlock@@XZ + // vIndex: 130, symbol: ?getRenderBlock@ObserverBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getRenderBlock() const; - // vIndex: 132, symbol: ?getMappedFace@ObserverBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@ObserverBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 133, symbol: ?getFaceFlip@ObserverBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + // vIndex: 132, symbol: ?getFaceFlip@ObserverBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z virtual ::Flip getFaceFlip(uchar face, class Block const& block) const; - // vIndex: 144, symbol: ?onRemove@ObserverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@ObserverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@ObserverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ObserverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@ObserverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ObserverBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 155, symbol: ?allowStateMismatchOnPlacement@ObserverBlock@@UEBA_NAEBVBlock@@0@Z + // vIndex: 152, symbol: ?allowStateMismatchOnPlacement@ObserverBlock@@UEBA_NAEBVBlock@@0@Z virtual bool allowStateMismatchOnPlacement(class Block const&, class Block const&) const; // symbol: ??0ObserverBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ObsidianBlock.h b/src/mc/world/level/block/ObsidianBlock.h index 0558bfbf35..cb7f6be072 100644 --- a/src/mc/world/level/block/ObsidianBlock.h +++ b/src/mc/world/level/block/ObsidianBlock.h @@ -30,10 +30,10 @@ class ObsidianBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1ObsidianBlock@@UEAA@XZ virtual ~ObsidianBlock() = default; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@ObsidianBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@ObsidianBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@ObsidianBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@ObsidianBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); // symbol: ??0ObsidianBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/OldLeavesBlock.h b/src/mc/world/level/block/OldLeavesBlock.h deleted file mode 100644 index 522efd5a14..0000000000 --- a/src/mc/world/level/block/OldLeavesBlock.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/WeakPtr.h" -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/LeavesBlock.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class OldLeavesBlock : public ::LeavesBlock { -public: - // prevent constructor by default - OldLeavesBlock& operator=(OldLeavesBlock const&); - OldLeavesBlock(OldLeavesBlock const&); - OldLeavesBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1OldLeavesBlock@@UEAA@XZ - virtual ~OldLeavesBlock() = default; - - // vIndex: 96, symbol: ?asItemInstance@OldLeavesBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z - virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - - // vIndex: 119, symbol: - // ?buildDescriptionId@OldLeavesBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z - virtual std::string buildDescriptionId(class Block const&) const; - - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@OldLeavesBlock@@UEBA_NXZ - virtual bool isAuxValueRelevantForPicking() const; - - // vIndex: 122, symbol: ?getColor@OldLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z - virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - - // vIndex: 129, symbol: ?getVariant@OldLeavesBlock@@UEBAHAEBVBlock@@@Z - virtual int getVariant(class Block const& block) const; - - // vIndex: 158, symbol: - // ?getRenderLayer@OldLeavesBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z - virtual ::BlockRenderLayer - getRenderLayer(class Block const& block, class BlockSource& region, class BlockPos const& pos) const; - - // vIndex: 162, symbol: ?getMapColor@OldLeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z - virtual class mce::Color - getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - - // symbol: - // ??0OldLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z - MCAPI OldLeavesBlock(std::string const& nameId, int id, class WeakPtr sapling); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/PinkPetalsBlock.h b/src/mc/world/level/block/PinkPetalsBlock.h index 7ac6b22c1b..f68c6c0d05 100644 --- a/src/mc/world/level/block/PinkPetalsBlock.h +++ b/src/mc/world/level/block/PinkPetalsBlock.h @@ -57,24 +57,18 @@ class PinkPetalsBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 129, symbol: ?getVariant@PinkPetalsBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@PinkPetalsBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@PinkPetalsBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@PinkPetalsBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@PinkPetalsBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@PinkPetalsBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@PinkPetalsBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@PinkPetalsBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@PinkPetalsBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 164, symbol: ?getResourceCount@PinkPetalsBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const& block, int) const; - // symbol: ??0PinkPetalsBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI PinkPetalsBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/PistonArmBlock.h b/src/mc/world/level/block/PistonArmBlock.h index 99de84c6f6..2ef2195c4e 100644 --- a/src/mc/world/level/block/PistonArmBlock.h +++ b/src/mc/world/level/block/PistonArmBlock.h @@ -75,13 +75,13 @@ class PistonArmBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 96, symbol: ?asItemInstance@PistonArmBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@PistonArmBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 150, symbol: ?tick@PistonArmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@PistonArmBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@PistonArmBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@PistonArmBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: diff --git a/src/mc/world/level/block/PistonBlock.h b/src/mc/world/level/block/PistonBlock.h index 667062e130..511ebfffd1 100644 --- a/src/mc/world/level/block/PistonBlock.h +++ b/src/mc/world/level/block/PistonBlock.h @@ -65,7 +65,7 @@ class PistonBlock : public ::ActorBlock { virtual bool getSecondPart(class IConstBlockSource const& region, class BlockPos const& pos, class BlockPos& out) const; - // vIndex: 98, symbol: ?getPlacementBlock@PistonBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@PistonBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -74,22 +74,22 @@ class PistonBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 109, symbol: ?pushesUpFallingBlocks@PistonBlock@@UEBA_NXZ + // vIndex: 108, symbol: ?pushesUpFallingBlocks@PistonBlock@@UEBA_NXZ virtual bool pushesUpFallingBlocks() const; - // vIndex: 129, symbol: ?getVariant@PistonBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@PistonBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@PistonBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@PistonBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@PistonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@PistonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@PistonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@PistonBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@PistonBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@PistonBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0PistonBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HW4Type@0@@Z diff --git a/src/mc/world/level/block/PitcherCropBlock.h b/src/mc/world/level/block/PitcherCropBlock.h index 72b587b506..c72c4ed8fe 100644 --- a/src/mc/world/level/block/PitcherCropBlock.h +++ b/src/mc/world/level/block/PitcherCropBlock.h @@ -69,24 +69,18 @@ class PitcherCropBlock : public ::BushBlock { virtual bool getSecondPart(class IConstBlockSource const& region, class BlockPos const& pos, class BlockPos& out) const; - // vIndex: 96, symbol: ?asItemInstance@PitcherCropBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@PitcherCropBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 138, symbol: ?canBeSilkTouched@PitcherCropBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@PitcherCropBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@PitcherCropBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 151, symbol: ?randomTick@PitcherCropBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@PitcherCropBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@PitcherCropBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@PitcherCropBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@PitcherCropBlock@@MEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0PitcherCropBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI PitcherCropBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/PlanksBlock.h b/src/mc/world/level/block/PlanksBlock.h index 11f4d8ba81..c7350ba80d 100644 --- a/src/mc/world/level/block/PlanksBlock.h +++ b/src/mc/world/level/block/PlanksBlock.h @@ -31,19 +31,16 @@ class PlanksBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1PlanksBlock@@UEAA@XZ virtual ~PlanksBlock() = default; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@PlanksBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@PlanksBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@PlanksBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); // symbol: ??0PlanksBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HW4WoodType@@@Z MCAPI PlanksBlock(std::string const&, int, ::WoodType); - // symbol: ?isValidWoodMaterial@PlanksBlock@@SA_NH@Z - MCAPI static bool isValidWoodMaterial(int woodType); - // symbol: // ?WOOD_NAMES@PlanksBlock@@2V?$array@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@$08@std@@B MCAPI static std::array const WOOD_NAMES; diff --git a/src/mc/world/level/block/PodzolBlock.h b/src/mc/world/level/block/PodzolBlock.h deleted file mode 100644 index 2f2fe68db3..0000000000 --- a/src/mc/world/level/block/PodzolBlock.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/BlockLegacy.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class PodzolBlock : public ::BlockLegacy { -public: - // prevent constructor by default - PodzolBlock& operator=(PodzolBlock const&); - PodzolBlock(PodzolBlock const&); - PodzolBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1PodzolBlock@@UEAA@XZ - virtual ~PodzolBlock() = default; - - // vIndex: 163, symbol: ?getResourceItem@PodzolBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // symbol: ??0PodzolBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z - MCAPI PodzolBlock(std::string const& nameId, int id); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/PointedDripstoneBlock.h b/src/mc/world/level/block/PointedDripstoneBlock.h index 2e1ac913ad..bca78a411a 100644 --- a/src/mc/world/level/block/PointedDripstoneBlock.h +++ b/src/mc/world/level/block/PointedDripstoneBlock.h @@ -18,6 +18,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -61,7 +62,7 @@ class PointedDripstoneBlock : public ::FallingBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: + // vIndex: 97, symbol: // ?getPlacementBlock@PointedDripstoneBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const&, @@ -71,43 +72,42 @@ class PointedDripstoneBlock : public ::FallingBlock { int itemValue ) const; - // vIndex: 129, symbol: ?getVariant@PointedDripstoneBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@PointedDripstoneBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 136, symbol: ?init@PointedDripstoneBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@PointedDripstoneBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 148, symbol: ?onFallOn@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& actor, float fallDistance) const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@PointedDripstoneBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 150, symbol: ?tick@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 151, symbol: ?randomTick@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@PointedDripstoneBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@PointedDripstoneBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?getDustColor@PointedDripstoneBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@PointedDripstoneBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@PointedDripstoneBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; - // vIndex: 170, symbol: ?falling@PointedDripstoneBlock@@UEBA_NXZ + // vIndex: 165, symbol: ?falling@PointedDripstoneBlock@@UEBA_NXZ virtual bool falling() const; - // vIndex: 171, symbol: ?onLand@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 166, symbol: ?onLand@PointedDripstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onLand(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 173, symbol: ?startFalling@PointedDripstoneBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@_N@Z + // vIndex: 168, symbol: ?startFalling@PointedDripstoneBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@_N@Z virtual void startFalling(class BlockSource& region, class BlockPos const& pos, class Block const& oldBlock, bool creative) const; @@ -115,6 +115,9 @@ class PointedDripstoneBlock : public ::FallingBlock { // symbol: ??0PointedDripstoneBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI PointedDripstoneBlock(std::string const& nameId, int id); + // symbol: ?onFallOn@PointedDripstoneBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // symbol: ?addDripParticle@PointedDripstoneBlock@@SAXAEAVBlockSource@@AEBVBlockPos@@W4ParticleType@@@Z MCAPI static void addDripParticle(class BlockSource& region, class BlockPos const& pos, ::ParticleType particleType); diff --git a/src/mc/world/level/block/PortalBlock.h b/src/mc/world/level/block/PortalBlock.h index 8f6b7dd38b..381281d105 100644 --- a/src/mc/world/level/block/PortalBlock.h +++ b/src/mc/world/level/block/PortalBlock.h @@ -6,6 +6,7 @@ #include "mc/common/wrapper/optional_ref.h" #include "mc/enums/FertilizerType.h" #include "mc/enums/Flip.h" +#include "mc/enums/PortalAxis.h" #include "mc/enums/ShapeType.h" #include "mc/world/Direction.h" #include "mc/world/level/block/BlockLegacy.h" @@ -62,22 +63,22 @@ class PortalBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@PortalBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@PortalBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 144, symbol: ?onRemove@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 167, symbol: ?entityInside@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@PortalBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource&, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0PortalBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z @@ -87,6 +88,9 @@ class PortalBlock : public ::BlockLegacy { MCAPI void tryMatchPortalRecordToFrameBlocksContainingPos(class BlockSource& region, class BlockPos const& pos) const; + // symbol: ?trySpawnPigZombie@PortalBlock@@SAXAEAVBlockSource@@AEBVBlockPos@@W4PortalAxis@@@Z + MCAPI static void trySpawnPigZombie(class BlockSource& region, class BlockPos const& pos, ::PortalAxis axis); + // symbol: ?trySpawnPortal@PortalBlock@@SA_NAEAVBlockSource@@AEBVBlockPos@@@Z MCAPI static bool trySpawnPortal(class BlockSource& region, class BlockPos const& pos); diff --git a/src/mc/world/level/block/PotatoBlock.h b/src/mc/world/level/block/PotatoBlock.h index 873aebab33..18e951a676 100644 --- a/src/mc/world/level/block/PotatoBlock.h +++ b/src/mc/world/level/block/PotatoBlock.h @@ -41,10 +41,10 @@ class PotatoBlock : public ::CropBlock { virtual class AABB const& getOutline(class Block const&, class IConstBlockSource const&, class BlockPos const&, class AABB&) const; - // vIndex: 129, symbol: ?getVariant@PotatoBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@PotatoBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 170, symbol: ?getBaseSeed@PotatoBlock@@UEBA?BVItemInstance@@XZ + // vIndex: 165, symbol: ?getBaseSeed@PotatoBlock@@UEBA?BVItemInstance@@XZ virtual class ItemInstance const getBaseSeed() const; // symbol: ??0PotatoBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/PowderSnowBlock.h b/src/mc/world/level/block/PowderSnowBlock.h index 658e17f9ac..f9905f504e 100644 --- a/src/mc/world/level/block/PowderSnowBlock.h +++ b/src/mc/world/level/block/PowderSnowBlock.h @@ -15,6 +15,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -54,23 +55,22 @@ class PowderSnowBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@PowderSnowBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 96, symbol: ?asItemInstance@PowderSnowBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@PowderSnowBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 117, symbol: ?causesFreezeEffect@PowderSnowBlock@@UEBA_NXZ + // vIndex: 116, symbol: ?causesFreezeEffect@PowderSnowBlock@@UEBA_NXZ virtual bool causesFreezeEffect() const; - // vIndex: 138, symbol: ?canBeSilkTouched@PowderSnowBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 148, symbol: ?onFallOn@PowderSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@PowderSnowBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); // symbol: // ??0PowderSnowBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI PowderSnowBlock(std::string const& nameId, int id, class Material const& material); + // symbol: ?onFallOn@PowderSnowBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // symbol: ?canWalkOnTop@PowderSnowBlock@@SA_NAEBVGetCollisionShapeInterface@@@Z MCAPI static bool canWalkOnTop(class GetCollisionShapeInterface const& actor); diff --git a/src/mc/world/level/block/PoweredRailBlock.h b/src/mc/world/level/block/PoweredRailBlock.h index de3d7eeb88..89ce3db4b7 100644 --- a/src/mc/world/level/block/PoweredRailBlock.h +++ b/src/mc/world/level/block/PoweredRailBlock.h @@ -34,7 +34,7 @@ class PoweredRailBlock : public ::BaseRailBlock { virtual void onRedstoneUpdate(class BlockSource& region, class BlockPos const& pos, int strength, bool isFirstTime) const; - // vIndex: 129, symbol: ?getVariant@PoweredRailBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@PoweredRailBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; // symbol: ??0PoweredRailBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/PressurePlateBlock.h b/src/mc/world/level/block/PressurePlateBlock.h index 90bb26bf50..4fe3af639d 100644 --- a/src/mc/world/level/block/PressurePlateBlock.h +++ b/src/mc/world/level/block/PressurePlateBlock.h @@ -34,13 +34,13 @@ class PressurePlateBlock : public ::BasePressurePlateBlock { // vIndex: 0, symbol: __gen_??1PressurePlateBlock@@UEAA@XZ virtual ~PressurePlateBlock() = default; - // vIndex: 169, symbol: ?getSignalStrength@PressurePlateBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 164, symbol: ?getSignalStrength@PressurePlateBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getSignalStrength(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 170, symbol: ?getSignalForData@PressurePlateBlock@@MEBAHH@Z + // vIndex: 165, symbol: ?getSignalForData@PressurePlateBlock@@MEBAHH@Z virtual int getSignalForData(int data) const; - // vIndex: 171, symbol: ?getRedstoneSignal@PressurePlateBlock@@MEBAHH@Z + // vIndex: 166, symbol: ?getRedstoneSignal@PressurePlateBlock@@MEBAHH@Z virtual int getRedstoneSignal(int signal) const; // symbol: diff --git a/src/mc/world/level/block/PrismarineBlock.h b/src/mc/world/level/block/PrismarineBlock.h index 98262c12ff..0ea7d4b8bd 100644 --- a/src/mc/world/level/block/PrismarineBlock.h +++ b/src/mc/world/level/block/PrismarineBlock.h @@ -30,17 +30,17 @@ class PrismarineBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1PrismarineBlock@@UEAA@XZ virtual ~PrismarineBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@PrismarineBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@PrismarineBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@PrismarineBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@PrismarineBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@PrismarineBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 162, symbol: ?getMapColor@PrismarineBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@PrismarineBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; // symbol: ??0PrismarineBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/PumpkinBlock.h b/src/mc/world/level/block/PumpkinBlock.h index 92f6ac2cb8..c1cd901324 100644 --- a/src/mc/world/level/block/PumpkinBlock.h +++ b/src/mc/world/level/block/PumpkinBlock.h @@ -40,19 +40,16 @@ class PumpkinBlock : public ::BlockLegacy { // vIndex: 85, symbol: ?mayPlace@PumpkinBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@PumpkinBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@PumpkinBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 129, symbol: ?getVariant@PumpkinBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@PumpkinBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@PumpkinBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@PumpkinBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@PumpkinBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@PumpkinBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@PumpkinBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0PumpkinBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N1@Z diff --git a/src/mc/world/level/block/QuartzBlock.h b/src/mc/world/level/block/QuartzBlock.h index 44afc5d0e7..7be67c85ac 100644 --- a/src/mc/world/level/block/QuartzBlock.h +++ b/src/mc/world/level/block/QuartzBlock.h @@ -30,10 +30,10 @@ class QuartzBlock : public ::RotatedPillarBlock { // vIndex: 0, symbol: __gen_??1QuartzBlock@@UEAA@XZ virtual ~QuartzBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@QuartzBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@QuartzBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@QuartzBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@QuartzBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -42,17 +42,17 @@ class QuartzBlock : public ::RotatedPillarBlock { int itemValue ) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@QuartzBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@QuartzBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@QuartzBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@QuartzBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@QuartzBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 132, symbol: ?getMappedFace@QuartzBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@QuartzBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; // symbol: ??0QuartzBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/RailBlock.h b/src/mc/world/level/block/RailBlock.h index 14048a6acb..45a417d1bd 100644 --- a/src/mc/world/level/block/RailBlock.h +++ b/src/mc/world/level/block/RailBlock.h @@ -30,7 +30,7 @@ class RailBlock : public ::BaseRailBlock { // vIndex: 0, symbol: __gen_??1RailBlock@@UEAA@XZ virtual ~RailBlock() = default; - // vIndex: 129, symbol: ?getVariant@RailBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@RailBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; // symbol: ??0RailBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/RedStoneOreBlock.h b/src/mc/world/level/block/RedStoneOreBlock.h index 25e1c9f580..124f086662 100644 --- a/src/mc/world/level/block/RedStoneOreBlock.h +++ b/src/mc/world/level/block/RedStoneOreBlock.h @@ -33,35 +33,26 @@ class RedStoneOreBlock : public ::BlockLegacy { // vIndex: 47, symbol: ?canBeOriginalSurface@RedStoneOreBlock@@UEBA_NXZ virtual bool canBeOriginalSurface() const; - // vIndex: 96, symbol: ?asItemInstance@RedStoneOreBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@RedStoneOreBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 101, symbol: ?attack@RedStoneOreBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z + // vIndex: 100, symbol: ?attack@RedStoneOreBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z virtual bool attack(class Player* player, class BlockPos const& pos) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@RedStoneOreBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 146, symbol: ?onStandOn@RedStoneOreBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z + // vIndex: 144, symbol: ?onStandOn@RedStoneOreBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; - // vIndex: 151, symbol: ?randomTick@RedStoneOreBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@RedStoneOreBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@RedStoneOreBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@RedStoneOreBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 163, symbol: ?getResourceItem@RedStoneOreBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@RedStoneOreBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const&, int bonusLootLevel) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@RedStoneOreBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - - // vIndex: 168, symbol: ?_lightUpBlock@RedStoneOreBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?_lightUpBlock@RedStoneOreBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void _lightUpBlock(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0RedStoneOreBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/RedStoneWireBlock.h b/src/mc/world/level/block/RedStoneWireBlock.h index 7e97337f4a..b236be4c35 100644 --- a/src/mc/world/level/block/RedStoneWireBlock.h +++ b/src/mc/world/level/block/RedStoneWireBlock.h @@ -60,29 +60,29 @@ class RedStoneWireBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@RedStoneWireBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@RedStoneWireBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 121, symbol: ?getColor@RedStoneWireBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@RedStoneWireBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@RedStoneWireBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@RedStoneWireBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 130, symbol: ?canSpawnOn@RedStoneWireBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@RedStoneWireBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@RedStoneWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 147, symbol: ?onPlace@RedStoneWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@RedStoneWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@RedStoneWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@RedStoneWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@RedStoneWireBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@RedStoneWireBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0RedStoneWireBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/RedstoneBlock.h b/src/mc/world/level/block/RedstoneBlock.h index 68b1029530..01762b51a5 100644 --- a/src/mc/world/level/block/RedstoneBlock.h +++ b/src/mc/world/level/block/RedstoneBlock.h @@ -40,10 +40,10 @@ class RedstoneBlock : public ::BlockLegacy { // vIndex: 71, symbol: ?setupRedstoneComponent@RedstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 130, symbol: ?canSpawnOn@RedstoneBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@RedstoneBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 147, symbol: ?onPlace@RedstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@RedstoneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0RedstoneBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/RedstoneLampBlock.h b/src/mc/world/level/block/RedstoneLampBlock.h index 3a71a33ccf..74cd1db4f4 100644 --- a/src/mc/world/level/block/RedstoneLampBlock.h +++ b/src/mc/world/level/block/RedstoneLampBlock.h @@ -41,21 +41,15 @@ class RedstoneLampBlock : public ::BlockLegacy { // vIndex: 71, symbol: ?setupRedstoneComponent@RedstoneLampBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@RedstoneLampBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@RedstoneLampBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 147, symbol: ?onPlace@RedstoneLampBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@RedstoneLampBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@RedstoneLampBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@RedstoneLampBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 163, symbol: ?getResourceItem@RedstoneLampBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@RedstoneLampBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: ??0RedstoneLampBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z MCAPI RedstoneLampBlock(std::string const& nameId, int id, bool isLit); diff --git a/src/mc/world/level/block/RedstoneTorchBlock.h b/src/mc/world/level/block/RedstoneTorchBlock.h index 7a92a7e1af..23b97dac5c 100644 --- a/src/mc/world/level/block/RedstoneTorchBlock.h +++ b/src/mc/world/level/block/RedstoneTorchBlock.h @@ -48,29 +48,23 @@ class RedstoneTorchBlock : public ::TorchBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@RedstoneTorchBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@RedstoneTorchBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 130, symbol: ?canSpawnOn@RedstoneTorchBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@RedstoneTorchBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@RedstoneTorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@RedstoneTorchBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@RedstoneTorchBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 147, symbol: ?onPlace@RedstoneTorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@RedstoneTorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@RedstoneTorchBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@RedstoneTorchBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - - // vIndex: 168, symbol: ?getTickDelay@RedstoneTorchBlock@@UEAAHXZ + // vIndex: 163, symbol: ?getTickDelay@RedstoneTorchBlock@@UEAAHXZ virtual int getTickDelay(); // symbol: ??0RedstoneTorchBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/ReinforcedDeepslateBlock.h b/src/mc/world/level/block/ReinforcedDeepslateBlock.h index 1e0fb475c0..7fb3ce9a7b 100644 --- a/src/mc/world/level/block/ReinforcedDeepslateBlock.h +++ b/src/mc/world/level/block/ReinforcedDeepslateBlock.h @@ -33,9 +33,6 @@ class ReinforcedDeepslateBlock : public ::BlockLegacy { // vIndex: 47, symbol: ?canBeOriginalSurface@ReinforcedDeepslateBlock@@UEBA_NXZ virtual bool canBeOriginalSurface() const; - // vIndex: 138, symbol: ?canBeSilkTouched@ReinforcedDeepslateBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - // symbol: ??0ReinforcedDeepslateBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI ReinforcedDeepslateBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/RepeaterBlock.h b/src/mc/world/level/block/RepeaterBlock.h index 3a8e978f87..8cc6930f6e 100644 --- a/src/mc/world/level/block/RepeaterBlock.h +++ b/src/mc/world/level/block/RepeaterBlock.h @@ -47,46 +47,43 @@ class RepeaterBlock : public ::DiodeBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@RepeaterBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@RepeaterBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@RepeaterBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 144, symbol: ?onRemove@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@RepeaterBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@RepeaterBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@RepeaterBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@RepeaterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@RepeaterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@RepeaterBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@RepeaterBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 169, symbol: ?isLocked@RepeaterBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 164, symbol: ?isLocked@RepeaterBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool isLocked(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 175, symbol: ?isAlternateInput@RepeaterBlock@@MEBA_NAEBVBlock@@@Z + // vIndex: 170, symbol: ?isAlternateInput@RepeaterBlock@@MEBA_NAEBVBlock@@@Z virtual bool isAlternateInput(class Block const& block) const; - // vIndex: 179, symbol: ?getTurnOnDelay@RepeaterBlock@@MEBAHAEBVBlock@@@Z + // vIndex: 174, symbol: ?getTurnOnDelay@RepeaterBlock@@MEBAHAEBVBlock@@@Z virtual int getTurnOnDelay(class Block const& block) const; - // vIndex: 180, symbol: ?getOnBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z + // vIndex: 175, symbol: ?getOnBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z virtual class Block const* getOnBlock(class Block const* block) const; - // vIndex: 181, symbol: ?getOffBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z + // vIndex: 176, symbol: ?getOffBlock@RepeaterBlock@@MEBAPEBVBlock@@PEBV2@@Z virtual class Block const* getOffBlock(class Block const* block) const; // symbol: ??0RepeaterBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/RespawnAnchorBlock.h b/src/mc/world/level/block/RespawnAnchorBlock.h index cd9a4743bf..7ef51a8330 100644 --- a/src/mc/world/level/block/RespawnAnchorBlock.h +++ b/src/mc/world/level/block/RespawnAnchorBlock.h @@ -30,37 +30,37 @@ class RespawnAnchorBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1RespawnAnchorBlock@@UEAA@XZ virtual ~RespawnAnchorBlock() = default; - // vIndex: 111, symbol: ?hasComparatorSignal@RespawnAnchorBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@RespawnAnchorBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@RespawnAnchorBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@RespawnAnchorBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar dir) const; - // vIndex: 115, symbol: ?canSpawnAt@RespawnAnchorBlock@@UEBA_NAEBVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 114, symbol: ?canSpawnAt@RespawnAnchorBlock@@UEBA_NAEBVBlockSource@@AEBVBlockPos@@@Z virtual bool canSpawnAt(class BlockSource const& region, class BlockPos const& pos) const; - // vIndex: 116, symbol: ?notifySpawnedAt@RespawnAnchorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 115, symbol: ?notifySpawnedAt@RespawnAnchorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void notifySpawnedAt(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@RespawnAnchorBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@RespawnAnchorBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@RespawnAnchorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 137, symbol: ?getLightEmission@RespawnAnchorBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@RespawnAnchorBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const& block) const; - // vIndex: 147, symbol: ?onPlace@RespawnAnchorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@RespawnAnchorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@RespawnAnchorBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@RespawnAnchorBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@RespawnAnchorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@RespawnAnchorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const&, uchar face) const; // symbol: ??0RespawnAnchorBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/RootedDirtBlock.h b/src/mc/world/level/block/RootedDirtBlock.h index 541e85e1bd..b5d1a189c5 100644 --- a/src/mc/world/level/block/RootedDirtBlock.h +++ b/src/mc/world/level/block/RootedDirtBlock.h @@ -47,7 +47,7 @@ class RootedDirtBlock : public ::BlockLegacy { virtual bool tryToTill(class BlockSource& region, class BlockPos const& pos, class Actor& entity, class ItemStack& item) const; - // vIndex: 154, symbol: ?use@RootedDirtBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@RootedDirtBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0RootedDirtBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/RotatedPillarBlock.h b/src/mc/world/level/block/RotatedPillarBlock.h index 9cd0140210..ecfb6401c9 100644 --- a/src/mc/world/level/block/RotatedPillarBlock.h +++ b/src/mc/world/level/block/RotatedPillarBlock.h @@ -30,10 +30,10 @@ class RotatedPillarBlock : public ::BlockLegacy { // vIndex: 0, symbol: ??1RotatedPillarBlock@@UEAA@XZ virtual ~RotatedPillarBlock(); - // vIndex: 96, symbol: ?asItemInstance@RotatedPillarBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@RotatedPillarBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@RotatedPillarBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@RotatedPillarBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -42,12 +42,9 @@ class RotatedPillarBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 132, symbol: ?getMappedFace@RotatedPillarBlock@@UEBAEEAEBVBlock@@@Z + // vIndex: 131, symbol: ?getMappedFace@RotatedPillarBlock@@UEBAEEAEBVBlock@@@Z virtual uchar getMappedFace(uchar face, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@RotatedPillarBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - // symbol: // ??0RotatedPillarBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI RotatedPillarBlock(std::string const& nameId, int id, class Material const& material); diff --git a/src/mc/world/level/block/RotatedPillarInfestedBlock.h b/src/mc/world/level/block/RotatedPillarInfestedBlock.h index 70a4c72bb6..e5e91b9910 100644 --- a/src/mc/world/level/block/RotatedPillarInfestedBlock.h +++ b/src/mc/world/level/block/RotatedPillarInfestedBlock.h @@ -30,10 +30,10 @@ class RotatedPillarInfestedBlock : public ::RotatedPillarBlock { // vIndex: 0, symbol: __gen_??1RotatedPillarInfestedBlock@@UEAA@XZ virtual ~RotatedPillarInfestedBlock() = default; - // vIndex: 95, symbol: - // ?spawnResources@RotatedPillarInfestedBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z + // vIndex: 161, symbol: + // ?_spawnAfterBreak@RotatedPillarInfestedBlock@@EEBAXAEAVBlockSource@@AEBVBlock@@AEBVBlockPos@@AEBUResourceDropsContext@@@Z virtual void - spawnResources(class BlockSource& region, class BlockPos const& pos, class Block const&, class Randomize&, struct ResourceDropsContext const&) + _spawnAfterBreak(class BlockSource&, class Block const&, class BlockPos const&, struct ResourceDropsContext const&) const; // symbol: diff --git a/src/mc/world/level/block/SandBlock.h b/src/mc/world/level/block/SandBlock.h index 28becf2bc6..d6d74655f1 100644 --- a/src/mc/world/level/block/SandBlock.h +++ b/src/mc/world/level/block/SandBlock.h @@ -45,26 +45,26 @@ class SandBlock : public ::FallingBlock { virtual bool canBeFertilized(class BlockSource& region, class BlockPos const& pos, class Block const& aboveBlock) const; - // vIndex: 96, symbol: ?asItemInstance@SandBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SandBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SandBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@SandBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@SandBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@SandBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@SandBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 162, symbol: ?getMapColor@SandBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@SandBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 168, symbol: ?getDustColor@SandBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@SandBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@SandBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; diff --git a/src/mc/world/level/block/SandstoneBlock.h b/src/mc/world/level/block/SandstoneBlock.h index c7627ea218..c6dd0b67be 100644 --- a/src/mc/world/level/block/SandstoneBlock.h +++ b/src/mc/world/level/block/SandstoneBlock.h @@ -33,14 +33,14 @@ class SandstoneBlock : public ::BlockLegacy { // vIndex: 47, symbol: ?canBeOriginalSurface@SandstoneBlock@@UEBA_NXZ virtual bool canBeOriginalSurface() const; - // vIndex: 96, symbol: ?asItemInstance@SandstoneBlock@@MEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SandstoneBlock@@MEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SandstoneBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@SandstoneBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@SandstoneBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; // symbol: diff --git a/src/mc/world/level/block/SaplingBlock.h b/src/mc/world/level/block/SaplingBlock.h index d80567d78d..69e9df2415 100644 --- a/src/mc/world/level/block/SaplingBlock.h +++ b/src/mc/world/level/block/SaplingBlock.h @@ -47,26 +47,26 @@ class SaplingBlock : public ::BushBlock { // vIndex: 85, symbol: ?mayPlace@SaplingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@SaplingBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SaplingBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SaplingBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@SaplingBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@SaplingBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@SaplingBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@SaplingBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 151, symbol: ?randomTick@SaplingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@SaplingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 157, symbol: ?getRenderLayer@SaplingBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@SaplingBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@SaplingBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; diff --git a/src/mc/world/level/block/ScaffoldingBlock.h b/src/mc/world/level/block/ScaffoldingBlock.h index a8e0edba73..19b0476d44 100644 --- a/src/mc/world/level/block/ScaffoldingBlock.h +++ b/src/mc/world/level/block/ScaffoldingBlock.h @@ -65,7 +65,7 @@ class ScaffoldingBlock : public ::FallingBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@ScaffoldingBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@ScaffoldingBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -74,23 +74,23 @@ class ScaffoldingBlock : public ::FallingBlock { int itemValue ) const; - // vIndex: 113, symbol: ?canSlide@ScaffoldingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 112, symbol: ?canSlide@ScaffoldingBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSlide(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@ScaffoldingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 147, symbol: ?onPlace@ScaffoldingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@ScaffoldingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@ScaffoldingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@ScaffoldingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 168, symbol: ?getDustColor@ScaffoldingBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@ScaffoldingBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@ScaffoldingBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; diff --git a/src/mc/world/level/block/SculkCatalystBlock.h b/src/mc/world/level/block/SculkCatalystBlock.h index 5fc240390d..c9569ba659 100644 --- a/src/mc/world/level/block/SculkCatalystBlock.h +++ b/src/mc/world/level/block/SculkCatalystBlock.h @@ -30,13 +30,10 @@ class SculkCatalystBlock : public ::ActorBlock { // vIndex: 0, symbol: __gen_??1SculkCatalystBlock@@UEAA@XZ virtual ~SculkCatalystBlock() = default; - // vIndex: 129, symbol: ?getVariant@SculkCatalystBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@SculkCatalystBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SculkCatalystBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@SculkCatalystBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SculkCatalystBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: diff --git a/src/mc/world/level/block/SculkSensorBlock.h b/src/mc/world/level/block/SculkSensorBlock.h index fd8011d9d6..8bf555a204 100644 --- a/src/mc/world/level/block/SculkSensorBlock.h +++ b/src/mc/world/level/block/SculkSensorBlock.h @@ -50,33 +50,30 @@ class SculkSensorBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@SculkSensorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 111, symbol: ?hasComparatorSignal@SculkSensorBlock@@UEBA_NXZ + // vIndex: 110, symbol: ?hasComparatorSignal@SculkSensorBlock@@UEBA_NXZ virtual bool hasComparatorSignal() const; - // vIndex: 112, symbol: ?getComparatorSignal@SculkSensorBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z + // vIndex: 111, symbol: ?getComparatorSignal@SculkSensorBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@E@Z virtual int getComparatorSignal(class BlockSource& region, class BlockPos const& pos, class Block const& block, uchar) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@SculkSensorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 137, symbol: ?getLightEmission@SculkSensorBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@SculkSensorBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SculkSensorBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 146, symbol: ?onStandOn@SculkSensorBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z + // vIndex: 144, symbol: ?onStandOn@SculkSensorBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z virtual void onStandOn(class EntityContext& entityContext, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@SculkSensorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SculkSensorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SculkSensorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SculkSensorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 161, symbol: ?getEmissiveBrightness@SculkSensorBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 158, symbol: ?getEmissiveBrightness@SculkSensorBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getEmissiveBrightness(class Block const& block) const; // symbol: ??0SculkSensorBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SculkShriekerBlock.h b/src/mc/world/level/block/SculkShriekerBlock.h index c9339c9fd4..e43ebac1a4 100644 --- a/src/mc/world/level/block/SculkShriekerBlock.h +++ b/src/mc/world/level/block/SculkShriekerBlock.h @@ -36,25 +36,22 @@ class SculkShriekerBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@SculkShriekerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@SculkShriekerBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@SculkShriekerBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 136, symbol: ?init@SculkShriekerBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@SculkShriekerBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 138, symbol: ?canBeSilkTouched@SculkShriekerBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 144, symbol: ?onRemove@SculkShriekerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@SculkShriekerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 146, symbol: ?onStandOn@SculkShriekerBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z + // vIndex: 144, symbol: ?onStandOn@SculkShriekerBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@SculkShriekerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SculkShriekerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SculkShriekerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SculkShriekerBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; // symbol: diff --git a/src/mc/world/level/block/SculkVeinBlock.h b/src/mc/world/level/block/SculkVeinBlock.h index 6f8b48f30d..0da7045b61 100644 --- a/src/mc/world/level/block/SculkVeinBlock.h +++ b/src/mc/world/level/block/SculkVeinBlock.h @@ -33,22 +33,13 @@ class SculkVeinBlock : public ::MultifaceBlock { // vIndex: 61, symbol: ?checkIsPathable@SculkVeinBlock@@UEBA_NAEAVActor@@AEBVBlockPos@@1@Z virtual bool checkIsPathable(class Actor&, class BlockPos const&, class BlockPos const&) const; - // vIndex: 96, symbol: ?asItemInstance@SculkVeinBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SculkVeinBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 163, symbol: ?getResourceItem@SculkVeinBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@SculkVeinBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@SculkVeinBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - - // vIndex: 168, symbol: ?getMultifaceBlock@SculkVeinBlock@@UEBAAEBVBlock@@XZ + // vIndex: 163, symbol: ?getMultifaceBlock@SculkVeinBlock@@UEBAAEBVBlock@@XZ virtual class Block const& getMultifaceBlock() const; - // vIndex: 169, symbol: ?getMultifaceSpreader@SculkVeinBlock@@UEBAAEBVMultifaceSpreader@@XZ + // vIndex: 164, symbol: ?getMultifaceSpreader@SculkVeinBlock@@UEBAAEBVMultifaceSpreader@@XZ virtual class MultifaceSpreader const& getMultifaceSpreader() const; // symbol: diff --git a/src/mc/world/level/block/SeaLanternBlock.h b/src/mc/world/level/block/SeaLanternBlock.h deleted file mode 100644 index 4e296add37..0000000000 --- a/src/mc/world/level/block/SeaLanternBlock.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/BlockLegacy.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class SeaLanternBlock : public ::BlockLegacy { -public: - // prevent constructor by default - SeaLanternBlock& operator=(SeaLanternBlock const&); - SeaLanternBlock(SeaLanternBlock const&); - SeaLanternBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1SeaLanternBlock@@UEAA@XZ - virtual ~SeaLanternBlock() = default; - - // vIndex: 163, symbol: ?getResourceItem@SeaLanternBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@SeaLanternBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const&, int) const; - - // symbol: ??0SeaLanternBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z - MCAPI SeaLanternBlock(std::string const& nameId, int id); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/SeaPickleBlock.h b/src/mc/world/level/block/SeaPickleBlock.h index a6baff993d..4afaad20d7 100644 --- a/src/mc/world/level/block/SeaPickleBlock.h +++ b/src/mc/world/level/block/SeaPickleBlock.h @@ -68,38 +68,32 @@ class SeaPickleBlock : public ::BushBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SeaPickleBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 121, symbol: ?getColor@SeaPickleBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@SeaPickleBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@SeaPickleBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@SeaPickleBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 137, symbol: ?getLightEmission@SeaPickleBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@SeaPickleBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SeaPickleBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@SeaPickleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SeaPickleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SeaPickleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SeaPickleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@SeaPickleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@SeaPickleBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@SeaPickleBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SeaPickleBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@SeaPickleBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 168, symbol: ?checkAlive@SeaPickleBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 163, symbol: ?checkAlive@SeaPickleBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void checkAlive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0SeaPickleBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SeagrassBlock.h b/src/mc/world/level/block/SeagrassBlock.h index dc432116d6..e0c863601b 100644 --- a/src/mc/world/level/block/SeagrassBlock.h +++ b/src/mc/world/level/block/SeagrassBlock.h @@ -62,26 +62,23 @@ class SeagrassBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SeagrassBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 121, symbol: ?getColor@SeagrassBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@SeagrassBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@SeagrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@SeagrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SeagrassBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@SeagrassBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SeagrassBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SeagrassBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SeagrassBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@SeagrassBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SeagrassBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0SeagrassBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ShulkerBoxBlock.h b/src/mc/world/level/block/ShulkerBoxBlock.h index f0e427111d..eabec5aa7d 100644 --- a/src/mc/world/level/block/ShulkerBoxBlock.h +++ b/src/mc/world/level/block/ShulkerBoxBlock.h @@ -30,11 +30,11 @@ class ShulkerBoxBlock : public ::UndyedShulkerBoxBlock { // vIndex: 0, symbol: __gen_??1ShulkerBoxBlock@@UEAA@XZ virtual ~ShulkerBoxBlock() = default; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@ShulkerBoxBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 121, symbol: ?getColor@ShulkerBoxBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@ShulkerBoxBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; // symbol: ??0ShulkerBoxBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SignBlock.h b/src/mc/world/level/block/SignBlock.h index 02f5a6ddeb..59674e26dc 100644 --- a/src/mc/world/level/block/SignBlock.h +++ b/src/mc/world/level/block/SignBlock.h @@ -67,28 +67,28 @@ class SignBlock : public ::ActorBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@SignBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SignBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 150, symbol: ?tick@SignBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SignBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@SignBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@SignBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@SignBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@SignBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@SignBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SignBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 168, symbol: ?getYRotationInDegrees@SignBlock@@UEBAMAEBVBlock@@@Z + // vIndex: 163, symbol: ?getYRotationInDegrees@SignBlock@@UEBAMAEBVBlock@@@Z virtual float getYRotationInDegrees(class Block const& block) const; - // vIndex: 169, symbol: ?_canSurvive@SignBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@E@Z + // vIndex: 164, symbol: ?_canSurvive@SignBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@E@Z virtual bool _canSurvive(class BlockSource& region, class BlockPos const& pos, uchar face) const; - // vIndex: 170, symbol: ?_getItemInstance@SignBlock@@MEBA?AVItemInstance@@XZ + // vIndex: 165, symbol: ?_getItemInstance@SignBlock@@MEBA?AVItemInstance@@XZ virtual class ItemInstance _getItemInstance() const; // symbol: ??0SignBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_NW4SignType@0@@Z diff --git a/src/mc/world/level/block/SkullBlock.h b/src/mc/world/level/block/SkullBlock.h index ef12afe332..5a59016bef 100644 --- a/src/mc/world/level/block/SkullBlock.h +++ b/src/mc/world/level/block/SkullBlock.h @@ -48,10 +48,10 @@ class SkullBlock : public ::ActorBlock { // vIndex: 85, symbol: ?mayPlace@SkullBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@SkullBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SkullBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const* blockActor) const; - // vIndex: 98, symbol: ?getPlacementBlock@SkullBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@SkullBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -60,11 +60,11 @@ class SkullBlock : public ::ActorBlock { int itemValue ) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SkullBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 147, symbol: ?onPlace@SkullBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SkullBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0SkullBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SlabBlock.h b/src/mc/world/level/block/SlabBlock.h index 4ac2fad85c..97c228eeb9 100644 --- a/src/mc/world/level/block/SlabBlock.h +++ b/src/mc/world/level/block/SlabBlock.h @@ -62,22 +62,13 @@ class SlabBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@SlabBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 96, symbol: ?asItemInstance@SlabBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SlabBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 107, symbol: ?getMobToSpawn@SlabBlock@@UEBAPEBVMobSpawnerData@@AEBVSpawnConditions@@AEAVBlockSource@@@Z + // vIndex: 106, symbol: ?getMobToSpawn@SlabBlock@@UEBAPEBVMobSpawnerData@@AEBVSpawnConditions@@AEAVBlockSource@@@Z virtual class MobSpawnerData const* getMobToSpawn(class SpawnConditions const& conditions, class BlockSource& region) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SlabBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 163, symbol: ?getResourceItem@SlabBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@SlabBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: // ??0SlabBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_NAEBVMaterial@@V?$WeakPtr@VBlockLegacy@@@@@Z MCAPI SlabBlock( @@ -90,13 +81,6 @@ class SlabBlock : public ::BlockLegacy { // NOLINTEND - // protected: - // NOLINTBEGIN - // symbol: ?getBaseSlab@SlabBlock@@IEBAAEBVBlock@@XZ - MCAPI class Block const& getBaseSlab() const; - - // NOLINTEND - private: // NOLINTBEGIN // symbol: ?TOP_SLAB_DOESNT_BREAK_FALLING_BLOCK_VERSION@SlabBlock@@0VBaseGameVersion@@B diff --git a/src/mc/world/level/block/SlabBlockItem.h b/src/mc/world/level/block/SlabBlockItem.h index 17d571a65f..750a90ebaf 100644 --- a/src/mc/world/level/block/SlabBlockItem.h +++ b/src/mc/world/level/block/SlabBlockItem.h @@ -29,11 +29,11 @@ class SlabBlockItem : public ::BlockItem { // vIndex: 0, symbol: __gen_??1SlabBlockItem@@UEAA@XZ virtual ~SlabBlockItem() = default; - // vIndex: 116, symbol: ?_calculatePlacePos@SlabBlockItem@@UEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z + // vIndex: 115, symbol: ?_calculatePlacePos@SlabBlockItem@@UEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z virtual bool _calculatePlacePos(class ItemStackBase& instance, class Actor& actor, uchar& face, class BlockPos& pos) const; - // vIndex: 118, symbol: + // vIndex: 117, symbol: // ?_useOn@SlabBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z virtual class InteractionResult _useOn(class ItemStack& instance, class Actor& actor, class BlockPos pos, uchar face, class Vec3 const& clickPos) diff --git a/src/mc/world/level/block/SlimeBlock.h b/src/mc/world/level/block/SlimeBlock.h index 2a7473f958..ebcf3c5d51 100644 --- a/src/mc/world/level/block/SlimeBlock.h +++ b/src/mc/world/level/block/SlimeBlock.h @@ -15,6 +15,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -38,18 +39,20 @@ class SlimeBlock : public ::BlockLegacy { // vIndex: 74, symbol: ?isBounceBlock@SlimeBlock@@UEBA_NXZ virtual bool isBounceBlock() const; - // vIndex: 146, symbol: ?onStandOn@SlimeBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z - virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@SlimeBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 148, symbol: ?onFallOn@SlimeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; + // vIndex: 144, symbol: ?onStandOn@SlimeBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z + virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; - // vIndex: 159, symbol: ?getExtraRenderLayers@SlimeBlock@@UEBAHXZ + // vIndex: 156, symbol: ?getExtraRenderLayers@SlimeBlock@@UEBAHXZ virtual int getExtraRenderLayers() const; // symbol: ??0SlimeBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI SlimeBlock(std::string const& nameId, int id, class Material const& material); + // symbol: ?onFallOn@SlimeBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/SmallDripleafBlock.h b/src/mc/world/level/block/SmallDripleafBlock.h index 13f92ff630..8f9a08242b 100644 --- a/src/mc/world/level/block/SmallDripleafBlock.h +++ b/src/mc/world/level/block/SmallDripleafBlock.h @@ -69,7 +69,7 @@ class SmallDripleafBlock : public ::BushBlock { // vIndex: 92, symbol: ?neighborChanged@SmallDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@1@Z virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const&) const; - // vIndex: 98, symbol: ?getPlacementBlock@SmallDripleafBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@SmallDripleafBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -78,24 +78,18 @@ class SmallDripleafBlock : public ::BushBlock { int itemValue ) const; - // vIndex: 136, symbol: ?init@SmallDripleafBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@SmallDripleafBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 138, symbol: ?canBeSilkTouched@SmallDripleafBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@SmallDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SmallDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SmallDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SmallDripleafBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@SmallDripleafBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SmallDripleafBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@SmallDripleafBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0SmallDripleafBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI SmallDripleafBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/SmithingTableBlock.h b/src/mc/world/level/block/SmithingTableBlock.h index 40ef46d67f..49dff576c8 100644 --- a/src/mc/world/level/block/SmithingTableBlock.h +++ b/src/mc/world/level/block/SmithingTableBlock.h @@ -33,10 +33,10 @@ class SmithingTableBlock : public ::BlockLegacy { // vIndex: 31, symbol: ?isCraftingBlock@SmithingTableBlock@@UEBA_NXZ virtual bool isCraftingBlock() const; - // vIndex: 152, symbol: ?isInteractiveBlock@SmithingTableBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@SmithingTableBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@SmithingTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@SmithingTableBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: diff --git a/src/mc/world/level/block/SmokerBlock.h b/src/mc/world/level/block/SmokerBlock.h index ab6df2b723..0f572706e2 100644 --- a/src/mc/world/level/block/SmokerBlock.h +++ b/src/mc/world/level/block/SmokerBlock.h @@ -30,10 +30,10 @@ class SmokerBlock : public ::FurnaceBlock { // vIndex: 0, symbol: __gen_??1SmokerBlock@@UEAA@XZ virtual ~SmokerBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@SmokerBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SmokerBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 154, symbol: ?use@SmokerBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@SmokerBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0SmokerBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N@Z diff --git a/src/mc/world/level/block/SnifferEggBlock.h b/src/mc/world/level/block/SnifferEggBlock.h index ed216dedd0..03c8d1bf2c 100644 --- a/src/mc/world/level/block/SnifferEggBlock.h +++ b/src/mc/world/level/block/SnifferEggBlock.h @@ -40,25 +40,19 @@ class SnifferEggBlock : public ::BlockLegacy { // vIndex: 85, symbol: ?mayPlace@SnifferEggBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SnifferEggBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 129, symbol: ?getVariant@SnifferEggBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@SnifferEggBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SnifferEggBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@SnifferEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SnifferEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SnifferEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SnifferEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 163, symbol: ?getResourceItem@SnifferEggBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - // symbol: ??0SnifferEggBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI SnifferEggBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/SnowBlock.h b/src/mc/world/level/block/SnowBlock.h index 301c045f0a..930843c566 100644 --- a/src/mc/world/level/block/SnowBlock.h +++ b/src/mc/world/level/block/SnowBlock.h @@ -33,12 +33,6 @@ class SnowBlock : public ::BlockLegacy { // vIndex: 55, symbol: ?waterSpreadCausesSpawn@SnowBlock@@UEBA_NXZ virtual bool waterSpreadCausesSpawn() const; - // vIndex: 163, symbol: ?getResourceItem@SnowBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@SnowBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: ??0SnowBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI SnowBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/SoulFireBlock.h b/src/mc/world/level/block/SoulFireBlock.h index dd79f1b404..cf28f382a5 100644 --- a/src/mc/world/level/block/SoulFireBlock.h +++ b/src/mc/world/level/block/SoulFireBlock.h @@ -57,22 +57,19 @@ class SoulFireBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SoulFireBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@SoulFireBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SoulFireBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 167, symbol: ?entityInside@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@SoulFireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource&, class BlockPos const&, class Actor& entity) const; // symbol: ??0SoulFireBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SoulSandBlock.h b/src/mc/world/level/block/SoulSandBlock.h index f9989cb2eb..d6d488caff 100644 --- a/src/mc/world/level/block/SoulSandBlock.h +++ b/src/mc/world/level/block/SoulSandBlock.h @@ -49,13 +49,13 @@ class SoulSandBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 147, symbol: ?onPlace@SoulSandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SoulSandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SoulSandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SoulSandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@SoulSandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@SoulSandBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: ??0SoulSandBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SoulTorchBlock.h b/src/mc/world/level/block/SoulTorchBlock.h index 243443bb6b..6f2bf83cda 100644 --- a/src/mc/world/level/block/SoulTorchBlock.h +++ b/src/mc/world/level/block/SoulTorchBlock.h @@ -30,10 +30,10 @@ class SoulTorchBlock : public ::TorchBlock { // vIndex: 0, symbol: __gen_??1SoulTorchBlock@@UEAA@XZ virtual ~SoulTorchBlock() = default; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@SoulTorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@SoulTorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@SoulTorchBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@SoulTorchBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); // symbol: ??0SoulTorchBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SpongeBlock.h b/src/mc/world/level/block/SpongeBlock.h index 8e64512b8a..f211384609 100644 --- a/src/mc/world/level/block/SpongeBlock.h +++ b/src/mc/world/level/block/SpongeBlock.h @@ -37,23 +37,23 @@ class SpongeBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@SpongeBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SpongeBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@SpongeBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@SpongeBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@SpongeBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 147, symbol: ?onPlace@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: ??0SpongeBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z diff --git a/src/mc/world/level/block/SporeBlossomBlock.h b/src/mc/world/level/block/SporeBlossomBlock.h index 1007adb404..a31d62e18d 100644 --- a/src/mc/world/level/block/SporeBlossomBlock.h +++ b/src/mc/world/level/block/SporeBlossomBlock.h @@ -46,17 +46,14 @@ class SporeBlossomBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@SporeBlossomBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@SporeBlossomBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@SporeBlossomBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SporeBlossomBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@SporeBlossomBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SporeBlossomBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0SporeBlossomBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SpruceLeavesBlock.h b/src/mc/world/level/block/SpruceLeavesBlock.h new file mode 100644 index 0000000000..b5f706c90d --- /dev/null +++ b/src/mc/world/level/block/SpruceLeavesBlock.h @@ -0,0 +1,49 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/WeakPtr.h" +#include "mc/common/wrapper/optional_ref.h" +#include "mc/enums/FertilizerType.h" +#include "mc/enums/Flip.h" +#include "mc/enums/ShapeType.h" +#include "mc/world/Direction.h" +#include "mc/world/level/block/LeavesBlock.h" +#include "mc/world/level/block/utils/BlockProperty.h" +#include "mc/world/level/block/utils/BlockRenderLayer.h" +#include "mc/world/level/block/utils/BlockSupportType.h" + +// auto generated forward declare list +// clang-format off +namespace mce { class Color; } +// clang-format on + +class SpruceLeavesBlock : public ::LeavesBlock { +public: + // prevent constructor by default + SpruceLeavesBlock& operator=(SpruceLeavesBlock const&); + SpruceLeavesBlock(SpruceLeavesBlock const&); + SpruceLeavesBlock(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1SpruceLeavesBlock@@UEAA@XZ + virtual ~SpruceLeavesBlock() = default; + + // vIndex: 121, symbol: ?getColor@SpruceLeavesBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual int getColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // vIndex: 128, symbol: ?getVariant@SpruceLeavesBlock@@UEBAHAEBVBlock@@@Z + virtual int getVariant(class Block const&) const; + + // vIndex: 159, symbol: + // ?getMapColor@SpruceLeavesBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const&) const; + + // symbol: + // ??0SpruceLeavesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$WeakPtr@VBlockLegacy@@@@@Z + MCAPI SpruceLeavesBlock(std::string const&, int, class WeakPtr); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/StainedGlassBlock.h b/src/mc/world/level/block/StainedGlassBlock.h index b993c0543d..2e69f56e09 100644 --- a/src/mc/world/level/block/StainedGlassBlock.h +++ b/src/mc/world/level/block/StainedGlassBlock.h @@ -42,9 +42,6 @@ class StainedGlassBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@StainedGlassBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 164, symbol: ?getResourceCount@StainedGlassBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize& randomize, class Block const& block, int bonusLootLevel) const; - // symbol: ??0StainedGlassBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_N1@Z MCAPI StainedGlassBlock(std::string const&, int, bool, bool); diff --git a/src/mc/world/level/block/StairBlock.h b/src/mc/world/level/block/StairBlock.h index f152425170..4755c658a3 100644 --- a/src/mc/world/level/block/StairBlock.h +++ b/src/mc/world/level/block/StairBlock.h @@ -101,7 +101,7 @@ class StairBlock : public ::BlockLegacy { destroy(class BlockSource& region, class BlockPos const& pos, class Block const& block, class Actor* entitySource) const; - // vIndex: 98, symbol: ?getPlacementBlock@StairBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@StairBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -110,37 +110,34 @@ class StairBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 101, symbol: ?attack@StairBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z + // vIndex: 100, symbol: ?attack@StairBlock@@UEBA_NPEAVPlayer@@AEBVBlockPos@@@Z virtual bool attack(class Player* player, class BlockPos const& pos) const; - // vIndex: 129, symbol: ?getVariant@StairBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@StairBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 135, symbol: ?animateTick@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 134, symbol: ?animateTick@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 138, symbol: ?canBeSilkTouched@StairBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 144, symbol: ?onRemove@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 145, symbol: ?onExploded@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + // vIndex: 143, symbol: ?onExploded@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z virtual void onExploded(class BlockSource& region, class BlockPos const& pos, class Actor* entitySource) const; - // vIndex: 146, symbol: ?onStandOn@StairBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z + // vIndex: 144, symbol: ?onStandOn@StairBlock@@UEBAXAEAVEntityContext@@AEBVBlockPos@@@Z virtual void onStandOn(class EntityContext& entity, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@StairBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@StairBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@StairBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0StairBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVBlockLegacy@@@Z diff --git a/src/mc/world/level/block/StemBlock.h b/src/mc/world/level/block/StemBlock.h index 6ab8d2da24..8bfd648516 100644 --- a/src/mc/world/level/block/StemBlock.h +++ b/src/mc/world/level/block/StemBlock.h @@ -53,22 +53,19 @@ class StemBlock : public ::BushBlock { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@StemBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@StemBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 121, symbol: ?getColor@StemBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@StemBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@StemBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@StemBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 123, symbol: ?getColorAtPos@StemBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 122, symbol: ?getColorAtPos@StemBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getColorAtPos(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 138, symbol: ?canBeSilkTouched@StemBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 151, symbol: ?randomTick@StemBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@StemBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: ??0StemBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVBlockLegacy@@@Z diff --git a/src/mc/world/level/block/StoneBlock.h b/src/mc/world/level/block/StoneBlock.h index 3c7af0aac7..d954ed6b21 100644 --- a/src/mc/world/level/block/StoneBlock.h +++ b/src/mc/world/level/block/StoneBlock.h @@ -33,21 +33,18 @@ class StoneBlock : public ::BlockLegacy { // vIndex: 47, symbol: ?canBeOriginalSurface@StoneBlock@@UEBA_NXZ virtual bool canBeOriginalSurface() const; - // vIndex: 96, symbol: ?asItemInstance@StoneBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@StoneBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 141, symbol: ?tryGetInfested@StoneBlock@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 139, symbol: ?tryGetInfested@StoneBlock@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetInfested(class Block const& block) const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@StoneBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@StoneBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 162, symbol: ?getMapColor@StoneBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@StoneBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@StoneBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - // symbol: ??0StoneBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI StoneBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/StoneBricksBlock.h b/src/mc/world/level/block/StoneBricksBlock.h index 76e0b0b387..70bf086717 100644 --- a/src/mc/world/level/block/StoneBricksBlock.h +++ b/src/mc/world/level/block/StoneBricksBlock.h @@ -30,17 +30,17 @@ class StoneBricksBlock : public ::BlockLegacy { // vIndex: 0, symbol: __gen_??1StoneBricksBlock@@UEAA@XZ virtual ~StoneBricksBlock() = default; - // vIndex: 96, symbol: ?asItemInstance@StoneBricksBlock@@MEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@StoneBricksBlock@@MEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@StoneBricksBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@StoneBricksBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@StoneBricksBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 141, symbol: ?tryGetInfested@StoneBricksBlock@@UEBAPEBVBlock@@AEBV2@@Z + // vIndex: 139, symbol: ?tryGetInfested@StoneBricksBlock@@UEBAPEBVBlock@@AEBV2@@Z virtual class Block const* tryGetInfested(class Block const& block) const; // symbol: diff --git a/src/mc/world/level/block/StoneSlabBlock.h b/src/mc/world/level/block/StoneSlabBlock.h index 58a15973c9..b5a3ef2bac 100644 --- a/src/mc/world/level/block/StoneSlabBlock.h +++ b/src/mc/world/level/block/StoneSlabBlock.h @@ -34,28 +34,22 @@ class StoneSlabBlock : public ::SlabBlock { // vIndex: 49, symbol: ?isValidAuxValue@StoneSlabBlock@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 96, symbol: ?asItemInstance@StoneSlabBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@StoneSlabBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@StoneSlabBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@StoneSlabBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@StoneSlabBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 162, symbol: ?getMapColor@StoneSlabBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@StoneSlabBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@StoneSlabBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@StoneSlabBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: // ??0StoneSlabBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_NV?$WeakPtr@VBlockLegacy@@@@@Z MCAPI StoneSlabBlock(std::string const& nameId, int id, bool fullSize, class WeakPtr baseSlab); diff --git a/src/mc/world/level/block/StoneSlabBlock2.h b/src/mc/world/level/block/StoneSlabBlock2.h index 13984ea79c..51e4205177 100644 --- a/src/mc/world/level/block/StoneSlabBlock2.h +++ b/src/mc/world/level/block/StoneSlabBlock2.h @@ -34,28 +34,22 @@ class StoneSlabBlock2 : public ::SlabBlock { // vIndex: 49, symbol: ?isValidAuxValue@StoneSlabBlock2@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 96, symbol: ?asItemInstance@StoneSlabBlock2@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@StoneSlabBlock2@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@StoneSlabBlock2@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock2@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock2@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@StoneSlabBlock2@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@StoneSlabBlock2@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 162, symbol: ?getMapColor@StoneSlabBlock2@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@StoneSlabBlock2@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@StoneSlabBlock2@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@StoneSlabBlock2@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: // ??0StoneSlabBlock2@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_NV?$WeakPtr@VBlockLegacy@@@@@Z MCAPI StoneSlabBlock2(std::string const& nameId, int id, bool fullSize, class WeakPtr baseSlab); diff --git a/src/mc/world/level/block/StoneSlabBlock3.h b/src/mc/world/level/block/StoneSlabBlock3.h index a512e005dc..9b7b4aada8 100644 --- a/src/mc/world/level/block/StoneSlabBlock3.h +++ b/src/mc/world/level/block/StoneSlabBlock3.h @@ -34,28 +34,22 @@ class StoneSlabBlock3 : public ::SlabBlock { // vIndex: 49, symbol: ?isValidAuxValue@StoneSlabBlock3@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 96, symbol: ?asItemInstance@StoneSlabBlock3@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@StoneSlabBlock3@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@StoneSlabBlock3@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock3@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock3@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@StoneSlabBlock3@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@StoneSlabBlock3@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 162, symbol: ?getMapColor@StoneSlabBlock3@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@StoneSlabBlock3@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@StoneSlabBlock3@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@StoneSlabBlock3@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: // ??0StoneSlabBlock3@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_NV?$WeakPtr@VBlockLegacy@@@@@Z MCAPI StoneSlabBlock3(std::string const& nameId, int id, bool fullSize, class WeakPtr baseSlab); diff --git a/src/mc/world/level/block/StoneSlabBlock4.h b/src/mc/world/level/block/StoneSlabBlock4.h index b5bb8f9009..a5371a028f 100644 --- a/src/mc/world/level/block/StoneSlabBlock4.h +++ b/src/mc/world/level/block/StoneSlabBlock4.h @@ -34,28 +34,22 @@ class StoneSlabBlock4 : public ::SlabBlock { // vIndex: 49, symbol: ?isValidAuxValue@StoneSlabBlock4@@UEBA_NH@Z virtual bool isValidAuxValue(int auxValue) const; - // vIndex: 96, symbol: ?asItemInstance@StoneSlabBlock4@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@StoneSlabBlock4@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@StoneSlabBlock4@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock4@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@StoneSlabBlock4@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@StoneSlabBlock4@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@StoneSlabBlock4@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 162, symbol: ?getMapColor@StoneSlabBlock4@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@StoneSlabBlock4@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - // vIndex: 163, symbol: ?getResourceItem@StoneSlabBlock4@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@StoneSlabBlock4@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - // symbol: // ??0StoneSlabBlock4@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_NV?$WeakPtr@VBlockLegacy@@@@@Z MCAPI StoneSlabBlock4(std::string const& nameId, int id, bool fullSize, class WeakPtr baseSlab); diff --git a/src/mc/world/level/block/StonecutterBlock.h b/src/mc/world/level/block/StonecutterBlock.h index 32128f26b9..875c773518 100644 --- a/src/mc/world/level/block/StonecutterBlock.h +++ b/src/mc/world/level/block/StonecutterBlock.h @@ -39,13 +39,13 @@ class StonecutterBlock : public ::BlockLegacy { // vIndex: 56, symbol: ?canContainLiquid@StonecutterBlock@@UEBA_NXZ virtual bool canContainLiquid() const; - // vIndex: 136, symbol: ?init@StonecutterBlock@@UEAAAEAVBlockLegacy@@XZ + // vIndex: 135, symbol: ?init@StonecutterBlock@@UEAAAEAVBlockLegacy@@XZ virtual class BlockLegacy& init(); - // vIndex: 152, symbol: ?isInteractiveBlock@StonecutterBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@StonecutterBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@StonecutterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@StonecutterBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0StonecutterBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/StrippedLogBlock.h b/src/mc/world/level/block/StrippedLogBlock.h index 9aeb7df238..4a680fc0bf 100644 --- a/src/mc/world/level/block/StrippedLogBlock.h +++ b/src/mc/world/level/block/StrippedLogBlock.h @@ -30,17 +30,14 @@ class StrippedLogBlock : public ::RotatedPillarBlock { // vIndex: 0, symbol: __gen_??1StrippedLogBlock@@UEAA@XZ virtual ~StrippedLogBlock() = default; - // vIndex: 129, symbol: ?getVariant@StrippedLogBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@StrippedLogBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const&) const; - // vIndex: 162, symbol: + // vIndex: 159, symbol: // ?getMapColor@StrippedLogBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 165, symbol: ?getSilkTouchItemInstance@StrippedLogBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const&) const; - // symbol: // ??0StrippedLogBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$optional@ULogBlockMapColors@@@2@@Z MCAPI StrippedLogBlock(std::string const& nameId, int id, std::optional mapColors); diff --git a/src/mc/world/level/block/StructureBlock.h b/src/mc/world/level/block/StructureBlock.h index 31353d79c1..421233a1d9 100644 --- a/src/mc/world/level/block/StructureBlock.h +++ b/src/mc/world/level/block/StructureBlock.h @@ -40,13 +40,13 @@ class StructureBlock : public ::ActorBlock { // vIndex: 71, symbol: ?setupRedstoneComponent@StructureBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@StructureBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@StructureBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@StructureBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@StructureBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@StructureBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@StructureBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; // symbol: ??0StructureBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/StructureVoidBlock.h b/src/mc/world/level/block/StructureVoidBlock.h index 5ceb8e0cb3..55d41ef4f2 100644 --- a/src/mc/world/level/block/StructureVoidBlock.h +++ b/src/mc/world/level/block/StructureVoidBlock.h @@ -58,9 +58,6 @@ class StructureVoidBlock : public ::BlockLegacy { // vIndex: 77, symbol: ?canRenderSelectionOverlay@StructureVoidBlock@@UEBA_NW4BlockRenderLayer@@@Z virtual bool canRenderSelectionOverlay(::BlockRenderLayer) const; - // vIndex: 138, symbol: ?canBeSilkTouched@StructureVoidBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - // symbol: ??0StructureVoidBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI StructureVoidBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/SugarCaneBlock.h b/src/mc/world/level/block/SugarCaneBlock.h index 272c87b673..e986a06a50 100644 --- a/src/mc/world/level/block/SugarCaneBlock.h +++ b/src/mc/world/level/block/SugarCaneBlock.h @@ -63,28 +63,28 @@ class SugarCaneBlock : public ::BlockLegacy { // vIndex: 92, symbol: ?neighborChanged@SugarCaneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@1@Z virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const&) const; - // vIndex: 96, symbol: ?asItemInstance@SugarCaneBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SugarCaneBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 121, symbol: ?getColor@SugarCaneBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@SugarCaneBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@SugarCaneBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@SugarCaneBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 123, symbol: ?getColorAtPos@SugarCaneBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 122, symbol: ?getColorAtPos@SugarCaneBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getColorAtPos(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 126, symbol: ?onGraphicsModeChanged@SugarCaneBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z + // vIndex: 125, symbol: ?onGraphicsModeChanged@SugarCaneBlock@@UEAAXAEBUBlockGraphicsModeChangeContext@@@Z virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const& context); - // vIndex: 150, symbol: ?tick@SugarCaneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@SugarCaneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@SugarCaneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@SugarCaneBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@SugarCaneBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SugarCaneBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0SugarCaneBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/SweetBerryBushBlock.h b/src/mc/world/level/block/SweetBerryBushBlock.h index 5cb88dcebc..c1673d7eea 100644 --- a/src/mc/world/level/block/SweetBerryBushBlock.h +++ b/src/mc/world/level/block/SweetBerryBushBlock.h @@ -68,10 +68,10 @@ class SweetBerryBushBlock : public ::BushBlock { // vIndex: 86, symbol: ?mayPlaceOn@SweetBerryBushBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@SweetBerryBushBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@SweetBerryBushBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 106, symbol: + // vIndex: 105, symbol: // ?executeEvent@SweetBerryBushBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVActor@@@Z virtual void executeEvent( class BlockSource& region, @@ -81,33 +81,33 @@ class SweetBerryBushBlock : public ::BushBlock { class Actor& sourceEntity ) const; - // vIndex: 129, symbol: ?getVariant@SweetBerryBushBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@SweetBerryBushBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 140, symbol: ?dealsContactDamage@SweetBerryBushBlock@@UEBA_NAEBVActor@@AEBVBlock@@_N@Z + // vIndex: 138, symbol: ?dealsContactDamage@SweetBerryBushBlock@@UEBA_NAEBVActor@@AEBVBlock@@_N@Z virtual bool dealsContactDamage(class Actor const& actor, class Block const& block, bool isPathFinding) const; - // vIndex: 151, symbol: ?randomTick@SweetBerryBushBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@SweetBerryBushBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 152, symbol: ?isInteractiveBlock@SweetBerryBushBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@SweetBerryBushBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@SweetBerryBushBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@SweetBerryBushBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 156, symbol: ?canSurvive@SweetBerryBushBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@SweetBerryBushBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 157, symbol: ?getRenderLayer@SweetBerryBushBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@SweetBerryBushBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@SweetBerryBushBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; - // vIndex: 167, symbol: ?entityInside@SweetBerryBushBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@SweetBerryBushBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0SweetBerryBushBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/TallGrassBlock.h b/src/mc/world/level/block/TallGrassBlock.h index 48c0d0c575..9af5b5b4b8 100644 --- a/src/mc/world/level/block/TallGrassBlock.h +++ b/src/mc/world/level/block/TallGrassBlock.h @@ -63,40 +63,34 @@ class TallGrassBlock : public ::BushBlock { // vIndex: 85, symbol: ?mayPlace@TallGrassBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 96, symbol: ?asItemInstance@TallGrassBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@TallGrassBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@TallGrassBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@TallGrassBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@TallGrassBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 121, symbol: ?getColor@TallGrassBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@TallGrassBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@TallGrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@TallGrassBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@TallGrassBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@TallGrassBlock@@UEAAXAEBVExperiments@@@Z - virtual void _addHardCodedBlockComponents(class Experiments const&); - - // vIndex: 156, symbol: ?canSurvive@TallGrassBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@TallGrassBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 157, symbol: ?getRenderLayer@TallGrassBlock@@UEBA?AW4BlockRenderLayer@@XZ + // vIndex: 154, symbol: ?getRenderLayer@TallGrassBlock@@UEBA?AW4BlockRenderLayer@@XZ virtual ::BlockRenderLayer getRenderLayer() const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@TallGrassBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@TallGrassBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@TallGrassBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const&) const; diff --git a/src/mc/world/level/block/TargetBlock.h b/src/mc/world/level/block/TargetBlock.h index 61646f8298..afe0e82afa 100644 --- a/src/mc/world/level/block/TargetBlock.h +++ b/src/mc/world/level/block/TargetBlock.h @@ -44,10 +44,10 @@ class TargetBlock : public ::BlockLegacy { // vIndex: 71, symbol: ?setupRedstoneComponent@TargetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void setupRedstoneComponent(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@TargetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TargetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@TargetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@TargetBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; // symbol: ??0TargetBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/ThinFenceBlock.h b/src/mc/world/level/block/ThinFenceBlock.h index e18c794087..c8a6eb957b 100644 --- a/src/mc/world/level/block/ThinFenceBlock.h +++ b/src/mc/world/level/block/ThinFenceBlock.h @@ -92,19 +92,9 @@ class ThinFenceBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@ThinFenceBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 164, symbol: ?getResourceCount@ThinFenceBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - // symbol: - // ??0ThinFenceBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@_N22@Z - MCAPI ThinFenceBlock( - std::string const& nameId, - int id, - class Material const& material, - bool dropsResources, - bool singleSide, - bool useableInCommands - ); + // ??0ThinFenceBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@_N2@Z + MCAPI ThinFenceBlock(std::string const&, int, class Material const&, bool, bool); // NOLINTEND diff --git a/src/mc/world/level/block/TntBlock.h b/src/mc/world/level/block/TntBlock.h index 3a804d8d91..d7efaa381a 100644 --- a/src/mc/world/level/block/TntBlock.h +++ b/src/mc/world/level/block/TntBlock.h @@ -49,34 +49,31 @@ class TntBlock : public ::BlockLegacy { destroy(class BlockSource& region, class BlockPos const& pos, class Block const& block, class Actor* entitySource) const; - // vIndex: 97, symbol: + // vIndex: 96, symbol: // ?trySpawnResourcesOnExplosion@TntBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAVRandomize@@M@Z virtual void trySpawnResourcesOnExplosion(class BlockSource&, class BlockPos const&, class Block const&, class Randomize&, float) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@TntBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@TntBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@TntBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@TntBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@TntBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 145, symbol: ?onExploded@TntBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + // vIndex: 143, symbol: ?onExploded@TntBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z virtual void onExploded(class BlockSource& region, class BlockPos const& pos, class Actor* entitySource) const; - // vIndex: 147, symbol: ?onPlace@TntBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TntBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 154, symbol: ?use@TntBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@TntBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 163, symbol: ?getResourceItem@TntBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - // symbol: ??0TntBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI TntBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/TopSnowBlock.h b/src/mc/world/level/block/TopSnowBlock.h index 5376cb616d..cd0c7163ab 100644 --- a/src/mc/world/level/block/TopSnowBlock.h +++ b/src/mc/world/level/block/TopSnowBlock.h @@ -87,7 +87,7 @@ class TopSnowBlock : public ::FallingBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const&) const; - // vIndex: 98, symbol: ?getPlacementBlock@TopSnowBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@TopSnowBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -96,51 +96,42 @@ class TopSnowBlock : public ::FallingBlock { int itemValue ) const; - // vIndex: 103, symbol: ?canBeBuiltOver@TopSnowBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlockItem@@@Z + // vIndex: 102, symbol: ?canBeBuiltOver@TopSnowBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlockItem@@@Z virtual bool canBeBuiltOver(class BlockSource& region, class BlockPos const& pos, class BlockItem const& item) const; - // vIndex: 104, symbol: ?canBeBuiltOver@TopSnowBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 103, symbol: ?canBeBuiltOver@TopSnowBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canBeBuiltOver(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 108, symbol: ?shouldStopFalling@TopSnowBlock@@UEBA_NAEAVActor@@@Z + // vIndex: 107, symbol: ?shouldStopFalling@TopSnowBlock@@UEBA_NAEAVActor@@@Z virtual bool shouldStopFalling(class Actor& entity) const; - // vIndex: 110, symbol: ?canHaveExtraData@TopSnowBlock@@UEBA_NXZ + // vIndex: 109, symbol: ?canHaveExtraData@TopSnowBlock@@UEBA_NXZ virtual bool canHaveExtraData() const; - // vIndex: 138, symbol: ?canBeSilkTouched@TopSnowBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 145, symbol: ?onExploded@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + // vIndex: 143, symbol: ?onExploded@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z virtual void onExploded(class BlockSource& region, class BlockPos const& pos, class Actor* entitySource) const; - // vIndex: 147, symbol: ?onPlace@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 151, symbol: ?randomTick@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@TopSnowBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 163, symbol: ?getResourceItem@TopSnowBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@TopSnowBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const& block, int) const; - - // vIndex: 168, symbol: ?getDustColor@TopSnowBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z + // vIndex: 163, symbol: ?getDustColor@TopSnowBlock@@UEBA?AVColor@mce@@AEBVBlock@@@Z virtual class mce::Color getDustColor(class Block const& block) const; - // vIndex: 169, symbol: + // vIndex: 164, symbol: // ?getDustParticleName@TopSnowBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string getDustParticleName(class Block const&) const; - // vIndex: 172, symbol: ?isFreeToFall@TopSnowBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 167, symbol: ?isFreeToFall@TopSnowBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool isFreeToFall(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 173, symbol: ?startFalling@TopSnowBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@_N@Z + // vIndex: 168, symbol: ?startFalling@TopSnowBlock@@MEBAXAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@_N@Z virtual void startFalling(class BlockSource& region, class BlockPos const& pos, class Block const& oldBlock, bool creative) const; diff --git a/src/mc/world/level/block/TorchBlock.h b/src/mc/world/level/block/TorchBlock.h index 738d73e56c..0c90356db1 100644 --- a/src/mc/world/level/block/TorchBlock.h +++ b/src/mc/world/level/block/TorchBlock.h @@ -54,7 +54,7 @@ class TorchBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@TorchBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@TorchBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -63,28 +63,25 @@ class TorchBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 118, symbol: ?getIconYOffset@TorchBlock@@UEBAHXZ + // vIndex: 117, symbol: ?getIconYOffset@TorchBlock@@UEBAHXZ virtual int getIconYOffset() const; - // vIndex: 134, symbol: ?animateTickBedrockLegacy@TorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 133, symbol: ?animateTickBedrockLegacy@TorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 138, symbol: ?canBeSilkTouched@TorchBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@TorchBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@TorchBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); - // vIndex: 147, symbol: ?onPlace@TorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@TorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@TorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@TorchBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@TorchBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 158, symbol: + // vIndex: 155, symbol: // ?getRenderLayer@TorchBlock@@UEBA?AW4BlockRenderLayer@@AEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z virtual ::BlockRenderLayer getRenderLayer(class Block const& block, class BlockSource&, class BlockPos const& pos) const; diff --git a/src/mc/world/level/block/TorchflowerCropBlock.h b/src/mc/world/level/block/TorchflowerCropBlock.h index 8bd6ff2185..df6d6d0849 100644 --- a/src/mc/world/level/block/TorchflowerCropBlock.h +++ b/src/mc/world/level/block/TorchflowerCropBlock.h @@ -39,10 +39,10 @@ class TorchflowerCropBlock : public ::CropBlock { // ?onFertilized@TorchflowerCropBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@W4FertilizerType@@@Z virtual bool onFertilized(class BlockSource&, class BlockPos const&, class Actor*, ::FertilizerType) const; - // vIndex: 129, symbol: ?getVariant@TorchflowerCropBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@TorchflowerCropBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 169, symbol: ?setGrowth@TorchflowerCropBlock@@UEBAAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@AEBV2@GH@Z + // vIndex: 164, symbol: ?setGrowth@TorchflowerCropBlock@@UEBAAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@AEBV2@GH@Z virtual class Block const& setGrowth( class BlockSource& region, class BlockPos const& pos, @@ -51,7 +51,7 @@ class TorchflowerCropBlock : public ::CropBlock { int updateFlags ) const; - // vIndex: 170, symbol: ?getBaseSeed@TorchflowerCropBlock@@UEBA?BVItemInstance@@XZ + // vIndex: 165, symbol: ?getBaseSeed@TorchflowerCropBlock@@UEBA?BVItemInstance@@XZ virtual class ItemInstance const getBaseSeed() const; // symbol: ??0TorchflowerCropBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/TrapDoorBlock.h b/src/mc/world/level/block/TrapDoorBlock.h index 47a00e20e1..19183af442 100644 --- a/src/mc/world/level/block/TrapDoorBlock.h +++ b/src/mc/world/level/block/TrapDoorBlock.h @@ -58,10 +58,10 @@ class TrapDoorBlock : public ::BlockLegacy { // vIndex: 89, symbol: ?breaksFallingBlocks@TrapDoorBlock@@UEBA_NAEBVBlock@@VBaseGameVersion@@@Z virtual bool breaksFallingBlocks(class Block const& block, class BaseGameVersion version) const; - // vIndex: 96, symbol: ?asItemInstance@TrapDoorBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@TrapDoorBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@TrapDoorBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@TrapDoorBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -70,20 +70,17 @@ class TrapDoorBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 138, symbol: ?canBeSilkTouched@TrapDoorBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@TrapDoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TrapDoorBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 152, symbol: ?isInteractiveBlock@TrapDoorBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@TrapDoorBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; - // vIndex: 154, symbol: ?use@TrapDoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@TrapDoorBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar face) const; - // vIndex: 166, symbol: ?_onHitByActivatingAttack@TrapDoorBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&) const; + // vIndex: 160, symbol: ?_onHitByActivatingAttack@TrapDoorBlock@@EEBAXAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@@Z + virtual void _onHitByActivatingAttack(class BlockSource&, class BlockPos const&, class Actor*) const; // symbol: ??0TrapDoorBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HAEBVMaterial@@@Z MCAPI TrapDoorBlock(std::string const& nameId, int id, class Material const& material); diff --git a/src/mc/world/level/block/TrialSpawnerBlock.h b/src/mc/world/level/block/TrialSpawnerBlock.h index bd1dc8309e..739c2059ab 100644 --- a/src/mc/world/level/block/TrialSpawnerBlock.h +++ b/src/mc/world/level/block/TrialSpawnerBlock.h @@ -33,13 +33,13 @@ class TrialSpawnerBlock : public ::ActorBlock { // vIndex: 56, symbol: ?canContainLiquid@TrialSpawnerBlock@@UEBA_NXZ virtual bool canContainLiquid() const; - // vIndex: 129, symbol: ?getVariant@TrialSpawnerBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@TrialSpawnerBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const&) const; - // vIndex: 137, symbol: ?getLightEmission@TrialSpawnerBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + // vIndex: 136, symbol: ?getLightEmission@TrialSpawnerBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z virtual struct Brightness getLightEmission(class Block const&) const; - // vIndex: 152, symbol: ?isInteractiveBlock@TrialSpawnerBlock@@UEBA_NXZ + // vIndex: 149, symbol: ?isInteractiveBlock@TrialSpawnerBlock@@UEBA_NXZ virtual bool isInteractiveBlock() const; // symbol: ??0TrialSpawnerBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/TripWireBlock.h b/src/mc/world/level/block/TripWireBlock.h index 48d8966203..05f5019eff 100644 --- a/src/mc/world/level/block/TripWireBlock.h +++ b/src/mc/world/level/block/TripWireBlock.h @@ -43,23 +43,23 @@ class TripWireBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 96, symbol: ?asItemInstance@TripWireBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@TripWireBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 102, symbol: ?shouldTriggerEntityInside@TripWireBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 101, symbol: ?shouldTriggerEntityInside@TripWireBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual bool shouldTriggerEntityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; - // vIndex: 144, symbol: ?onRemove@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 167, symbol: ?entityInside@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@TripWireBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0TripWireBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/TripWireHookBlock.h b/src/mc/world/level/block/TripWireHookBlock.h index 08eb1d8f89..ff111bde2d 100644 --- a/src/mc/world/level/block/TripWireHookBlock.h +++ b/src/mc/world/level/block/TripWireHookBlock.h @@ -56,7 +56,7 @@ class TripWireHookBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@TripWireHookBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@TripWireHookBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -65,19 +65,19 @@ class TripWireHookBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 130, symbol: ?canSpawnOn@TripWireHookBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@TripWireHookBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor*) const; - // vIndex: 144, symbol: ?onRemove@TripWireHookBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@TripWireHookBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@TripWireHookBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TripWireHookBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@TripWireHookBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@TripWireHookBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 156, symbol: ?canSurvive@TripWireHookBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@TripWireHookBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0TripWireHookBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/TurtleEggBlock.h b/src/mc/world/level/block/TurtleEggBlock.h index 32893cb6dc..7decf12f5a 100644 --- a/src/mc/world/level/block/TurtleEggBlock.h +++ b/src/mc/world/level/block/TurtleEggBlock.h @@ -54,29 +54,20 @@ class TurtleEggBlock : public ::BlockLegacy { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@TurtleEggBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 147, symbol: ?onPlace@TurtleEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TurtleEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@TurtleEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@TurtleEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 154, symbol: ?use@TurtleEggBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + // vIndex: 151, symbol: ?use@TurtleEggBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z virtual bool use(class Player& player, class BlockPos const& pos, uchar) const; - // vIndex: 163, symbol: ?getResourceItem@TurtleEggBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const&, int) const; - - // vIndex: 164, symbol: ?getResourceCount@TurtleEggBlock@@UEBAHAEAVRandomize@@AEBVBlock@@H@Z - virtual int getResourceCount(class Randomize&, class Block const&, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@TurtleEggBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - - // vIndex: 167, symbol: ?entityInside@TurtleEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@TurtleEggBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource&, class BlockPos const& pos, class Actor& entity) const; // symbol: ??0TurtleEggBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/TwistingVinesBlock.h b/src/mc/world/level/block/TwistingVinesBlock.h index f43266d40e..c18d2ee019 100644 --- a/src/mc/world/level/block/TwistingVinesBlock.h +++ b/src/mc/world/level/block/TwistingVinesBlock.h @@ -61,21 +61,18 @@ class TwistingVinesBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 144, symbol: ?onRemove@TwistingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@TwistingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@TwistingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@TwistingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@TwistingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@TwistingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@TwistingVinesBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@TwistingVinesBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@TwistingVinesBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize& randomize, class Block const&, int) const; - // symbol: ??0TwistingVinesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI TwistingVinesBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/UnderwaterTorchBlock.h b/src/mc/world/level/block/UnderwaterTorchBlock.h index 19161ae44c..235fbde284 100644 --- a/src/mc/world/level/block/UnderwaterTorchBlock.h +++ b/src/mc/world/level/block/UnderwaterTorchBlock.h @@ -42,7 +42,7 @@ class UnderwaterTorchBlock : public ::TorchBlock { // vIndex: 85, symbol: ?mayPlace@UnderwaterTorchBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@UnderwaterTorchBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; diff --git a/src/mc/world/level/block/UndyedShulkerBoxBlock.h b/src/mc/world/level/block/UndyedShulkerBoxBlock.h index 22311540ea..dbd1c43cb9 100644 --- a/src/mc/world/level/block/UndyedShulkerBoxBlock.h +++ b/src/mc/world/level/block/UndyedShulkerBoxBlock.h @@ -58,15 +58,15 @@ class UndyedShulkerBoxBlock : public ::ChestBlock { virtual class Block const* playerWillDestroy(class Player& player, class BlockPos const& pos, class Block const& block) const; - // vIndex: 96, symbol: ?asItemInstance@UndyedShulkerBoxBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@UndyedShulkerBoxBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: + // vIndex: 97, symbol: // ?getPlacementBlock@UndyedShulkerBoxBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock(class Actor const&, class BlockPos const&, uchar, class Vec3 const&, int itemValue) const; - // vIndex: 121, symbol: ?getColor@UndyedShulkerBoxBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@UndyedShulkerBoxBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const&) const; // symbol: ??0UndyedShulkerBoxBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/VanillaStates.h b/src/mc/world/level/block/VanillaStates.h index fea39b6048..04c2d4fbf0 100644 --- a/src/mc/world/level/block/VanillaStates.h +++ b/src/mc/world/level/block/VanillaStates.h @@ -43,6 +43,7 @@ #include "mc/enums/WallConnectionType.h" #include "mc/enums/WoodType.h" #include "mc/world/level/block/states/BlockStateVariant.h" +#include "mc/world/level/block/states/VaultBlockState.h" #include "mc/world/level/block/utils/BlockColor.h" #include "mc/world/level/block/utils/PrismarineBlockType.h" #include "mc/world/level/block/utils/WallBlockType.h" @@ -417,6 +418,9 @@ MCAPI extern class BlockStateVariant const UpperBlockBit; // symbol: ?UpsideDownBit@VanillaStates@@3V?$BlockStateVariant@_N@@B MCAPI extern class BlockStateVariant const UpsideDownBit; +// symbol: ?VaultState@VanillaStates@@3V?$BlockStateVariant@W4VaultBlockState@@@@B +MCAPI extern class BlockStateVariant<::VaultBlockState> const VaultState; + // symbol: ?VineDirectionBits@VanillaStates@@3V?$BlockStateVariant@H@@B MCAPI extern class BlockStateVariant const VineDirectionBits; diff --git a/src/mc/world/level/block/VaultBlock.h b/src/mc/world/level/block/VaultBlock.h new file mode 100644 index 0000000000..a404b5a9a6 --- /dev/null +++ b/src/mc/world/level/block/VaultBlock.h @@ -0,0 +1,62 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/optional_ref.h" +#include "mc/enums/FertilizerType.h" +#include "mc/enums/Flip.h" +#include "mc/enums/ShapeType.h" +#include "mc/world/Direction.h" +#include "mc/world/level/block/ActorBlock.h" +#include "mc/world/level/block/utils/BlockProperty.h" +#include "mc/world/level/block/utils/BlockRenderLayer.h" +#include "mc/world/level/block/utils/BlockSupportType.h" + +// auto generated forward declare list +// clang-format off +namespace mce { class Color; } +// clang-format on + +class VaultBlock : public ::ActorBlock { +public: + // prevent constructor by default + VaultBlock& operator=(VaultBlock const&); + VaultBlock(VaultBlock const&); + VaultBlock(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1VaultBlock@@UEAA@XZ + virtual ~VaultBlock() = default; + + // vIndex: 97, symbol: ?getPlacementBlock@VaultBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + virtual class Block const& + getPlacementBlock(class Actor const&, class BlockPos const&, uchar, class Vec3 const&, int) const; + + // vIndex: 128, symbol: ?getVariant@VaultBlock@@UEBAHAEBVBlock@@@Z + virtual int getVariant(class Block const&) const; + + // vIndex: 130, symbol: ?getRenderBlock@VaultBlock@@UEBAAEBVBlock@@XZ + virtual class Block const& getRenderBlock() const; + + // vIndex: 131, symbol: ?getMappedFace@VaultBlock@@UEBAEEAEBVBlock@@@Z + virtual uchar getMappedFace(uchar, class Block const&) const; + + // vIndex: 132, symbol: ?getFaceFlip@VaultBlock@@UEBA?AW4Flip@@EAEBVBlock@@@Z + virtual ::Flip getFaceFlip(uchar, class Block const&) const; + + // vIndex: 136, symbol: ?getLightEmission@VaultBlock@@UEBA?AUBrightness@@AEBVBlock@@@Z + virtual struct Brightness getLightEmission(class Block const&) const; + + // vIndex: 149, symbol: ?isInteractiveBlock@VaultBlock@@UEBA_NXZ + virtual bool isInteractiveBlock() const; + + // vIndex: 151, symbol: ?use@VaultBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z + virtual bool use(class Player&, class BlockPos const&, uchar) const; + + // symbol: ??0VaultBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z + MCAPI VaultBlock(std::string const&, int); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/VineBlock.h b/src/mc/world/level/block/VineBlock.h index 3e05fbf533..9a01a1041f 100644 --- a/src/mc/world/level/block/VineBlock.h +++ b/src/mc/world/level/block/VineBlock.h @@ -55,7 +55,7 @@ class VineBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 98, symbol: ?getPlacementBlock@VineBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@VineBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -64,25 +64,22 @@ class VineBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 121, symbol: ?getColor@VineBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@VineBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 122, symbol: ?getColor@VineBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 121, symbol: ?getColor@VineBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual int getColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@VineBlock@@UEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 150, symbol: ?tick@VineBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@VineBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random&) const; - // vIndex: 151, symbol: ?randomTick@VineBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 148, symbol: ?randomTick@VineBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void randomTick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@VineBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@VineBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 162, symbol: ?getMapColor@VineBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@VineBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const&) const; diff --git a/src/mc/world/level/block/WallBlock.h b/src/mc/world/level/block/WallBlock.h index 0086d41227..cc86bc4f2d 100644 --- a/src/mc/world/level/block/WallBlock.h +++ b/src/mc/world/level/block/WallBlock.h @@ -80,10 +80,10 @@ class WallBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 96, symbol: ?asItemInstance@WallBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@WallBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - // vIndex: 98, symbol: ?getPlacementBlock@WallBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z + // vIndex: 97, symbol: ?getPlacementBlock@WallBlock@@UEBAAEBVBlock@@AEBVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z virtual class Block const& getPlacementBlock( class Actor const& by, class BlockPos const& pos, @@ -92,26 +92,23 @@ class WallBlock : public ::BlockLegacy { int itemValue ) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@WallBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@WallBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@WallBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 129, symbol: ?getVariant@WallBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 128, symbol: ?getVariant@WallBlock@@UEBAHAEBVBlock@@@Z virtual int getVariant(class Block const& block) const; - // vIndex: 138, symbol: ?canBeSilkTouched@WallBlock@@MEBA_NXZ - virtual bool canBeSilkTouched() const; - - // vIndex: 147, symbol: ?onPlace@WallBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@WallBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@WallBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@WallBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 162, symbol: ?getMapColor@WallBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z + // vIndex: 159, symbol: ?getMapColor@WallBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z virtual class mce::Color getMapColor(class BlockSource& region, class BlockPos const& pos, class Block const& block) const; diff --git a/src/mc/world/level/block/WaterlilyBlock.h b/src/mc/world/level/block/WaterlilyBlock.h index 8b92a71c38..7e07aba17c 100644 --- a/src/mc/world/level/block/WaterlilyBlock.h +++ b/src/mc/world/level/block/WaterlilyBlock.h @@ -50,13 +50,13 @@ class WaterlilyBlock : public ::BushBlock { // vIndex: 86, symbol: ?mayPlaceOn@WaterlilyBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 121, symbol: ?getColor@WaterlilyBlock@@UEBAHAEBVBlock@@@Z + // vIndex: 120, symbol: ?getColor@WaterlilyBlock@@UEBAHAEBVBlock@@@Z virtual int getColor(class Block const& block) const; - // vIndex: 123, symbol: ?getColorAtPos@WaterlilyBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 122, symbol: ?getColorAtPos@WaterlilyBlock@@UEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getColorAtPos(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 156, symbol: ?canSurvive@WaterlilyBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@WaterlilyBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; // symbol: ??0WaterlilyBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/WebBlock.h b/src/mc/world/level/block/WebBlock.h index 86a4e068b4..1944f390f4 100644 --- a/src/mc/world/level/block/WebBlock.h +++ b/src/mc/world/level/block/WebBlock.h @@ -39,7 +39,7 @@ class WebBlock : public ::BlockLegacy { // vIndex: 55, symbol: ?waterSpreadCausesSpawn@WebBlock@@UEBA_NXZ virtual bool waterSpreadCausesSpawn() const; - // vIndex: 143, symbol: ?_addHardCodedBlockComponents@WebBlock@@UEAAXAEBVExperiments@@@Z + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@WebBlock@@UEAAXAEBVExperiments@@@Z virtual void _addHardCodedBlockComponents(class Experiments const&); // symbol: ??0WebBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/WeepingVinesBlock.h b/src/mc/world/level/block/WeepingVinesBlock.h index 19943129a4..77cb172ffd 100644 --- a/src/mc/world/level/block/WeepingVinesBlock.h +++ b/src/mc/world/level/block/WeepingVinesBlock.h @@ -61,21 +61,18 @@ class WeepingVinesBlock : public ::BlockLegacy { virtual void neighborChanged(class BlockSource& region, class BlockPos const& pos, class BlockPos const& neighborPos) const; - // vIndex: 144, symbol: ?onRemove@WeepingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 142, symbol: ?onRemove@WeepingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onRemove(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 147, symbol: ?onPlace@WeepingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 145, symbol: ?onPlace@WeepingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z virtual void onPlace(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 150, symbol: ?tick@WeepingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z + // vIndex: 147, symbol: ?tick@WeepingVinesBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void tick(class BlockSource& region, class BlockPos const& pos, class Random& random) const; - // vIndex: 156, symbol: ?canSurvive@WeepingVinesBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 153, symbol: ?canSurvive@WeepingVinesBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool canSurvive(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 163, symbol: ?getResourceItem@WeepingVinesBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize& randomize, class Block const&, int) const; - // symbol: ??0WeepingVinesBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI WeepingVinesBlock(std::string const& nameId, int id); diff --git a/src/mc/world/level/block/WeightedPressurePlateBlock.h b/src/mc/world/level/block/WeightedPressurePlateBlock.h index de50d0c3e6..8edac0c48c 100644 --- a/src/mc/world/level/block/WeightedPressurePlateBlock.h +++ b/src/mc/world/level/block/WeightedPressurePlateBlock.h @@ -30,20 +30,20 @@ class WeightedPressurePlateBlock : public ::BasePressurePlateBlock { // vIndex: 0, symbol: __gen_??1WeightedPressurePlateBlock@@UEAA@XZ virtual ~WeightedPressurePlateBlock() = default; - // vIndex: 96, symbol: + // vIndex: 95, symbol: // ?asItemInstance@WeightedPressurePlateBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 168, symbol: ?getTickDelay@WeightedPressurePlateBlock@@UEBAHXZ + // vIndex: 163, symbol: ?getTickDelay@WeightedPressurePlateBlock@@UEBAHXZ virtual int getTickDelay() const; - // vIndex: 169, symbol: ?getSignalStrength@WeightedPressurePlateBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z + // vIndex: 164, symbol: ?getSignalStrength@WeightedPressurePlateBlock@@MEBAHAEAVBlockSource@@AEBVBlockPos@@@Z virtual int getSignalStrength(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 170, symbol: ?getSignalForData@WeightedPressurePlateBlock@@MEBAHH@Z + // vIndex: 165, symbol: ?getSignalForData@WeightedPressurePlateBlock@@MEBAHH@Z virtual int getSignalForData(int data) const; - // vIndex: 171, symbol: ?getRedstoneSignal@WeightedPressurePlateBlock@@MEBAHH@Z + // vIndex: 166, symbol: ?getRedstoneSignal@WeightedPressurePlateBlock@@MEBAHH@Z virtual int getRedstoneSignal(int signal) const; // symbol: diff --git a/src/mc/world/level/block/WitherRoseBlock.h b/src/mc/world/level/block/WitherRoseBlock.h index b02adee655..f4e02948c2 100644 --- a/src/mc/world/level/block/WitherRoseBlock.h +++ b/src/mc/world/level/block/WitherRoseBlock.h @@ -41,21 +41,21 @@ class WitherRoseBlock : public ::FlowerBlock { // vIndex: 86, symbol: ?mayPlaceOn@WitherRoseBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z virtual bool mayPlaceOn(class BlockSource& region, class BlockPos const& pos) const; - // vIndex: 119, symbol: + // vIndex: 118, symbol: // ?buildDescriptionId@WitherRoseBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z virtual std::string buildDescriptionId(class Block const&) const; - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@WitherRoseBlock@@UEBA_NXZ + // vIndex: 119, symbol: ?isAuxValueRelevantForPicking@WitherRoseBlock@@UEBA_NXZ virtual bool isAuxValueRelevantForPicking() const; - // vIndex: 130, symbol: ?canSpawnOn@WitherRoseBlock@@UEBA_NPEAVActor@@@Z + // vIndex: 129, symbol: ?canSpawnOn@WitherRoseBlock@@UEBA_NPEAVActor@@@Z virtual bool canSpawnOn(class Actor* actor) const; - // vIndex: 134, symbol: + // vIndex: 133, symbol: // ?animateTickBedrockLegacy@WitherRoseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z virtual void animateTickBedrockLegacy(class BlockSource&, class BlockPos const&, class Random&) const; - // vIndex: 167, symbol: ?entityInside@WitherRoseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z + // vIndex: 162, symbol: ?entityInside@WitherRoseBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@@Z virtual void entityInside(class BlockSource& region, class BlockPos const&, class Actor& entity) const; // symbol: ??0WitherRoseBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z diff --git a/src/mc/world/level/block/WoodBlock.h b/src/mc/world/level/block/WoodBlock.h deleted file mode 100644 index adbadf9bef..0000000000 --- a/src/mc/world/level/block/WoodBlock.h +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/RotatedPillarBlock.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class WoodBlock : public ::RotatedPillarBlock { -public: - // prevent constructor by default - WoodBlock& operator=(WoodBlock const&); - WoodBlock(WoodBlock const&); - WoodBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1WoodBlock@@UEAA@XZ - virtual ~WoodBlock() = default; - - // vIndex: 21, symbol: ?isStrippable@WoodBlock@@UEBA_NAEBVBlock@@@Z - virtual bool isStrippable(class Block const& srcBlock) const; - - // vIndex: 22, symbol: ?getStrippedBlock@WoodBlock@@UEBAAEBVBlock@@AEBV2@@Z - virtual class Block const& getStrippedBlock(class Block const& srcBlock) const; - - // vIndex: 96, symbol: ?asItemInstance@WoodBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z - virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - - // vIndex: 119, symbol: - // ?buildDescriptionId@WoodBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z - virtual std::string buildDescriptionId(class Block const&) const; - - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@WoodBlock@@UEBA_NXZ - virtual bool isAuxValueRelevantForPicking() const; - - // vIndex: 129, symbol: ?getVariant@WoodBlock@@UEBAHAEBVBlock@@@Z - virtual int getVariant(class Block const& block) const; - - // vIndex: 154, symbol: ?use@WoodBlock@@UEBA_NAEAVPlayer@@AEBVBlockPos@@E@Z - virtual bool use(class Player& player, class BlockPos const& pos, uchar) const; - - // vIndex: 162, symbol: ?getMapColor@WoodBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z - virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - - // symbol: ??0WoodBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z - MCAPI WoodBlock(std::string const& nameId, int id); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/WoodSlabBlock.h b/src/mc/world/level/block/WoodSlabBlock.h deleted file mode 100644 index 03e4825dcd..0000000000 --- a/src/mc/world/level/block/WoodSlabBlock.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/common/wrapper/WeakPtr.h" -#include "mc/common/wrapper/optional_ref.h" -#include "mc/enums/FertilizerType.h" -#include "mc/enums/Flip.h" -#include "mc/enums/ShapeType.h" -#include "mc/world/Direction.h" -#include "mc/world/level/block/SlabBlock.h" -#include "mc/world/level/block/utils/BlockProperty.h" -#include "mc/world/level/block/utils/BlockRenderLayer.h" -#include "mc/world/level/block/utils/BlockSupportType.h" - -// auto generated forward declare list -// clang-format off -namespace mce { class Color; } -// clang-format on - -class WoodSlabBlock : public ::SlabBlock { -public: - // prevent constructor by default - WoodSlabBlock& operator=(WoodSlabBlock const&); - WoodSlabBlock(WoodSlabBlock const&); - WoodSlabBlock(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1WoodSlabBlock@@UEAA@XZ - virtual ~WoodSlabBlock() = default; - - // vIndex: 49, symbol: ?isValidAuxValue@WoodSlabBlock@@UEBA_NH@Z - virtual bool isValidAuxValue(int auxValue) const; - - // vIndex: 96, symbol: ?asItemInstance@WoodSlabBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z - virtual class ItemInstance asItemInstance(class Block const& block, class BlockActor const*) const; - - // vIndex: 119, symbol: - // ?buildDescriptionId@WoodSlabBlock@@UEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVBlock@@@Z - virtual std::string buildDescriptionId(class Block const&) const; - - // vIndex: 120, symbol: ?isAuxValueRelevantForPicking@WoodSlabBlock@@UEBA_NXZ - virtual bool isAuxValueRelevantForPicking() const; - - // vIndex: 129, symbol: ?getVariant@WoodSlabBlock@@UEBAHAEBVBlock@@@Z - virtual int getVariant(class Block const& block) const; - - // vIndex: 162, symbol: ?getMapColor@WoodSlabBlock@@UEBA?AVColor@mce@@AEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z - virtual class mce::Color getMapColor(class BlockSource&, class BlockPos const&, class Block const& block) const; - - // vIndex: 163, symbol: ?getResourceItem@WoodSlabBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - virtual class ItemInstance getResourceItem(class Randomize&, class Block const& block, int) const; - - // vIndex: 165, symbol: ?getSilkTouchItemInstance@WoodSlabBlock@@UEBA?AVItemInstance@@AEBVBlock@@@Z - virtual class ItemInstance getSilkTouchItemInstance(class Block const& block) const; - - // symbol: - // ??0WoodSlabBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H_NV?$WeakPtr@VBlockLegacy@@@@@Z - MCAPI WoodSlabBlock(std::string const& nameId, int id, bool fullSize, class WeakPtr baseSlab); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/actor/JukeboxBlockActor.h b/src/mc/world/level/block/actor/JukeboxBlockActor.h index e2f6f31b72..a9bfe5a0f9 100644 --- a/src/mc/world/level/block/actor/JukeboxBlockActor.h +++ b/src/mc/world/level/block/actor/JukeboxBlockActor.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/events/LevelSoundEvent.h" #include "mc/world/level/block/actor/RandomizableBlockActorContainer.h" class JukeboxBlockActor : public ::RandomizableBlockActorContainer { @@ -89,6 +90,9 @@ class JukeboxBlockActor : public ::RandomizableBlockActorContainer { // private: // NOLINTBEGIN + // symbol: ?_onChanged@JukeboxBlockActor@@AEAAXAEAVBlockSource@@W4LevelSoundEvent@Legacy@Puv@@@Z + MCAPI void _onChanged(class BlockSource&, ::Puv::Legacy::LevelSoundEvent); + // symbol: ?_spawnMusicParticles@JukeboxBlockActor@@AEAAXAEAVLevel@@M@Z MCAPI void _spawnMusicParticles(class Level& level, float); diff --git a/src/mc/world/level/block/actor/MovingBlock.h b/src/mc/world/level/block/actor/MovingBlock.h index 57ec2ab4e5..76109d81a4 100644 --- a/src/mc/world/level/block/actor/MovingBlock.h +++ b/src/mc/world/level/block/actor/MovingBlock.h @@ -15,6 +15,7 @@ // auto generated forward declare list // clang-format off +namespace BlockEvents { struct BlockFallOnEvent; } namespace mce { class Color; } // clang-format on @@ -46,18 +47,20 @@ class MovingBlock : public ::ActorBlock { virtual void updateEntityAfterFallOn(class BlockPos const& pos, struct UpdateEntityAfterFallOnInterface& entity) const; - // vIndex: 96, symbol: ?asItemInstance@MovingBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z + // vIndex: 95, symbol: ?asItemInstance@MovingBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z virtual class ItemInstance asItemInstance(class Block const&, class BlockActor const*) const; - // vIndex: 109, symbol: ?pushesUpFallingBlocks@MovingBlock@@UEBA_NXZ + // vIndex: 108, symbol: ?pushesUpFallingBlocks@MovingBlock@@UEBA_NXZ virtual bool pushesUpFallingBlocks() const; - // vIndex: 148, symbol: ?onFallOn@MovingBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVActor@@M@Z - virtual void - onFallOn(class BlockSource& region, class BlockPos const& pos, class Actor& entity, float fallDistance) const; + // vIndex: 141, symbol: ?_addHardCodedBlockComponents@MovingBlock@@MEAAXAEBVExperiments@@@Z + virtual void _addHardCodedBlockComponents(class Experiments const&); // symbol: ??0MovingBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z MCAPI MovingBlock(std::string const& nameId, int id); + // symbol: ?onFallOn@MovingBlock@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/actor/VaultBlockActor.h b/src/mc/world/level/block/actor/VaultBlockActor.h new file mode 100644 index 0000000000..f526865700 --- /dev/null +++ b/src/mc/world/level/block/actor/VaultBlockActor.h @@ -0,0 +1,228 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" +#include "mc/world/AutomaticID.h" +#include "mc/world/level/block/actor/BlockActor.h" +#include "mc/world/level/block/states/VaultBlockState.h" + +class VaultBlockActor : public ::BlockActor { +public: + // VaultBlockActor inner types declare + // clang-format off + struct VaultSharedData; + class Client; + struct VaultServerData; + class Server; + struct VaultClientData; + struct VaultConfig; + // clang-format on + + // VaultBlockActor inner types define + struct VaultSharedData { + public: + // prevent constructor by default + VaultSharedData& operator=(VaultSharedData const&); + VaultSharedData(VaultSharedData const&); + VaultSharedData(); + + public: + // NOLINTBEGIN + // symbol: ??1VaultSharedData@VaultBlockActor@@QEAA@XZ + MCAPI ~VaultSharedData(); + + // NOLINTEND + }; + + class Client { + public: + // prevent constructor by default + Client& operator=(Client const&); + Client(Client const&); + Client(); + + public: + // NOLINTBEGIN + // symbol: + // ?emitConnectedParticles@Client@VaultBlockActor@@SAXAEAVBlockSource@@VBlockPos@@AEBUVaultSharedData@2@@Z + MCAPI static void + emitConnectedParticles(class BlockSource&, class BlockPos, struct VaultBlockActor::VaultSharedData const&); + + // symbol: ?emitIdleParticles@Client@VaultBlockActor@@SAXAEBVBlockSource@@AEBUVaultSharedData@2@VBlockPos@@@Z + MCAPI static void + emitIdleParticles(class BlockSource const&, struct VaultBlockActor::VaultSharedData const&, class BlockPos); + + // symbol: ?randomPosInsideCage@Client@VaultBlockActor@@SA?AVVec3@@VBlockPos@@AEAVRandom@@@Z + MCAPI static class Vec3 randomPosInsideCage(class BlockPos, class Random&); + + // symbol: ?removeDisplayEntity@Client@VaultBlockActor@@SAXAEAUVaultClientData@2@@Z + MCAPI static void removeDisplayEntity(struct VaultBlockActor::VaultClientData&); + + // NOLINTEND + }; + + struct VaultServerData { + public: + // prevent constructor by default + VaultServerData& operator=(VaultServerData const&); + VaultServerData(VaultServerData const&); + VaultServerData(); + + public: + // NOLINTBEGIN + // symbol: ??1VaultServerData@VaultBlockActor@@QEAA@XZ + MCAPI ~VaultServerData(); + + // NOLINTEND + }; + + class Server { + public: + // prevent constructor by default + Server& operator=(Server const&); + Server(Server const&); + Server(); + + public: + // NOLINTBEGIN + // symbol: + // ?cycleDisplayItemFromLootTable@Server@VaultBlockActor@@SAXAEAVBlockSource@@W4VaultBlockState@@AEBUVaultConfig@2@AEAUVaultSharedData@2@@Z + MCAPI static void + cycleDisplayItemFromLootTable(class BlockSource&, ::VaultBlockState, struct VaultBlockActor::VaultConfig const&, struct VaultBlockActor::VaultSharedData&); + + // symbol: + // ?getRandomDisplayItemFromLootTable@Server@VaultBlockActor@@SA?AVItemStack@@AEAVBlockSource@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCAPI static class ItemStack getRandomDisplayItemFromLootTable(class BlockSource&, std::string const&); + + // symbol: + // ?getRandomLootTableItems@Server@VaultBlockActor@@SA?AV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVLevel@@V?$AutomaticID@VDimension@@H@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@AEAVPlayer@@@Z + MCAPI static std::vector + getRandomLootTableItems(class Level&, DimensionType, std::string const&, class Player&); + + // symbol: + // ?onTransitionBetweenStates@Server@VaultBlockActor@@SAXAEAVBlockSource@@VBlockPos@@AEBUVaultConfig@2@AEAUVaultSharedData@2@W4VaultBlockState@@4@Z + MCAPI static void onTransitionBetweenStates( + class BlockSource&, + class BlockPos, + struct VaultBlockActor::VaultConfig const&, + struct VaultBlockActor::VaultSharedData&, + ::VaultBlockState, + ::VaultBlockState + ); + + // symbol: + // ?setVaultState@Server@VaultBlockActor@@SAXAEAVBlockSource@@VBlockPos@@AEBVBlock@@W4VaultBlockState@@3AEBUVaultConfig@2@AEAUVaultSharedData@2@@Z + MCAPI static void + setVaultState(class BlockSource&, class BlockPos, class Block const&, ::VaultBlockState, ::VaultBlockState, struct VaultBlockActor::VaultConfig const&, struct VaultBlockActor::VaultSharedData&); + + // symbol: + // ?tick@Server@VaultBlockActor@@SAXAEAVBlockSource@@VBlockPos@@AEBUVaultConfig@2@AEAUVaultServerData@2@AEAUVaultSharedData@2@@Z + MCAPI static void + tick(class BlockSource&, class BlockPos, struct VaultBlockActor::VaultConfig const&, struct VaultBlockActor::VaultServerData&, struct VaultBlockActor::VaultSharedData&); + + // symbol: + // ?tickStateAndGetNext@Server@VaultBlockActor@@SA?AW4VaultBlockState@@AEAVBlockSource@@VBlockPos@@AEBUVaultConfig@2@AEAUVaultServerData@2@AEAUVaultSharedData@2@W43@@Z + MCAPI static ::VaultBlockState tickStateAndGetNext( + class BlockSource&, + class BlockPos, + struct VaultBlockActor::VaultConfig const&, + struct VaultBlockActor::VaultServerData&, + struct VaultBlockActor::VaultSharedData&, + ::VaultBlockState + ); + + // symbol: + // ?tryInsertKey@Server@VaultBlockActor@@SAXAEAVBlockSource@@AEAVPlayer@@VBlockPos@@AEBUVaultConfig@2@AEAUVaultSharedData@2@AEAUVaultServerData@2@@Z + MCAPI static void + tryInsertKey(class BlockSource&, class Player&, class BlockPos, struct VaultBlockActor::VaultConfig const&, struct VaultBlockActor::VaultSharedData&, struct VaultBlockActor::VaultServerData&); + + // symbol: + // ?updateConnectedPlayersWithinRange@Server@VaultBlockActor@@SAXAEAVBlockSource@@VBlockPos@@AEBUVaultServerData@2@AEAUVaultSharedData@2@M@Z + MCAPI static void updateConnectedPlayersWithinRange( + class BlockSource&, + class BlockPos, + struct VaultBlockActor::VaultServerData const&, + struct VaultBlockActor::VaultSharedData&, + float + ); + + // NOLINTEND + }; + + struct VaultClientData { + public: + // prevent constructor by default + VaultClientData& operator=(VaultClientData const&); + VaultClientData(VaultClientData const&); + VaultClientData(); + + public: + // NOLINTBEGIN + // symbol: ??1VaultClientData@VaultBlockActor@@QEAA@XZ + MCAPI ~VaultClientData(); + + // NOLINTEND + }; + + struct VaultConfig { + public: + // prevent constructor by default + VaultConfig& operator=(VaultConfig const&); + VaultConfig(VaultConfig const&); + VaultConfig(); + + public: + // NOLINTBEGIN + // symbol: ??1VaultConfig@VaultBlockActor@@QEAA@XZ + MCAPI ~VaultConfig(); + + // NOLINTEND + }; + +public: + // prevent constructor by default + VaultBlockActor& operator=(VaultBlockActor const&); + VaultBlockActor(VaultBlockActor const&); + VaultBlockActor(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: ??1VaultBlockActor@@UEAA@XZ + virtual ~VaultBlockActor(); + + // vIndex: 1, symbol: ?load@VaultBlockActor@@UEAAXAEAVLevel@@AEBVCompoundTag@@AEAVDataLoadHelper@@@Z + virtual void load(class Level&, class CompoundTag const&, class DataLoadHelper&); + + // vIndex: 2, symbol: ?save@VaultBlockActor@@UEBA_NAEAVCompoundTag@@@Z + virtual bool save(class CompoundTag&) const; + + // vIndex: 7, symbol: ?tick@VaultBlockActor@@UEAAXAEAVBlockSource@@@Z + virtual void tick(class BlockSource&); + + // vIndex: 40, symbol: + // ?_getUpdatePacket@VaultBlockActor@@MEAA?AV?$unique_ptr@VBlockActorDataPacket@@U?$default_delete@VBlockActorDataPacket@@@std@@@std@@AEAVBlockSource@@@Z + virtual std::unique_ptr _getUpdatePacket(class BlockSource&); + + // vIndex: 41, symbol: ?_onUpdatePacket@VaultBlockActor@@MEAAXAEBVCompoundTag@@AEAVBlockSource@@@Z + virtual void _onUpdatePacket(class CompoundTag const&, class BlockSource&); + + // symbol: ??0VaultBlockActor@@QEAA@AEBVBlockPos@@@Z + MCAPI explicit VaultBlockActor(class BlockPos const&); + + // symbol: ?tryInsertKey@VaultBlockActor@@QEAAXAEAVBlockSource@@AEAVPlayer@@@Z + MCAPI void tryInsertKey(class BlockSource&, class Player&); + + // NOLINTEND + + // private: + // NOLINTBEGIN + // symbol: ?_getCurrentState@VaultBlockActor@@CA?AW4VaultBlockState@@AEBVBlock@@@Z + MCAPI static ::VaultBlockState _getCurrentState(class Block const&); + + // symbol: ?_javaSpawnItem@VaultBlockActor@@CAXAEAVBlockSource@@AEBVItemStack@@HEVVec3@@@Z + MCAPI static void _javaSpawnItem(class BlockSource&, class ItemStack const&, int, uchar, class Vec3); + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/components/BlockComponentFactory.h b/src/mc/world/level/block/components/BlockComponentFactory.h index f10780f094..51bed7e359 100644 --- a/src/mc/world/level/block/components/BlockComponentFactory.h +++ b/src/mc/world/level/block/components/BlockComponentFactory.h @@ -11,28 +11,30 @@ class BlockComponentFactory { public: // BlockComponentFactory inner types declare // clang-format off - struct Constructor; + struct ComponentMetadata; // clang-format on // BlockComponentFactory inner types define - struct Constructor { + struct ComponentMetadata { public: // prevent constructor by default - Constructor(); + ComponentMetadata(); public: // NOLINTBEGIN - // symbol: ??0Constructor@BlockComponentFactory@@QEAA@AEBU01@@Z - MCAPI Constructor(struct BlockComponentFactory::Constructor const&); + // symbol: ??0ComponentMetadata@BlockComponentFactory@@QEAA@AEBU01@@Z + MCAPI ComponentMetadata(struct BlockComponentFactory::ComponentMetadata const&); - // symbol: ??4Constructor@BlockComponentFactory@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct BlockComponentFactory::Constructor& operator=(struct BlockComponentFactory::Constructor&&); + // symbol: ??4ComponentMetadata@BlockComponentFactory@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct BlockComponentFactory::ComponentMetadata& + operator=(struct BlockComponentFactory::ComponentMetadata&&); - // symbol: ??4Constructor@BlockComponentFactory@@QEAAAEAU01@AEBU01@@Z - MCAPI struct BlockComponentFactory::Constructor& operator=(struct BlockComponentFactory::Constructor const&); + // symbol: ??4ComponentMetadata@BlockComponentFactory@@QEAAAEAU01@AEBU01@@Z + MCAPI struct BlockComponentFactory::ComponentMetadata& + operator=(struct BlockComponentFactory::ComponentMetadata const&); - // symbol: ??1Constructor@BlockComponentFactory@@QEAA@XZ - MCAPI ~Constructor(); + // symbol: ??1ComponentMetadata@BlockComponentFactory@@QEAA@XZ + MCAPI ~ComponentMetadata(); // NOLINTEND }; @@ -52,13 +54,13 @@ class BlockComponentFactory { MCAPI void initializeFactory(class Experiments const&); // symbol: - // ?addAllComponentUpgrades@BlockComponentFactory@@SAXAEAVCerealDocumentUpgrader@@AEAUReflectionCtx@cereal@@@Z - MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader&, struct cereal::ReflectionCtx&); + // ?addAllComponentUpgrades@BlockComponentFactory@@SAXAEAVCerealDocumentUpgrader@@AEBUReflectionCtx@cereal@@@Z + MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader&, struct cereal::ReflectionCtx const&); // symbol: - // ?getPropRegisteredCerealComponents@BlockComponentFactory@@SAAEAV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UConstructor@BlockComponentFactory@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UConstructor@BlockComponentFactory@@@std@@@2@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI static std::unordered_map& - getPropRegisteredCerealComponents(struct cereal::ReflectionCtx&); + // ?getPropRegisteredCerealComponents@BlockComponentFactory@@SAAEAV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UComponentMetadata@BlockComponentFactory@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UComponentMetadata@BlockComponentFactory@@@std@@@2@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI static std::unordered_map& + getPropRegisteredCerealComponents(struct cereal::ReflectionCtx const&); // symbol: ?registerAllCerealDescriptions@BlockComponentFactory@@SAXAEAUReflectionCtx@cereal@@@Z MCAPI static void registerAllCerealDescriptions(struct cereal::ReflectionCtx&); @@ -72,8 +74,8 @@ class BlockComponentFactory { // private: // NOLINTBEGIN - // symbol: ?getEnTTMetaType@BlockComponentFactory@@CA?AVmeta_type@entt@@AEAUReflectionCtx@cereal@@@Z - MCAPI static entt::meta_type getEnTTMetaType(struct cereal::ReflectionCtx&); + // symbol: ?initEnTTMetaType@BlockComponentFactory@@CA?AVmeta_type@entt@@AEAUReflectionCtx@cereal@@@Z + MCAPI static entt::meta_type initEnTTMetaType(struct cereal::ReflectionCtx&); // NOLINTEND }; diff --git a/src/mc/world/level/block/components/BlockCraftingTableComponent.h b/src/mc/world/level/block/components/BlockCraftingTableComponent.h index 8a3c8e5826..cb2d315305 100644 --- a/src/mc/world/level/block/components/BlockCraftingTableComponent.h +++ b/src/mc/world/level/block/components/BlockCraftingTableComponent.h @@ -17,24 +17,5 @@ struct BlockCraftingTableComponent : public ::BlockComponentBase { // vIndex: 0, symbol: __gen_??1BlockCraftingTableComponent@@UEAA@XZ virtual ~BlockCraftingTableComponent() = default; - // vIndex: 1, symbol: __unk_vfn_1 - virtual void __unk_vfn_1(); - - // vIndex: 2, symbol: __unk_vfn_2 - virtual void __unk_vfn_2(); - - // vIndex: 3, symbol: __unk_vfn_3 - virtual void __unk_vfn_3(); - - // vIndex: 4, symbol: __unk_vfn_4 - virtual void __unk_vfn_4(); - - // vIndex: 5, symbol: __unk_vfn_5 - virtual void __unk_vfn_5(); - - // vIndex: 6, symbol: - // ?getLootTable@BlockLootComponent@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - MCAPI std::string const& getLootTable() const; - // NOLINTEND }; diff --git a/src/mc/world/level/block/components/BlockGeometryDescription.h b/src/mc/world/level/block/components/BlockGeometryDescription.h index 63d7b58127..61110b9992 100644 --- a/src/mc/world/level/block/components/BlockGeometryDescription.h +++ b/src/mc/world/level/block/components/BlockGeometryDescription.h @@ -64,8 +64,8 @@ struct BlockGeometryDescription { // symbol: ??0BlockGeometryDescription@@QEAA@XZ MCAPI BlockGeometryDescription(); - // symbol: ??0BlockGeometryDescription@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - MCAPI explicit BlockGeometryDescription(std::string const& geometryName); + // symbol: ??0BlockGeometryDescription@@QEAA@AEBVHashedString@@@Z + MCAPI explicit BlockGeometryDescription(class HashedString const&); // symbol: ?bindType@BlockGeometryDescription@@SAXAEAUReflectionCtx@cereal@@@Z MCAPI static void bindType(struct cereal::ReflectionCtx&); @@ -73,13 +73,11 @@ struct BlockGeometryDescription { // symbol: ?registerVersionUpgrades@BlockGeometryDescription@@SAXAEAVCerealSchemaUpgradeSet@@@Z MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet&); - // symbol: - // ?CROSS_GEO_NAME@BlockGeometryDescription@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B - MCAPI static std::string const CROSS_GEO_NAME; + // symbol: ?CROSS_GEO_NAME@BlockGeometryDescription@@2VHashedString@@B + MCAPI static class HashedString const CROSS_GEO_NAME; - // symbol: - // ?FULL_BLOCK_GEO_NAME@BlockGeometryDescription@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B - MCAPI static std::string const FULL_BLOCK_GEO_NAME; + // symbol: ?FULL_BLOCK_GEO_NAME@BlockGeometryDescription@@2VHashedString@@B + MCAPI static class HashedString const FULL_BLOCK_GEO_NAME; // symbol: // ?GEO_NAME_CONSTRAINT@BlockGeometryDescription@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B diff --git a/src/mc/world/level/block/components/BlockMaterialInstancesDescription.h b/src/mc/world/level/block/components/BlockMaterialInstancesDescription.h index d13f7042f9..d19a4b9085 100644 --- a/src/mc/world/level/block/components/BlockMaterialInstancesDescription.h +++ b/src/mc/world/level/block/components/BlockMaterialInstancesDescription.h @@ -48,6 +48,9 @@ struct BlockMaterialInstancesDescription : public ::BlockComponentDescription { // symbol: ??0BlockMaterialInstancesDescription@@QEAA@XZ MCAPI BlockMaterialInstancesDescription(); + // symbol: ??0BlockMaterialInstancesDescription@@QEAA@$$QEAU0@@Z + MCAPI BlockMaterialInstancesDescription(struct BlockMaterialInstancesDescription&&); + // symbol: ??0BlockMaterialInstancesDescription@@QEAA@AEBU0@@Z MCAPI BlockMaterialInstancesDescription(struct BlockMaterialInstancesDescription const&); diff --git a/src/mc/world/level/block/components/BlockQueuedTickingComponent.h b/src/mc/world/level/block/components/BlockQueuedTickingComponent.h index e613322a19..64778333ab 100644 --- a/src/mc/world/level/block/components/BlockQueuedTickingComponent.h +++ b/src/mc/world/level/block/components/BlockQueuedTickingComponent.h @@ -5,6 +5,12 @@ // auto generated inclusion list #include "mc/world/level/block/utils/BlockComponentBase.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockQueuedTickEventComponent; } +namespace BlockEvents { struct BlockQueuedTickEvent; } +// clang-format on + struct BlockQueuedTickingComponent : public ::BlockComponentBase { public: // prevent constructor by default @@ -17,5 +23,12 @@ struct BlockQueuedTickingComponent : public ::BlockComponentBase { // vIndex: 0, symbol: __gen_??1BlockQueuedTickingComponent@@UEAA@XZ virtual ~BlockQueuedTickingComponent() = default; + // symbol: + // ?finalize@BlockQueuedTickingComponent@@QEAAXV?$not_null@PEAVBlockQueuedTickEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onTick@BlockQueuedTickingComponent@@QEBAXAEBUBlockQueuedTickEvent@BlockEvents@@@Z + MCAPI void onTick(struct BlockEvents::BlockQueuedTickEvent const&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/BlockRandomTickingComponent.h b/src/mc/world/level/block/components/BlockRandomTickingComponent.h index 2580542559..980aee6f87 100644 --- a/src/mc/world/level/block/components/BlockRandomTickingComponent.h +++ b/src/mc/world/level/block/components/BlockRandomTickingComponent.h @@ -5,6 +5,12 @@ // auto generated inclusion list #include "mc/world/level/block/utils/BlockComponentBase.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockRandomTickEventComponent; } +namespace BlockEvents { struct BlockRandomTickEvent; } +// clang-format on + struct BlockRandomTickingComponent : public ::BlockComponentBase { public: // prevent constructor by default @@ -17,5 +23,12 @@ struct BlockRandomTickingComponent : public ::BlockComponentBase { // vIndex: 0, symbol: __gen_??1BlockRandomTickingComponent@@UEAA@XZ virtual ~BlockRandomTickingComponent() = default; + // symbol: + // ?finalize@BlockRandomTickingComponent@@QEAAXV?$not_null@PEAVBlockRandomTickEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onTick@BlockRandomTickingComponent@@QEBAXAEBUBlockRandomTickEvent@BlockEvents@@@Z + MCAPI void onTick(struct BlockEvents::BlockRandomTickEvent const&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/BlockRandomTickingDescription.h b/src/mc/world/level/block/components/BlockRandomTickingDescription.h index f9dd2e4665..29c6dad94b 100644 --- a/src/mc/world/level/block/components/BlockRandomTickingDescription.h +++ b/src/mc/world/level/block/components/BlockRandomTickingDescription.h @@ -17,7 +17,6 @@ struct BlockRandomTickingDescription : public ::BlockComponentDescription { // prevent constructor by default BlockRandomTickingDescription& operator=(BlockRandomTickingDescription const&); BlockRandomTickingDescription(BlockRandomTickingDescription const&); - BlockRandomTickingDescription(); public: // NOLINTBEGIN @@ -31,6 +30,9 @@ struct BlockRandomTickingDescription : public ::BlockComponentDescription { // vIndex: 3, symbol: ?initializeComponent@BlockRandomTickingDescription@@UEBAXAEAVBlockComponentStorage@@@Z virtual void initializeComponent(class BlockComponentStorage&) const; + // symbol: ??0BlockRandomTickingDescription@@QEAA@XZ + MCAPI BlockRandomTickingDescription(); + // symbol: ?bindType@BlockRandomTickingDescription@@SAXAEAUReflectionCtx@cereal@@@Z MCAPI static void bindType(struct cereal::ReflectionCtx&); diff --git a/src/mc/world/level/block/components/collisionbox/BlockCollisionBoxComponentDescriptor.h b/src/mc/world/level/block/components/collisionbox/BlockCollisionBoxComponentDescriptor.h new file mode 100644 index 0000000000..8a14cbe303 --- /dev/null +++ b/src/mc/world/level/block/components/collisionbox/BlockCollisionBoxComponentDescriptor.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockCollisionBoxComponentDescriptor {}; diff --git a/src/mc/world/level/block/components/collisionbox/Proxy.h b/src/mc/world/level/block/components/collisionbox/Proxy.h new file mode 100644 index 0000000000..51ce0eb864 --- /dev/null +++ b/src/mc/world/level/block/components/collisionbox/Proxy.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockCollisionBoxComponentDescriptor { + +struct Proxy { +public: + // prevent constructor by default + Proxy& operator=(Proxy const&); + Proxy(Proxy const&); + Proxy(); +}; + +}; // namespace BlockCollisionBoxComponentDescriptor diff --git a/src/mc/world/level/block/components/queuedticking/BlockQueuedTickingComponentDescriptor.h b/src/mc/world/level/block/components/queuedticking/BlockQueuedTickingComponentDescriptor.h new file mode 100644 index 0000000000..70b57399f0 --- /dev/null +++ b/src/mc/world/level/block/components/queuedticking/BlockQueuedTickingComponentDescriptor.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockQueuedTickingComponentDescriptor {}; diff --git a/src/mc/world/level/block/components/queuedticking/Proxy.h b/src/mc/world/level/block/components/queuedticking/Proxy.h new file mode 100644 index 0000000000..6d27a10fbb --- /dev/null +++ b/src/mc/world/level/block/components/queuedticking/Proxy.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockQueuedTickingComponentDescriptor { + +struct Proxy { +public: + // prevent constructor by default + Proxy& operator=(Proxy const&); + Proxy(Proxy const&); + Proxy(); +}; + +}; // namespace BlockQueuedTickingComponentDescriptor diff --git a/src/mc/world/level/block/components/selectionbox/BlockSelectionBoxComponentDescriptor.h b/src/mc/world/level/block/components/selectionbox/BlockSelectionBoxComponentDescriptor.h new file mode 100644 index 0000000000..22aab39565 --- /dev/null +++ b/src/mc/world/level/block/components/selectionbox/BlockSelectionBoxComponentDescriptor.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockSelectionBoxComponentDescriptor {}; diff --git a/src/mc/world/level/block/components/selectionbox/Proxy.h b/src/mc/world/level/block/components/selectionbox/Proxy.h new file mode 100644 index 0000000000..592b7c21aa --- /dev/null +++ b/src/mc/world/level/block/components/selectionbox/Proxy.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockSelectionBoxComponentDescriptor { + +struct Proxy { +public: + // prevent constructor by default + Proxy& operator=(Proxy const&); + Proxy(Proxy const&); + Proxy(); +}; + +}; // namespace BlockSelectionBoxComponentDescriptor diff --git a/src/mc/world/level/block/components/triggers/OnFallOnTrigger.h b/src/mc/world/level/block/components/triggers/OnFallOnTrigger.h index 5aa2467951..9fb41a8190 100644 --- a/src/mc/world/level/block/components/triggers/OnFallOnTrigger.h +++ b/src/mc/world/level/block/components/triggers/OnFallOnTrigger.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockFallOnEventComponent; } +namespace BlockEvents { struct BlockFallOnEvent; } +// clang-format on + class OnFallOnTrigger { public: // prevent constructor by default @@ -14,5 +20,11 @@ class OnFallOnTrigger { // vIndex: 0, symbol: __gen_??1OnFallOnTrigger@@UEAA@XZ virtual ~OnFallOnTrigger() = default; + // symbol: ?finalize@OnFallOnTrigger@@QEAAXV?$not_null@PEAVBlockFallOnEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onFallOn@OnFallOnTrigger@@QEBAXAEAUBlockFallOnEvent@BlockEvents@@@Z + MCAPI void onFallOn(struct BlockEvents::BlockFallOnEvent&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/triggers/OnInteractTrigger.h b/src/mc/world/level/block/components/triggers/OnInteractTrigger.h index 89387c1661..efc00d314f 100644 --- a/src/mc/world/level/block/components/triggers/OnInteractTrigger.h +++ b/src/mc/world/level/block/components/triggers/OnInteractTrigger.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockPlayerInteractEventComponent; } +namespace BlockEvents { struct BlockPlayerInteractEvent; } +// clang-format on + class OnInteractTrigger { public: // prevent constructor by default @@ -14,5 +20,11 @@ class OnInteractTrigger { // vIndex: 0, symbol: __gen_??1OnInteractTrigger@@UEAA@XZ virtual ~OnInteractTrigger() = default; + // symbol: ?finalize@OnInteractTrigger@@QEAAXV?$not_null@PEAVBlockPlayerInteractEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onInteract@OnInteractTrigger@@QEBAXAEAUBlockPlayerInteractEvent@BlockEvents@@@Z + MCAPI void onInteract(struct BlockEvents::BlockPlayerInteractEvent&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/triggers/OnInteractTriggerDescription.h b/src/mc/world/level/block/components/triggers/OnInteractTriggerDescription.h index e9590e5260..b24208527b 100644 --- a/src/mc/world/level/block/components/triggers/OnInteractTriggerDescription.h +++ b/src/mc/world/level/block/components/triggers/OnInteractTriggerDescription.h @@ -49,15 +49,15 @@ class OnInteractTriggerDescription { class BlockComponentFactory const& factory ) const; - // vIndex: 7, symbol: ?isNetworkComponent@OnInteractTriggerDescription@@UEBA_NXZ + // vIndex: 7, symbol: ?isNetworkComponent@BlockComponentDescription@@UEBA_NXZ virtual bool isNetworkComponent() const; // vIndex: 8, symbol: - // ?buildNetworkTag@OnInteractTriggerDescription@@UEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z + // ?buildNetworkTag@BlockComponentDescription@@UEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z virtual std::unique_ptr buildNetworkTag(struct cereal::ReflectionCtx const&) const; // vIndex: 9, symbol: - // ?initializeFromNetwork@OnInteractTriggerDescription@@UEAAXAEBVCompoundTag@@AEBUReflectionCtx@cereal@@@Z + // ?initializeFromNetwork@BlockComponentDescription@@UEAAXAEBVCompoundTag@@AEBUReflectionCtx@cereal@@@Z virtual void initializeFromNetwork(class CompoundTag const&, struct cereal::ReflectionCtx const&); // vIndex: 10, symbol: ?handleVersionBasedInitialization@BlockComponentDescription@@UEAAXAEBVSemVersion@@@Z diff --git a/src/mc/world/level/block/components/triggers/OnPlacedTrigger.h b/src/mc/world/level/block/components/triggers/OnPlacedTrigger.h index 400d6e98b4..506b964c86 100644 --- a/src/mc/world/level/block/components/triggers/OnPlacedTrigger.h +++ b/src/mc/world/level/block/components/triggers/OnPlacedTrigger.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockPlaceEventComponent; } +namespace BlockEvents { struct BlockPlaceEvent; } +// clang-format on + class OnPlacedTrigger { public: // prevent constructor by default @@ -14,5 +20,11 @@ class OnPlacedTrigger { // vIndex: 0, symbol: __gen_??1OnPlacedTrigger@@UEAA@XZ virtual ~OnPlacedTrigger() = default; + // symbol: ?finalize@OnPlacedTrigger@@QEAAXV?$not_null@PEAVBlockPlaceEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onPlace@OnPlacedTrigger@@QEBAXAEBUBlockPlaceEvent@BlockEvents@@@Z + MCAPI void onPlace(struct BlockEvents::BlockPlaceEvent const&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/triggers/OnPlayerDestroyedTrigger.h b/src/mc/world/level/block/components/triggers/OnPlayerDestroyedTrigger.h index 74adf36499..5aca4d6fc7 100644 --- a/src/mc/world/level/block/components/triggers/OnPlayerDestroyedTrigger.h +++ b/src/mc/world/level/block/components/triggers/OnPlayerDestroyedTrigger.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockPlayerDestroyEventComponent; } +namespace BlockEvents { struct BlockPlayerDestroyEvent; } +// clang-format on + class OnPlayerDestroyedTrigger { public: // prevent constructor by default @@ -14,5 +20,12 @@ class OnPlayerDestroyedTrigger { // vIndex: 0, symbol: __gen_??1OnPlayerDestroyedTrigger@@UEAA@XZ virtual ~OnPlayerDestroyedTrigger() = default; + // symbol: + // ?finalize@OnPlayerDestroyedTrigger@@QEAAXV?$not_null@PEAVBlockPlayerDestroyEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onPlayerDestroy@OnPlayerDestroyedTrigger@@QEBAXAEBUBlockPlayerDestroyEvent@BlockEvents@@@Z + MCAPI void onPlayerDestroy(struct BlockEvents::BlockPlayerDestroyEvent const&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/triggers/OnPlayerPlacingTrigger.h b/src/mc/world/level/block/components/triggers/OnPlayerPlacingTrigger.h index 4dbbb56da1..4017088d7a 100644 --- a/src/mc/world/level/block/components/triggers/OnPlayerPlacingTrigger.h +++ b/src/mc/world/level/block/components/triggers/OnPlayerPlacingTrigger.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockPlayerPlacingEventComponent; } +namespace BlockEvents { struct BlockPlayerPlacingEvent; } +// clang-format on + class OnPlayerPlacingTrigger { public: // prevent constructor by default @@ -14,5 +20,12 @@ class OnPlayerPlacingTrigger { // vIndex: 0, symbol: __gen_??1OnPlayerPlacingTrigger@@UEAA@XZ virtual ~OnPlayerPlacingTrigger() = default; + // symbol: + // ?finalize@OnPlayerPlacingTrigger@@QEAAXV?$not_null@PEAVBlockPlayerPlacingEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onPlayerPlacing@OnPlayerPlacingTrigger@@QEBAXAEAUBlockPlayerPlacingEvent@BlockEvents@@@Z + MCAPI void onPlayerPlacing(struct BlockEvents::BlockPlayerPlacingEvent&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/triggers/OnPlayerPlacingTriggerDescription.h b/src/mc/world/level/block/components/triggers/OnPlayerPlacingTriggerDescription.h index dc259853a3..456f26353f 100644 --- a/src/mc/world/level/block/components/triggers/OnPlayerPlacingTriggerDescription.h +++ b/src/mc/world/level/block/components/triggers/OnPlayerPlacingTriggerDescription.h @@ -49,15 +49,15 @@ class OnPlayerPlacingTriggerDescription { class BlockComponentFactory const& factory ) const; - // vIndex: 7, symbol: ?isNetworkComponent@OnPlayerPlacingTriggerDescription@@UEBA_NXZ + // vIndex: 7, symbol: ?isNetworkComponent@BlockComponentDescription@@UEBA_NXZ virtual bool isNetworkComponent() const; // vIndex: 8, symbol: - // ?buildNetworkTag@OnPlayerPlacingTriggerDescription@@UEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z + // ?buildNetworkTag@BlockComponentDescription@@UEBA?AV?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@AEBUReflectionCtx@cereal@@@Z virtual std::unique_ptr buildNetworkTag(struct cereal::ReflectionCtx const&) const; // vIndex: 9, symbol: - // ?initializeFromNetwork@OnPlayerPlacingTriggerDescription@@UEAAXAEBVCompoundTag@@AEBUReflectionCtx@cereal@@@Z + // ?initializeFromNetwork@BlockComponentDescription@@UEAAXAEBVCompoundTag@@AEBUReflectionCtx@cereal@@@Z virtual void initializeFromNetwork(class CompoundTag const&, struct cereal::ReflectionCtx const&); // vIndex: 10, symbol: ?handleVersionBasedInitialization@BlockComponentDescription@@UEAAXAEBVSemVersion@@@Z diff --git a/src/mc/world/level/block/components/triggers/OnStepOffTrigger.h b/src/mc/world/level/block/components/triggers/OnStepOffTrigger.h index 4ebe8adc4b..8fbcc3ca4c 100644 --- a/src/mc/world/level/block/components/triggers/OnStepOffTrigger.h +++ b/src/mc/world/level/block/components/triggers/OnStepOffTrigger.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockStepOffEventComponent; } +namespace BlockEvents { struct BlockStepOffEvent; } +// clang-format on + class OnStepOffTrigger { public: // prevent constructor by default @@ -14,5 +20,11 @@ class OnStepOffTrigger { // vIndex: 0, symbol: __gen_??1OnStepOffTrigger@@UEAA@XZ virtual ~OnStepOffTrigger() = default; + // symbol: ?finalize@OnStepOffTrigger@@QEAAXV?$not_null@PEAVBlockStepOffEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onStepOff@OnStepOffTrigger@@QEBAXAEBUBlockStepOffEvent@BlockEvents@@@Z + MCAPI void onStepOff(struct BlockEvents::BlockStepOffEvent const&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/components/triggers/OnStepOnTrigger.h b/src/mc/world/level/block/components/triggers/OnStepOnTrigger.h index f9a3dd516f..6a44d3ab01 100644 --- a/src/mc/world/level/block/components/triggers/OnStepOnTrigger.h +++ b/src/mc/world/level/block/components/triggers/OnStepOnTrigger.h @@ -2,6 +2,12 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated forward declare list +// clang-format off +namespace BlockEvents { class BlockStepOnEventComponent; } +namespace BlockEvents { struct BlockStepOnEvent; } +// clang-format on + class OnStepOnTrigger { public: // prevent constructor by default @@ -14,5 +20,11 @@ class OnStepOnTrigger { // vIndex: 0, symbol: __gen_??1OnStepOnTrigger@@UEAA@XZ virtual ~OnStepOnTrigger() = default; + // symbol: ?finalize@OnStepOnTrigger@@QEAAXV?$not_null@PEAVBlockStepOnEventComponent@BlockEvents@@@gsl@@@Z + MCAPI void finalize(gsl::not_null); + + // symbol: ?onStepOn@OnStepOnTrigger@@QEBAXAEBUBlockStepOnEvent@BlockEvents@@@Z + MCAPI void onStepOn(struct BlockEvents::BlockStepOnEvent const&) const; + // NOLINTEND }; diff --git a/src/mc/world/level/block/definition/BlockComponentGroupDescription.h b/src/mc/world/level/block/definition/BlockComponentGroupDescription.h index ccd391ea44..ede139d286 100644 --- a/src/mc/world/level/block/definition/BlockComponentGroupDescription.h +++ b/src/mc/world/level/block/definition/BlockComponentGroupDescription.h @@ -3,6 +3,36 @@ #include "mc/_HeaderOutputPredefine.h" struct BlockComponentGroupDescription { +public: + // BlockComponentGroupDescription inner types declare + // clang-format off + struct Components; + // clang-format on + + // BlockComponentGroupDescription inner types define + struct Components { + public: + // NOLINTBEGIN + // symbol: ??0Components@BlockComponentGroupDescription@@QEAA@XZ + MCAPI Components(); + + // symbol: ??0Components@BlockComponentGroupDescription@@QEAA@AEBU01@@Z + MCAPI Components(struct BlockComponentGroupDescription::Components const&); + + // symbol: ??4Components@BlockComponentGroupDescription@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct BlockComponentGroupDescription::Components& + operator=(struct BlockComponentGroupDescription::Components&&); + + // symbol: ??4Components@BlockComponentGroupDescription@@QEAAAEAU01@AEBU01@@Z + MCAPI struct BlockComponentGroupDescription::Components& + operator=(struct BlockComponentGroupDescription::Components const&); + + // symbol: ??1Components@BlockComponentGroupDescription@@QEAA@XZ + MCAPI ~Components(); + + // NOLINTEND + }; + public: // NOLINTBEGIN // symbol: ??0BlockComponentGroupDescription@@QEAA@XZ diff --git a/src/mc/world/level/block/definition/BlockDefinition.h b/src/mc/world/level/block/definition/BlockDefinition.h index ed0951c022..e7c72fc10d 100644 --- a/src/mc/world/level/block/definition/BlockDefinition.h +++ b/src/mc/world/level/block/definition/BlockDefinition.h @@ -34,20 +34,19 @@ struct BlockDefinition { MCAPI static void registerBlockDefinitionTypes(struct cereal::ReflectionCtx&); // symbol: - // ?upgradeJson@BlockDefinition@@SA?AU?$pair@_NVSemVersion@@@std@@AEAUReflectionCtx@cereal@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBVPath@Core@@V?$optional@VSemVersion@@@3@@Z + // ?upgradeJson@BlockDefinition@@SA?AU?$pair@_NVSemVersion@@@std@@AEBUReflectionCtx@cereal@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBVPath@Core@@V?$optional@VSemVersion@@@3@@Z MCAPI static std::pair - upgradeJson(struct cereal::ReflectionCtx&, std::string&, class Core::Path const&, std::optional); + upgradeJson(struct cereal::ReflectionCtx const&, std::string&, class Core::Path const&, std::optional); // NOLINTEND // private: // NOLINTBEGIN - // symbol: ?getEnTTMetaType@BlockDefinition@@CA?AVmeta_type@entt@@AEAUReflectionCtx@cereal@@@Z - MCAPI static entt::meta_type getEnTTMetaType(struct cereal::ReflectionCtx&); + // symbol: ?getCerealDocumentUpgrader@BlockDefinition@@CAPEAVCerealDocumentUpgrader@@AEBUReflectionCtx@cereal@@@Z + MCAPI static class CerealDocumentUpgrader* getCerealDocumentUpgrader(struct cereal::ReflectionCtx const&); - // symbol: - // ?getPropCerealDocumentUpgrader@BlockDefinition@@CAAEAVCerealDocumentUpgrader@@AEAUReflectionCtx@cereal@@@Z - MCAPI static class CerealDocumentUpgrader& getPropCerealDocumentUpgrader(struct cereal::ReflectionCtx&); + // symbol: ?initCerealDocumentUpgrader@BlockDefinition@@CAAEAVCerealDocumentUpgrader@@AEAUReflectionCtx@cereal@@@Z + MCAPI static class CerealDocumentUpgrader& initCerealDocumentUpgrader(struct cereal::ReflectionCtx&); // NOLINTEND }; diff --git a/src/mc/world/level/block/definition/BlockDefinitionGroup.h b/src/mc/world/level/block/definition/BlockDefinitionGroup.h index 039fd2412c..a44b2ed76f 100644 --- a/src/mc/world/level/block/definition/BlockDefinitionGroup.h +++ b/src/mc/world/level/block/definition/BlockDefinitionGroup.h @@ -45,8 +45,8 @@ class BlockDefinitionGroup { public: // NOLINTBEGIN - // symbol: ??0BlockDefinitionGroup@@QEAA@AEAUReflectionCtx@cereal@@@Z - MCAPI explicit BlockDefinitionGroup(struct cereal::ReflectionCtx&); + // symbol: ??0BlockDefinitionGroup@@QEAA@AEBUReflectionCtx@cereal@@@Z + MCAPI explicit BlockDefinitionGroup(struct cereal::ReflectionCtx const&); // symbol: ?buildBlockSchema@BlockDefinitionGroup@@QEAAXAEBVBlockComponentFactory@@@Z MCAPI void buildBlockSchema(class BlockComponentFactory const& factory); diff --git a/src/mc/world/level/block/definition/BlockDescription.h b/src/mc/world/level/block/definition/BlockDescription.h index b455ea2285..a06e8fe1aa 100644 --- a/src/mc/world/level/block/definition/BlockDescription.h +++ b/src/mc/world/level/block/definition/BlockDescription.h @@ -3,6 +3,32 @@ #include "mc/_HeaderOutputPredefine.h" struct BlockDescription { +public: + // BlockDescription inner types declare + // clang-format off + struct BlockTraits; + // clang-format on + + // BlockDescription inner types define + struct BlockTraits { + public: + // prevent constructor by default + BlockTraits(); + + public: + // NOLINTBEGIN + // symbol: ??0BlockTraits@BlockDescription@@QEAA@AEBU01@@Z + MCAPI BlockTraits(struct BlockDescription::BlockTraits const&); + + // symbol: ??4BlockTraits@BlockDescription@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct BlockDescription::BlockTraits& operator=(struct BlockDescription::BlockTraits&&); + + // symbol: ??4BlockTraits@BlockDescription@@QEAAAEAU01@AEBU01@@Z + MCAPI struct BlockDescription::BlockTraits& operator=(struct BlockDescription::BlockTraits const&); + + // NOLINTEND + }; + public: // NOLINTBEGIN // symbol: ??0BlockDescription@@QEAA@XZ diff --git a/src/mc/world/level/block/states/VaultBlockState.h b/src/mc/world/level/block/states/VaultBlockState.h new file mode 100644 index 0000000000..b97a612d8d --- /dev/null +++ b/src/mc/world/level/block/states/VaultBlockState.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +enum class VaultBlockState {}; diff --git a/src/mc/world/level/block/utils/AirBlockCache.h b/src/mc/world/level/block/utils/AirBlockCache.h deleted file mode 100644 index cce9149d7f..0000000000 --- a/src/mc/world/level/block/utils/AirBlockCache.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -class AirBlockCache { -public: - // prevent constructor by default - AirBlockCache& operator=(AirBlockCache const&); - AirBlockCache(AirBlockCache const&); - -public: - // NOLINTBEGIN - // symbol: ??0AirBlockCache@@QEAA@XZ - MCAPI AirBlockCache(); - - // NOLINTEND -}; diff --git a/src/mc/world/level/block/utils/BlockClientPredictionOverrides.h b/src/mc/world/level/block/utils/BlockClientPredictionOverrides.h new file mode 100644 index 0000000000..c9fb0e84ac --- /dev/null +++ b/src/mc/world/level/block/utils/BlockClientPredictionOverrides.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +enum class BlockClientPredictionOverrides {}; diff --git a/src/mc/world/level/block/utils/BlockColorUtil.h b/src/mc/world/level/block/utils/BlockColorUtil.h index 548feaf7fb..da0e4b0d82 100644 --- a/src/mc/world/level/block/utils/BlockColorUtil.h +++ b/src/mc/world/level/block/utils/BlockColorUtil.h @@ -32,10 +32,6 @@ MCAPI std::string const& getName(::BlockColor); // ?getNameMixedCase@BlockColorUtil@@YAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4BlockColor@@@Z MCAPI std::string const& getNameMixedCase(::BlockColor); -// symbol: -// ?getNameSnakeCase@BlockColorUtil@@YAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4BlockColor@@@Z -MCAPI std::string const& getNameSnakeCase(::BlockColor); - // symbol: ?getRGBColor@BlockColorUtil@@YAHW4BlockColor@@@Z MCAPI int getRGBColor(::BlockColor color); // NOLINTEND diff --git a/src/mc/world/level/block/utils/BlockComponentDirectData.h b/src/mc/world/level/block/utils/BlockComponentDirectData.h index 38cbfc6178..32a6005e5f 100644 --- a/src/mc/world/level/block/utils/BlockComponentDirectData.h +++ b/src/mc/world/level/block/utils/BlockComponentDirectData.h @@ -25,8 +25,5 @@ class BlockComponentDirectData { // symbol: ?_finalizeInit@BlockComponentDirectData@@AEAAXAEBVBlock@@@Z MCAPI void _finalizeInit(class Block const&); - // symbol: ?_isOpaqueFullBlock@BlockComponentDirectData@@AEBA_NAEBVBlock@@@Z - MCAPI bool _isOpaqueFullBlock(class Block const&) const; - // NOLINTEND }; diff --git a/src/mc/world/level/block/utils/BlockComponentStorageFinalizer.h b/src/mc/world/level/block/utils/BlockComponentStorageFinalizer.h index a2da44f362..d8089953a0 100644 --- a/src/mc/world/level/block/utils/BlockComponentStorageFinalizer.h +++ b/src/mc/world/level/block/utils/BlockComponentStorageFinalizer.h @@ -11,6 +11,9 @@ class BlockComponentStorageFinalizer { // private: // NOLINTBEGIN + // symbol: ?_finalizeBlockEventComponents@BlockComponentStorageFinalizer@@AEAAXAEAVBlock@@@Z + MCAPI void _finalizeBlockEventComponents(class Block&); + // symbol: ?addRemainingComponents@BlockComponentStorageFinalizer@@AEAAXAEAVBlock@@@Z MCAPI void addRemainingComponents(class Block&); diff --git a/src/mc/world/level/block/utils/BlockEvents.h b/src/mc/world/level/block/utils/BlockEvents.h new file mode 100644 index 0000000000..a537d3c685 --- /dev/null +++ b/src/mc/world/level/block/utils/BlockEvents.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents {}; diff --git a/src/mc/world/level/block/utils/BlockLegacyComponentStorageFinalizer.h b/src/mc/world/level/block/utils/BlockLegacyComponentStorageFinalizer.h index a51c92ce8d..0d18437849 100644 --- a/src/mc/world/level/block/utils/BlockLegacyComponentStorageFinalizer.h +++ b/src/mc/world/level/block/utils/BlockLegacyComponentStorageFinalizer.h @@ -11,6 +11,9 @@ class BlockLegacyComponentStorageFinalizer { // private: // NOLINTBEGIN + // symbol: ?_finalizeBlockEventComponents@BlockLegacyComponentStorageFinalizer@@AEAAXAEAVBlockLegacy@@@Z + MCAPI void _finalizeBlockEventComponents(class BlockLegacy&); + // symbol: ?addRemainingComponents@BlockLegacyComponentStorageFinalizer@@AEAAXAEAVBlockLegacy@@@Z MCAPI void addRemainingComponents(class BlockLegacy&); diff --git a/src/mc/world/level/block/utils/BlockPosTrackerResetShouldTriggerStandOnSystem.h b/src/mc/world/level/block/utils/BlockPosTrackerResetShouldTriggerStandOnSystem.h new file mode 100644 index 0000000000..0213ac9637 --- /dev/null +++ b/src/mc/world/level/block/utils/BlockPosTrackerResetShouldTriggerStandOnSystem.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockPosTrackerResetShouldTriggerStandOnSystem { +// NOLINTBEGIN +// symbol: ?createSystem@BlockPosTrackerResetShouldTriggerStandOnSystem@@YA?AUTickingSystemWithInfo@@XZ +MCAPI struct TickingSystemWithInfo createSystem(); +// NOLINTEND + +}; // namespace BlockPosTrackerResetShouldTriggerStandOnSystem diff --git a/src/mc/world/level/block/utils/BlockSourceVisitor.h b/src/mc/world/level/block/utils/BlockSourceVisitor.h new file mode 100644 index 0000000000..c7745e6dfe --- /dev/null +++ b/src/mc/world/level/block/utils/BlockSourceVisitor.h @@ -0,0 +1,5 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockSourceVisitor {}; diff --git a/src/mc/world/level/block/utils/BlockTraitFactory.h b/src/mc/world/level/block/utils/BlockTraitFactory.h index 3cb13900ae..0c4a2919d7 100644 --- a/src/mc/world/level/block/utils/BlockTraitFactory.h +++ b/src/mc/world/level/block/utils/BlockTraitFactory.h @@ -11,28 +11,28 @@ class BlockTraitFactory { public: // BlockTraitFactory inner types declare // clang-format off - struct Constructor; + struct TraitMetadata; // clang-format on // BlockTraitFactory inner types define - struct Constructor { + struct TraitMetadata { public: // prevent constructor by default - Constructor(); + TraitMetadata(); public: // NOLINTBEGIN - // symbol: ??0Constructor@BlockTraitFactory@@QEAA@AEBU01@@Z - MCAPI Constructor(struct BlockTraitFactory::Constructor const&); + // symbol: ??0TraitMetadata@BlockTraitFactory@@QEAA@AEBU01@@Z + MCAPI TraitMetadata(struct BlockTraitFactory::TraitMetadata const&); - // symbol: ??4Constructor@BlockTraitFactory@@QEAAAEAU01@$$QEAU01@@Z - MCAPI struct BlockTraitFactory::Constructor& operator=(struct BlockTraitFactory::Constructor&&); + // symbol: ??4TraitMetadata@BlockTraitFactory@@QEAAAEAU01@$$QEAU01@@Z + MCAPI struct BlockTraitFactory::TraitMetadata& operator=(struct BlockTraitFactory::TraitMetadata&&); - // symbol: ??4Constructor@BlockTraitFactory@@QEAAAEAU01@AEBU01@@Z - MCAPI struct BlockTraitFactory::Constructor& operator=(struct BlockTraitFactory::Constructor const&); + // symbol: ??4TraitMetadata@BlockTraitFactory@@QEAAAEAU01@AEBU01@@Z + MCAPI struct BlockTraitFactory::TraitMetadata& operator=(struct BlockTraitFactory::TraitMetadata const&); - // symbol: ??1Constructor@BlockTraitFactory@@QEAA@XZ - MCAPI ~Constructor(); + // symbol: ??1TraitMetadata@BlockTraitFactory@@QEAA@XZ + MCAPI ~TraitMetadata(); // NOLINTEND }; @@ -51,9 +51,9 @@ class BlockTraitFactory { MCAPI ~BlockTraitFactory(); // symbol: - // ?getPropRegisteredTraits@BlockTraitFactory@@SAAEAV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UConstructor@BlockTraitFactory@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UConstructor@BlockTraitFactory@@@std@@@2@@std@@AEAUReflectionCtx@cereal@@@Z - MCAPI static std::unordered_map& - getPropRegisteredTraits(struct cereal::ReflectionCtx&); + // ?getPropRegisteredTraits@BlockTraitFactory@@SAAEAV?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UTraitMetadata@BlockTraitFactory@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UTraitMetadata@BlockTraitFactory@@@std@@@2@@std@@AEBUReflectionCtx@cereal@@@Z + MCAPI static std::unordered_map& + getPropRegisteredTraits(struct cereal::ReflectionCtx const&); // symbol: ?registerAllTraits@BlockTraitFactory@@SAXAEAUReflectionCtx@cereal@@@Z MCAPI static void registerAllTraits(struct cereal::ReflectionCtx&); @@ -62,8 +62,8 @@ class BlockTraitFactory { // private: // NOLINTBEGIN - // symbol: ?getEnTTMetaType@BlockTraitFactory@@CA?AVmeta_type@entt@@AEAUReflectionCtx@cereal@@@Z - MCAPI static entt::meta_type getEnTTMetaType(struct cereal::ReflectionCtx&); + // symbol: ?initEnTTMetaType@BlockTraitFactory@@CA?AVmeta_type@entt@@AEAUReflectionCtx@cereal@@@Z + MCAPI static entt::meta_type initEnTTMetaType(struct cereal::ReflectionCtx&); // NOLINTEND }; diff --git a/src/mc/world/level/block/utils/BlockTransformationComponent.h b/src/mc/world/level/block/utils/BlockTransformationComponent.h index e45852ba84..6adc767c12 100644 --- a/src/mc/world/level/block/utils/BlockTransformationComponent.h +++ b/src/mc/world/level/block/utils/BlockTransformationComponent.h @@ -5,11 +5,6 @@ // auto generated inclusion list #include "mc/world/level/block/utils/BlockComponentBase.h" -// auto generated forward declare list -// clang-format off -namespace cereal { struct ReflectionCtx; } -// clang-format on - class BlockTransformationComponent : public ::BlockComponentBase { public: // BlockTransformationComponent inner types declare @@ -30,9 +25,6 @@ class BlockTransformationComponent : public ::BlockComponentBase { // symbol: ?rotationTypeFromVec3@RotationType@BlockTransformationComponent@@QEAAXAEBVVec3@@@Z MCAPI void rotationTypeFromVec3(class Vec3 const& arr); - // symbol: ?bindType@RotationType@BlockTransformationComponent@@SAXAEAUReflectionCtx@cereal@@@Z - MCAPI static void bindType(struct cereal::ReflectionCtx&); - // NOLINTEND }; diff --git a/src/mc/world/level/block/utils/BlockVolumeBase.h b/src/mc/world/level/block/utils/BlockVolumeBase.h new file mode 100644 index 0000000000..7ebca45605 --- /dev/null +++ b/src/mc/world/level/block/utils/BlockVolumeBase.h @@ -0,0 +1,42 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/external/glm/vec.h" + +class BlockVolumeBase { +public: + // prevent constructor by default + BlockVolumeBase& operator=(BlockVolumeBase const&); + BlockVolumeBase(BlockVolumeBase const&); + BlockVolumeBase(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: ??1BlockVolumeBase@@UEAA@XZ + virtual ~BlockVolumeBase(); + + // vIndex: 1, symbol: ?getBoundingBox@SimpleBlockVolume@@UEBA?AVBoundingBox@@XZ + virtual class BoundingBox getBoundingBox() const = 0; + + // vIndex: 2, symbol: ?getMin@SimpleBlockVolume@@UEBA?AVBlockPos@@XZ + virtual class BlockPos getMin() const = 0; + + // vIndex: 3, symbol: ?getMax@SimpleBlockVolume@@UEBA?AVBlockPos@@XZ + virtual class BlockPos getMax() const = 0; + + // vIndex: 4, symbol: ?getSpan@SimpleBlockVolume@@UEBA?AU?$vec@$02H$0A@@glm@@XZ + virtual struct glm::vec<3, int, 0> getSpan() const = 0; + + // vIndex: 5, symbol: ?getCapacity@SimpleBlockVolume@@UEBAHXZ + virtual int getCapacity() const = 0; + + // vIndex: 6, symbol: ?isInside@SimpleBlockVolume@@UEBA_NAEBVBlockPos@@@Z + virtual bool isInside(class BlockPos const&) const = 0; + + // vIndex: 7, symbol: ?translate@SimpleBlockVolume@@UEAAXAEBVBlockPos@@@Z + virtual void translate(class BlockPos const&) = 0; + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/utils/CollisionShape.h b/src/mc/world/level/block/utils/CollisionShape.h new file mode 100644 index 0000000000..b2b929680d --- /dev/null +++ b/src/mc/world/level/block/utils/CollisionShape.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockSourceVisitor { + +struct CollisionShape { +public: + // prevent constructor by default + CollisionShape& operator=(CollisionShape const&); + CollisionShape(CollisionShape const&); + CollisionShape(); +}; + +}; // namespace BlockSourceVisitor diff --git a/src/mc/world/level/block/utils/CollisionShapes.h b/src/mc/world/level/block/utils/CollisionShapes.h new file mode 100644 index 0000000000..45cee7ac74 --- /dev/null +++ b/src/mc/world/level/block/utils/CollisionShapes.h @@ -0,0 +1,35 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +struct CollisionShapes { +public: + // prevent constructor by default + CollisionShapes& operator=(CollisionShapes const&); + CollisionShapes(); + +public: + // NOLINTBEGIN + // symbol: ??0CollisionShapes@@QEAA@AEBU0@@Z + MCAPI CollisionShapes(struct CollisionShapes const&); + + // symbol: ?addCollisionShape@CollisionShapes@@QEAAXAEBVAABB@@@Z + MCAPI void addCollisionShape(class AABB const&); + + // symbol: ?addCollisionShape@CollisionShapes@@QEAAXAEBVAABB@@AEBVBlock@@AEBVBlockPos@@@Z + MCAPI void addCollisionShape(class AABB const&, class Block const&, class BlockPos const&); + + // symbol: ?getBlockPosCurrentlyStandingOn@CollisionShapes@@QEBA?AU?$pair@VBlockPos@@AEBVBlock@@@std@@VAABB@@@Z + MCAPI std::pair getBlockPosCurrentlyStandingOn(class AABB) const; + + // symbol: ??4CollisionShapes@@QEAAAEAU0@$$QEAU0@@Z + MCAPI struct CollisionShapes& operator=(struct CollisionShapes&&); + + // symbol: ?reserve@CollisionShapes@@QEAAX_K@Z + MCAPI void reserve(uint64); + + // symbol: ?size@CollisionShapes@@QEBA_KXZ + MCAPI uint64 size() const; + + // NOLINTEND +}; diff --git a/src/mc/world/level/block/utils/ComplexAliasBlockUtils.h b/src/mc/world/level/block/utils/ComplexAliasBlockUtils.h deleted file mode 100644 index 2b31af47ca..0000000000 --- a/src/mc/world/level/block/utils/ComplexAliasBlockUtils.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated forward declare list -// clang-format off -namespace ComplexAliasBlockUtils { struct NewBlockAndSplitState; } -namespace ComplexAliasBlockUtils { struct NewCoralBlockAndSplitStates; } -// clang-format on - -namespace ComplexAliasBlockUtils {}; diff --git a/src/mc/world/level/block/utils/CompoundBlockVolumeItem.h b/src/mc/world/level/block/utils/CompoundBlockVolumeItem.h index 02b6d8cf51..2aba396521 100644 --- a/src/mc/world/level/block/utils/CompoundBlockVolumeItem.h +++ b/src/mc/world/level/block/utils/CompoundBlockVolumeItem.h @@ -19,6 +19,9 @@ class CompoundBlockVolumeItem { // symbol: ??8CompoundBlockVolumeItem@@QEBA_NAEBV0@@Z MCAPI bool operator==(class CompoundBlockVolumeItem const& other) const; + // symbol: ??1CompoundBlockVolumeItem@@QEAA@XZ + MCAPI ~CompoundBlockVolumeItem(); + // symbol: ?bindType@CompoundBlockVolumeItem@@SAXAEAUReflectionCtx@cereal@@@Z MCAPI static void bindType(struct cereal::ReflectionCtx&); diff --git a/src/mc/world/level/block/utils/Constraint.h b/src/mc/world/level/block/utils/Constraint.h index f552e2d24d..afda0f4342 100644 --- a/src/mc/world/level/block/utils/Constraint.h +++ b/src/mc/world/level/block/utils/Constraint.h @@ -14,7 +14,7 @@ namespace cereal::internal { struct ConstraintDescription; } namespace BlockGeometrySerializer { -struct Constraint : public ::cereal::Constraint { +class Constraint : public ::cereal::Constraint { public: // prevent constructor by default Constraint& operator=(Constraint const&); diff --git a/src/mc/world/level/block/utils/DeprecatedSlabBlockItem.h b/src/mc/world/level/block/utils/DeprecatedSlabBlockItem.h index cb7a00c13b..5066ad9429 100644 --- a/src/mc/world/level/block/utils/DeprecatedSlabBlockItem.h +++ b/src/mc/world/level/block/utils/DeprecatedSlabBlockItem.h @@ -26,19 +26,8 @@ class DeprecatedSlabBlockItem : public ::BlockItem { public: // NOLINTBEGIN - // vIndex: 0, symbol: ??1DeprecatedSlabBlockItem@@UEAA@XZ - virtual ~DeprecatedSlabBlockItem(); - - // vIndex: 116, symbol: - // ?_calculatePlacePos@DeprecatedSlabBlockItem@@UEBA_NAEAVItemStackBase@@AEAVActor@@AEAEAEAVBlockPos@@@Z - virtual bool - _calculatePlacePos(class ItemStackBase& instance, class Actor& entity, uchar& face, class BlockPos& pos) const; - - // vIndex: 118, symbol: - // ?_useOn@DeprecatedSlabBlockItem@@UEBA?AVInteractionResult@@AEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z - virtual class InteractionResult - _useOn(class ItemStack& instance, class Actor& entity, class BlockPos pos, uchar face, class Vec3 const& clickPos) - const; + // vIndex: 0, symbol: __gen_??1DeprecatedSlabBlockItem@@UEAA@XZ + virtual ~DeprecatedSlabBlockItem() = default; // NOLINTEND diff --git a/src/mc/world/level/block/utils/LegacyBlockInfo.h b/src/mc/world/level/block/utils/LegacyBlockInfo.h index 7bbd0e74c0..6e7300cd1b 100644 --- a/src/mc/world/level/block/utils/LegacyBlockInfo.h +++ b/src/mc/world/level/block/utils/LegacyBlockInfo.h @@ -5,10 +5,10 @@ // auto generated forward declare list // clang-format off class HashedString; -namespace SplitBlockUtils { struct BlockNameRefAuxVariant; } +namespace FlatteningUtils { struct BlockNameRefAuxVariant; } // clang-format on -namespace SplitBlockUtils { +namespace FlatteningUtils { struct LegacyBlockInfo { public: @@ -20,14 +20,14 @@ struct LegacyBlockInfo { public: // NOLINTBEGIN // symbol: - // ??0LegacyBlockInfo@SplitBlockUtils@@QEAA@HVHashedString@@0V?$vector@UBlockNameRefAuxVariant@SplitBlockUtils@@V?$allocator@UBlockNameRefAuxVariant@SplitBlockUtils@@@std@@@std@@@Z + // ??0LegacyBlockInfo@FlatteningUtils@@QEAA@HVHashedString@@0EV?$vector@UBlockNameRefAuxVariant@FlatteningUtils@@V?$allocator@UBlockNameRefAuxVariant@FlatteningUtils@@@std@@@std@@@Z MCAPI - LegacyBlockInfo(int, class HashedString, class HashedString, std::vector); + LegacyBlockInfo(int, class HashedString, class HashedString, uchar, std::vector); - // symbol: ??1LegacyBlockInfo@SplitBlockUtils@@QEAA@XZ + // symbol: ??1LegacyBlockInfo@FlatteningUtils@@QEAA@XZ MCAPI ~LegacyBlockInfo(); // NOLINTEND }; -}; // namespace SplitBlockUtils +}; // namespace FlatteningUtils diff --git a/src/mc/world/level/block/utils/NewBlockAndSplitState.h b/src/mc/world/level/block/utils/NewBlockAndSplitState.h deleted file mode 100644 index 671af552c0..0000000000 --- a/src/mc/world/level/block/utils/NewBlockAndSplitState.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -namespace ComplexAliasBlockUtils { - -struct NewBlockAndSplitState { -public: - // prevent constructor by default - NewBlockAndSplitState& operator=(NewBlockAndSplitState const&); - NewBlockAndSplitState(); - -public: - // NOLINTBEGIN - // symbol: ??0NewBlockAndSplitState@ComplexAliasBlockUtils@@QEAA@AEBU01@@Z - MCAPI NewBlockAndSplitState(struct ComplexAliasBlockUtils::NewBlockAndSplitState const&); - - // symbol: ??1NewBlockAndSplitState@ComplexAliasBlockUtils@@QEAA@XZ - MCAPI ~NewBlockAndSplitState(); - - // NOLINTEND -}; - -}; // namespace ComplexAliasBlockUtils diff --git a/src/mc/world/level/block/utils/NewCoralBlockAndSplitStates.h b/src/mc/world/level/block/utils/NewCoralBlockAndSplitStates.h deleted file mode 100644 index 022f2f9096..0000000000 --- a/src/mc/world/level/block/utils/NewCoralBlockAndSplitStates.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -namespace ComplexAliasBlockUtils { - -struct NewCoralBlockAndSplitStates { -public: - // prevent constructor by default - NewCoralBlockAndSplitStates& operator=(NewCoralBlockAndSplitStates const&); - NewCoralBlockAndSplitStates(); - -public: - // NOLINTBEGIN - // symbol: ??0NewCoralBlockAndSplitStates@ComplexAliasBlockUtils@@QEAA@AEBU01@@Z - MCAPI NewCoralBlockAndSplitStates(struct ComplexAliasBlockUtils::NewCoralBlockAndSplitStates const&); - - // symbol: ??1NewCoralBlockAndSplitStates@ComplexAliasBlockUtils@@QEAA@XZ - MCAPI ~NewCoralBlockAndSplitStates(); - - // NOLINTEND -}; - -}; // namespace ComplexAliasBlockUtils diff --git a/src/mc/world/level/block/utils/SimpleBlockVolume.h b/src/mc/world/level/block/utils/SimpleBlockVolume.h index bef29984f0..2692a0b808 100644 --- a/src/mc/world/level/block/utils/SimpleBlockVolume.h +++ b/src/mc/world/level/block/utils/SimpleBlockVolume.h @@ -4,13 +4,14 @@ // auto generated inclusion list #include "mc/external/glm/vec.h" +#include "mc/world/level/block/utils/BlockVolumeBase.h" // auto generated forward declare list // clang-format off namespace cereal { struct ReflectionCtx; } // clang-format on -class SimpleBlockVolume { +class SimpleBlockVolume : public ::BlockVolumeBase { public: // SimpleBlockVolume inner types define enum class IntersectionResult {}; @@ -21,12 +22,39 @@ class SimpleBlockVolume { public: // NOLINTBEGIN + // vIndex: 0, symbol: ??1SimpleBlockVolume@@UEAA@XZ + virtual ~SimpleBlockVolume(); + + // vIndex: 1, symbol: ?getBoundingBox@SimpleBlockVolume@@UEBA?AVBoundingBox@@XZ + virtual class BoundingBox getBoundingBox() const; + + // vIndex: 2, symbol: ?getMin@SimpleBlockVolume@@UEBA?AVBlockPos@@XZ + virtual class BlockPos getMin() const; + + // vIndex: 3, symbol: ?getMax@SimpleBlockVolume@@UEBA?AVBlockPos@@XZ + virtual class BlockPos getMax() const; + + // vIndex: 4, symbol: ?getSpan@SimpleBlockVolume@@UEBA?AU?$vec@$02H$0A@@glm@@XZ + virtual struct glm::vec<3, int, 0> getSpan() const; + + // vIndex: 5, symbol: ?getCapacity@SimpleBlockVolume@@UEBAHXZ + virtual int getCapacity() const; + + // vIndex: 6, symbol: ?isInside@SimpleBlockVolume@@UEBA_NAEBVBlockPos@@@Z + virtual bool isInside(class BlockPos const&) const; + + // vIndex: 7, symbol: ?translate@SimpleBlockVolume@@UEAAXAEBVBlockPos@@@Z + virtual void translate(class BlockPos const&); + // symbol: ??0SimpleBlockVolume@@QEAA@$$QEAV0@@Z MCAPI SimpleBlockVolume(class SimpleBlockVolume&& volume); // symbol: ??0SimpleBlockVolume@@QEAA@AEBV0@@Z MCAPI SimpleBlockVolume(class SimpleBlockVolume const& volume); + // symbol: ??0SimpleBlockVolume@@QEAA@$$QEAVBlockPos@@0@Z + MCAPI SimpleBlockVolume(class BlockPos&& from, class BlockPos&& to); + // symbol: ?begin@SimpleBlockVolume@@QEBA?AVSimpleBlockVolumeIterator@@XZ MCAPI class SimpleBlockVolumeIterator begin() const; @@ -39,24 +67,9 @@ class SimpleBlockVolume { // symbol: ?doesBlockTouchFaces@SimpleBlockVolume@@QEBA_NAEBVBlockPos@@@Z MCAPI bool doesBlockTouchFaces(class BlockPos const& blockPos) const; - // symbol: ?getBoundingBox@SimpleBlockVolume@@QEBA?AVBoundingBox@@XZ - MCAPI class BoundingBox getBoundingBox() const; - - // symbol: ?getCapacity@SimpleBlockVolume@@QEBAHXZ - MCAPI int getCapacity() const; - // symbol: ?getFrom@SimpleBlockVolume@@QEBA?AVBlockPos@@XZ MCAPI class BlockPos getFrom() const; - // symbol: ?getMax@SimpleBlockVolume@@QEBA?AVBlockPos@@XZ - MCAPI class BlockPos getMax() const; - - // symbol: ?getMin@SimpleBlockVolume@@QEBA?AVBlockPos@@XZ - MCAPI class BlockPos getMin() const; - - // symbol: ?getSpan@SimpleBlockVolume@@QEBA?AU?$vec@$02H$0A@@glm@@XZ - MCAPI struct glm::vec<3, int, 0> getSpan() const; - // symbol: ?getTo@SimpleBlockVolume@@QEBA?AVBlockPos@@XZ MCAPI class BlockPos getTo() const; @@ -75,9 +88,6 @@ class SimpleBlockVolume { // symbol: ??8SimpleBlockVolume@@QEBA_NAEBV0@@Z MCAPI bool operator==(class SimpleBlockVolume const& other) const; - // symbol: ?translate@SimpleBlockVolume@@QEAAAEAV1@AEBVBlockPos@@@Z - MCAPI class SimpleBlockVolume& translate(class BlockPos const&); - // symbol: ?translated@SimpleBlockVolume@@QEBA?AV1@AEBU?$vec@$02H$0A@@glm@@@Z MCAPI class SimpleBlockVolume translated(struct glm::vec<3, int, 0> const&) const; @@ -85,14 +95,4 @@ class SimpleBlockVolume { MCAPI static void cerealBindTypes(struct cereal::ReflectionCtx&); // NOLINTEND - - // protected: - // NOLINTBEGIN - // symbol: ?_setFrom@SimpleBlockVolume@@IEAAXAEBVVec3@@@Z - MCAPI void _setFrom(class Vec3 const& from); - - // symbol: ?_setTo@SimpleBlockVolume@@IEAAXAEBVVec3@@@Z - MCAPI void _setTo(class Vec3 const& to); - - // NOLINTEND }; diff --git a/src/mc/world/level/block/utils/SplitBlockUtils.h b/src/mc/world/level/block/utils/SplitBlockUtils.h deleted file mode 100644 index bec5456537..0000000000 --- a/src/mc/world/level/block/utils/SplitBlockUtils.h +++ /dev/null @@ -1,69 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated forward declare list -// clang-format off -namespace SplitBlockUtils { struct BlockNameRefAuxVariant; } -namespace SplitBlockUtils { struct LegacyBlockInfo; } -// clang-format on - -namespace SplitBlockUtils { -// NOLINTBEGIN -// symbol: -// ?LegacyBlockInfos@SplitBlockUtils@@3V?$vector@V?$reference_wrapper@$$CBULegacyBlockInfo@SplitBlockUtils@@@std@@V?$allocator@V?$reference_wrapper@$$CBULegacyBlockInfo@SplitBlockUtils@@@std@@@2@@std@@B -MCAPI extern std::vector> const LegacyBlockInfos; - -// symbol: ?LegacyCarpetInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyCarpetInfo; - -// symbol: ?LegacyConcreteInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyConcreteInfo; - -// symbol: ?LegacyConcretePowderInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyConcretePowderInfo; - -// symbol: ?LegacyCoralInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyCoralInfo; - -// symbol: ?LegacyFenceInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyFenceInfo; - -// symbol: ?LegacyHardStainedGlassInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyHardStainedGlassInfo; - -// symbol: ?LegacyHardStainedGlassPaneInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyHardStainedGlassPaneInfo; - -// symbol: ?LegacyLavaCauldronInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyLavaCauldronInfo; - -// symbol: ?LegacyLog2Info@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyLog2Info; - -// symbol: ?LegacyLogInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyLogInfo; - -// symbol: ?LegacyPlanksInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyPlanksInfo; - -// symbol: ?LegacyShulkerBoxInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyShulkerBoxInfo; - -// symbol: ?LegacyStainedGlassInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyStainedGlassInfo; - -// symbol: ?LegacyStainedGlassPaneInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyStainedGlassPaneInfo; - -// symbol: ?LegacyStoneInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyStoneInfo; - -// symbol: ?LegacyTerracottaInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyTerracottaInfo; - -// symbol: ?LegacyWoolInfo@SplitBlockUtils@@3ULegacyBlockInfo@1@B -MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyWoolInfo; -// NOLINTEND - -}; // namespace SplitBlockUtils diff --git a/src/mc/world/level/block/utils/UpdateEntityAfterFallOn.h b/src/mc/world/level/block/utils/UpdateEntityAfterFallOn.h new file mode 100644 index 0000000000..e820d19c63 --- /dev/null +++ b/src/mc/world/level/block/utils/UpdateEntityAfterFallOn.h @@ -0,0 +1,17 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/Include.h" +#include "mc/common/wrapper/ViewT.h" +#include "mc/world/components/FlagComponent.h" + +namespace UpdateEntityAfterFallOn { +// NOLINTBEGIN +// symbol: +// ?onBounceStarted@UpdateEntityAfterFallOn@@YAXAEBVStrictEntityContext@@AEBVBlockPos@@AEBVBlock@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UPlayerComponentFlag@@@@@@UBounceComponent@@@@AEBV?$ViewT@VStrictEntityContext@@U?$Include@V?$FlagComponent@UMinecartFlag@@@@@@UStateVectorComponent@@@@@Z +MCAPI void onBounceStarted(class StrictEntityContext const&, class BlockPos const&, class Block const&, class ViewT>, struct BounceComponent> const&, class ViewT>, struct StateVectorComponent> const&); +// NOLINTEND + +}; // namespace UpdateEntityAfterFallOn diff --git a/src/mc/world/level/block/utils/VanillaBlockCullingIds.h b/src/mc/world/level/block/utils/VanillaBlockCullingIds.h new file mode 100644 index 0000000000..5b5db9d804 --- /dev/null +++ b/src/mc/world/level/block/utils/VanillaBlockCullingIds.h @@ -0,0 +1,14 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace VanillaBlockCullingIds { +// NOLINTBEGIN +// symbol: ?EnchantingTable@VanillaBlockCullingIds@@3VHashedString@@B +MCAPI extern class HashedString const EnchantingTable; + +// symbol: ?Lectern@VanillaBlockCullingIds@@3VHashedString@@B +MCAPI extern class HashedString const Lectern; +// NOLINTEND + +}; // namespace VanillaBlockCullingIds diff --git a/src/mc/world/level/block/utils/VanillaBlockDrops.h b/src/mc/world/level/block/utils/VanillaBlockDrops.h index d2906c765b..ca0f2a6fe0 100644 --- a/src/mc/world/level/block/utils/VanillaBlockDrops.h +++ b/src/mc/world/level/block/utils/VanillaBlockDrops.h @@ -2,17 +2,22 @@ #include "mc/_HeaderOutputPredefine.h" +// auto generated inclusion list +#include "mc/enums/SaplingType.h" + namespace VanillaBlockDrops { // NOLINTBEGIN -// symbol: ?between@VanillaBlockDrops@@YA?AUIntRange@@HH@Z -MCAPI struct IntRange between(int, int); +// symbol: +// ?addUniformLootBonus@VanillaBlockDrops@@YA?AV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@V23@H@Z +MCAPI std::function + addUniformLootBonus(std::function, int); + +// symbol: ?between@VanillaBlockDrops@@YA?AV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@HH@Z +MCAPI std::function between(int, int); // symbol: ?configureBlockDrops@VanillaBlockDrops@@YAXAEBVBaseGameVersion@@AEBVExperiments@@@Z MCAPI void configureBlockDrops(class BaseGameVersion const&, class Experiments const&); -// symbol: ?createDoublePlantDrop@VanillaBlockDrops@@YA@XZ -MCAPI auto createDoublePlantDrop(); - // symbol: // ?doublePlantDrop@VanillaBlockDrops@@YA?AUResourceDrops@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z MCAPI struct ResourceDrops doublePlantDrop(class Block const&, class Randomize&, struct ResourceDropsContext const&); @@ -25,17 +30,26 @@ doublePlantNonShearsDrop(class Block const&, class Randomize&, struct ResourceDr // symbol: ?dropExperience@VanillaBlockDrops@@YA?AUResourceDrops@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z MCAPI struct ResourceDrops dropExperience(class Block const&, class Randomize&, struct ResourceDropsContext const&); +// symbol: ?dropLeaves@VanillaBlockDrops@@YA@AEBVHashedString@@W4SaplingType@@@Z +MCAPI auto dropLeaves(class HashedString const&, ::SaplingType); + // symbol: ?dropNothing@VanillaBlockDrops@@YAXAEBVHashedString@@@Z MCAPI void dropNothing(class HashedString const& blockId); -// symbol: ?dropOre@VanillaBlockDrops@@YAXAEBVHashedString@@0UIntRange@@@Z -MCAPI void dropOre(class HashedString const&, class HashedString const&, struct IntRange); +// symbol: +// ?dropOre@VanillaBlockDrops@@YAXAEBVHashedString@@0AEBV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@@Z +MCAPI void +dropOre(class HashedString const&, class HashedString const&, std::function const&); -// symbol: ?dropOther@VanillaBlockDrops@@YAXAEBVHashedString@@0UIntRange@@@Z -MCAPI void dropOther(class HashedString const&, class HashedString const&, struct IntRange); +// symbol: +// ?dropOther@VanillaBlockDrops@@YAXAEBVHashedString@@0AEBV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@@Z +MCAPI void +dropOther(class HashedString const&, class HashedString const&, std::function const&); -// symbol: ?dropOtherNoExplosionDecay@VanillaBlockDrops@@YAXAEBVHashedString@@0UIntRange@@@Z -MCAPI void dropOtherNoExplosionDecay(class HashedString const&, class HashedString const&, struct IntRange); +// symbol: +// ?dropOtherNoExplosionDecay@VanillaBlockDrops@@YAXAEBVHashedString@@0AEBV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@@Z +MCAPI void +dropOtherNoExplosionDecay(class HashedString const&, class HashedString const&, std::function const&); // symbol: // ?dropSelf@VanillaBlockDrops@@YAXAEBVHashedString@@V?$vector@PEBVBlockState@@V?$allocator@PEBVBlockState@@@std@@@std@@@Z @@ -49,22 +63,32 @@ MCAPI void dropSelfNoExplosionDecay(class HashedString const&, std::vector); -// symbol: ?dropSelfWithSilkTouchOrOther@VanillaBlockDrops@@YAXAEBVHashedString@@0UIntRange@@@Z -MCAPI void dropSelfWithSilkTouchOrOther(class HashedString const&, class HashedString const&, struct IntRange); +// symbol: +// ?dropSelfWithSilkTouchOrOther@VanillaBlockDrops@@YAXAEBVHashedString@@0AEBV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@@Z +MCAPI void +dropSelfWithSilkTouchOrOther(class HashedString const&, class HashedString const&, std::function const&); -// symbol: ?dropSelfWithSilkTouchOrOtherNoExplosionDecay@VanillaBlockDrops@@YAXAEBVHashedString@@0UIntRange@@@Z +// symbol: +// ?dropSelfWithSilkTouchOrOtherNoExplosionDecay@VanillaBlockDrops@@YAXAEBVHashedString@@0AEBV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@@Z MCAPI void -dropSelfWithSilkTouchOrOtherNoExplosionDecay(class HashedString const&, class HashedString const&, struct IntRange); +dropSelfWithSilkTouchOrOtherNoExplosionDecay(class HashedString const&, class HashedString const&, std::function const&); // symbol: ?empty@VanillaBlockDrops@@YA?AUResourceDrops@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z MCAPI struct ResourceDrops empty(class Block const&, class Randomize&, struct ResourceDropsContext const&); +// symbol: ?exactly@VanillaBlockDrops@@YA?AV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@H@Z +MCAPI std::function exactly(int); + // symbol: // ?infestedBlockDrops@VanillaBlockDrops@@YA?AUResourceDrops@@AEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z MCAPI struct ResourceDrops infestedBlockDrops(class Block const&, class Randomize&, struct ResourceDropsContext const&); // symbol: ?isSilkTouch@VanillaBlockDrops@@YA_NAEBVBlock@@AEAVRandomize@@AEBUResourceDropsContext@@@Z MCAPI bool isSilkTouch(class Block const&, class Randomize&, struct ResourceDropsContext const&); + +// symbol: ?limitCount@VanillaBlockDrops@@YA?AV?$function@$$A6AHAEAVRandomize@@AEBUResourceDropsContext@@@Z@std@@HV23@@Z +MCAPI std::function + limitCount(int, std::function); // NOLINTEND }; // namespace VanillaBlockDrops diff --git a/src/mc/world/level/block/utils/VanillaBlockGeometryIds.h b/src/mc/world/level/block/utils/VanillaBlockGeometryIds.h new file mode 100644 index 0000000000..8932935b9a --- /dev/null +++ b/src/mc/world/level/block/utils/VanillaBlockGeometryIds.h @@ -0,0 +1,26 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace VanillaBlockGeometryIds { +// NOLINTBEGIN +// symbol: ?Beacon@VanillaBlockGeometryIds@@3VHashedString@@B +MCAPI extern class HashedString const Beacon; + +// symbol: ?BigDripleaf@VanillaBlockGeometryIds@@3VHashedString@@B +MCAPI extern class HashedString const BigDripleaf; + +// symbol: ?EnchantingTable@VanillaBlockGeometryIds@@3VHashedString@@B +MCAPI extern class HashedString const EnchantingTable; + +// symbol: ?Hopper@VanillaBlockGeometryIds@@3VHashedString@@B +MCAPI extern class HashedString const Hopper; + +// symbol: ?HopperSide@VanillaBlockGeometryIds@@3VHashedString@@B +MCAPI extern class HashedString const HopperSide; + +// symbol: ?Lectern@VanillaBlockGeometryIds@@3VHashedString@@B +MCAPI extern class HashedString const Lectern; +// NOLINTEND + +}; // namespace VanillaBlockGeometryIds diff --git a/src/mc/world/level/block/utils/VanillaBlockTypeGroups.h b/src/mc/world/level/block/utils/VanillaBlockTypeGroups.h index f37372d9c7..7c146832a6 100644 --- a/src/mc/world/level/block/utils/VanillaBlockTypeGroups.h +++ b/src/mc/world/level/block/utils/VanillaBlockTypeGroups.h @@ -68,14 +68,30 @@ MCAPI extern std::vector> const // ?HardStainedGlassPaneIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B MCAPI extern std::vector> const HardStainedGlassPaneIds; +// symbol: +// ?LeavesBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B +MCAPI extern std::vector> const LeavesBlockIds; + // symbol: // ?LogBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B MCAPI extern std::vector> const LogBlockIds; +// symbol: +// ?OldLeavesBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B +MCAPI extern std::vector> const OldLeavesBlockIds; + // symbol: // ?OldLogBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B MCAPI extern std::vector> const OldLogBlockIds; +// symbol: +// ?OldWoodAndStrippedWoodBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B +MCAPI extern std::vector> const OldWoodAndStrippedWoodBlockIds; + +// symbol: +// ?OldWoodBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B +MCAPI extern std::vector> const OldWoodBlockIds; + // symbol: // ?PlanksBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B MCAPI extern std::vector> const PlanksBlockIds; @@ -104,10 +120,22 @@ MCAPI extern std::vector> const // ?TerracottaIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B MCAPI extern std::vector> const TerracottaIds; +// symbol: +// ?WoodBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B +MCAPI extern std::vector> const WoodBlockIds; + // symbol: // ?WoodFenceBlockIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B MCAPI extern std::vector> const WoodFenceBlockIds; +// symbol: +// ?WoodenDoubleSlabIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B +MCAPI extern std::vector> const WoodenDoubleSlabIds; + +// symbol: +// ?WoodenSlabIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B +MCAPI extern std::vector> const WoodenSlabIds; + // symbol: // ?WoolIds@VanillaBlockTypeGroups@@3V?$vector@V?$reference_wrapper@$$CBVHashedString@@@std@@V?$allocator@V?$reference_wrapper@$$CBVHashedString@@@std@@@2@@std@@B MCAPI extern std::vector> const WoolIds; diff --git a/src/mc/world/level/block/utils/VanillaBlockTypeIds.h b/src/mc/world/level/block/utils/VanillaBlockTypeIds.h index 5f9a536f2e..6c9eb00dab 100644 --- a/src/mc/world/level/block/utils/VanillaBlockTypeIds.h +++ b/src/mc/world/level/block/utils/VanillaBlockTypeIds.h @@ -10,6 +10,9 @@ MCAPI extern class HashedString const AcaciaButton; // symbol: ?AcaciaDoor@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const AcaciaDoor; +// symbol: ?AcaciaDoubleSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const AcaciaDoubleSlab; + // symbol: ?AcaciaFence@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const AcaciaFence; @@ -19,6 +22,9 @@ MCAPI extern class HashedString const AcaciaFenceGate; // symbol: ?AcaciaHangingSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const AcaciaHangingSign; +// symbol: ?AcaciaLeaves@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const AcaciaLeaves; + // symbol: ?AcaciaLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const AcaciaLog; @@ -28,6 +34,9 @@ MCAPI extern class HashedString const AcaciaPlanks; // symbol: ?AcaciaPressurePlate@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const AcaciaPressurePlate; +// symbol: ?AcaciaSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const AcaciaSlab; + // symbol: ?AcaciaStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const AcaciaStairs; @@ -40,6 +49,9 @@ MCAPI extern class HashedString const AcaciaTrapdoor; // symbol: ?AcaciaWallSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const AcaciaWallSign; +// symbol: ?AcaciaWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const AcaciaWood; + // symbol: ?ActivatorRail@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const ActivatorRail; @@ -172,6 +184,9 @@ MCAPI extern class HashedString const BirchButton; // symbol: ?BirchDoor@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BirchDoor; +// symbol: ?BirchDoubleSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const BirchDoubleSlab; + // symbol: ?BirchFence@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BirchFence; @@ -181,6 +196,9 @@ MCAPI extern class HashedString const BirchFenceGate; // symbol: ?BirchHangingSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BirchHangingSign; +// symbol: ?BirchLeaves@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const BirchLeaves; + // symbol: ?BirchLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BirchLog; @@ -190,6 +208,9 @@ MCAPI extern class HashedString const BirchPlanks; // symbol: ?BirchPressurePlate@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BirchPressurePlate; +// symbol: ?BirchSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const BirchSlab; + // symbol: ?BirchStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BirchStairs; @@ -202,6 +223,9 @@ MCAPI extern class HashedString const BirchTrapdoor; // symbol: ?BirchWallSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BirchWallSign; +// symbol: ?BirchWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const BirchWood; + // symbol: ?BlackCandle@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const BlackCandle; @@ -709,12 +733,18 @@ MCAPI extern class HashedString const DarkOakButton; // symbol: ?DarkOakDoor@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkOakDoor; +// symbol: ?DarkOakDoubleSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const DarkOakDoubleSlab; + // symbol: ?DarkOakFence@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkOakFence; // symbol: ?DarkOakFenceGate@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkOakFenceGate; +// symbol: ?DarkOakLeaves@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const DarkOakLeaves; + // symbol: ?DarkOakLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkOakLog; @@ -724,12 +754,18 @@ MCAPI extern class HashedString const DarkOakPlanks; // symbol: ?DarkOakPressurePlate@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkOakPressurePlate; +// symbol: ?DarkOakSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const DarkOakSlab; + // symbol: ?DarkOakStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkOakStairs; // symbol: ?DarkOakTrapdoor@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkOakTrapdoor; +// symbol: ?DarkOakWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const DarkOakWood; + // symbol: ?DarkPrismarineStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DarkPrismarineStairs; @@ -871,9 +907,6 @@ MCAPI extern class HashedString const DoubleStoneSlab3; // symbol: ?DoubleStoneSlab4@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DoubleStoneSlab4; -// symbol: ?DoubleWoodenSlab@VanillaBlockTypeIds@@3VHashedString@@B -MCAPI extern class HashedString const DoubleWoodenSlab; - // symbol: ?DragonEgg@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const DragonEgg; @@ -1024,8 +1057,8 @@ MCAPI extern class HashedString const Granite; // symbol: ?GraniteStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const GraniteStairs; -// symbol: ?Grass@VanillaBlockTypeIds@@3VHashedString@@B -MCAPI extern class HashedString const Grass; +// symbol: ?GrassBlock@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const GrassBlock; // symbol: ?GrassPath@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const GrassPath; @@ -1273,6 +1306,9 @@ MCAPI extern class HashedString const JungleButton; // symbol: ?JungleDoor@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const JungleDoor; +// symbol: ?JungleDoubleSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const JungleDoubleSlab; + // symbol: ?JungleFence@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const JungleFence; @@ -1282,6 +1318,9 @@ MCAPI extern class HashedString const JungleFenceGate; // symbol: ?JungleHangingSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const JungleHangingSign; +// symbol: ?JungleLeaves@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const JungleLeaves; + // symbol: ?JungleLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const JungleLog; @@ -1291,6 +1330,9 @@ MCAPI extern class HashedString const JunglePlanks; // symbol: ?JunglePressurePlate@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const JunglePressurePlate; +// symbol: ?JungleSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const JungleSlab; + // symbol: ?JungleStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const JungleStairs; @@ -1303,6 +1345,9 @@ MCAPI extern class HashedString const JungleTrapdoor; // symbol: ?JungleWallSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const JungleWallSign; +// symbol: ?JungleWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const JungleWood; + // symbol: ?Kelp@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const Kelp; @@ -1324,12 +1369,6 @@ MCAPI extern class HashedString const LargeAmethystBud; // symbol: ?Lava@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const Lava; -// symbol: ?Leaves@VanillaBlockTypeIds@@3VHashedString@@B -MCAPI extern class HashedString const Leaves; - -// symbol: ?Leaves2@VanillaBlockTypeIds@@3VHashedString@@B -MCAPI extern class HashedString const Leaves2; - // symbol: ?Lectern@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const Lectern; @@ -1657,21 +1696,33 @@ MCAPI extern class HashedString const NormalStoneStairs; // symbol: ?Noteblock@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const Noteblock; +// symbol: ?OakDoubleSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const OakDoubleSlab; + // symbol: ?OakFence@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const OakFence; // symbol: ?OakHangingSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const OakHangingSign; +// symbol: ?OakLeaves@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const OakLeaves; + // symbol: ?OakLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const OakLog; // symbol: ?OakPlanks@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const OakPlanks; +// symbol: ?OakSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const OakSlab; + // symbol: ?OakStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const OakStairs; +// symbol: ?OakWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const OakWood; + // symbol: ?Observer@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const Observer; @@ -2188,6 +2239,9 @@ MCAPI extern class HashedString const SpruceButton; // symbol: ?SpruceDoor@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const SpruceDoor; +// symbol: ?SpruceDoubleSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const SpruceDoubleSlab; + // symbol: ?SpruceFence@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const SpruceFence; @@ -2197,6 +2251,9 @@ MCAPI extern class HashedString const SpruceFenceGate; // symbol: ?SpruceHangingSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const SpruceHangingSign; +// symbol: ?SpruceLeaves@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const SpruceLeaves; + // symbol: ?SpruceLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const SpruceLog; @@ -2206,6 +2263,9 @@ MCAPI extern class HashedString const SprucePlanks; // symbol: ?SprucePressurePlate@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const SprucePressurePlate; +// symbol: ?SpruceSlab@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const SpruceSlab; + // symbol: ?SpruceStairs@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const SpruceStairs; @@ -2218,6 +2278,9 @@ MCAPI extern class HashedString const SpruceTrapdoor; // symbol: ?SpruceWallSign@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const SpruceWallSign; +// symbol: ?SpruceWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const SpruceWood; + // symbol: ?StandingBanner@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StandingBanner; @@ -2269,12 +2332,18 @@ MCAPI extern class HashedString const StonecutterBlock; // symbol: ?StrippedAcaciaLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedAcaciaLog; +// symbol: ?StrippedAcaciaWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const StrippedAcaciaWood; + // symbol: ?StrippedBambooBlock@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedBambooBlock; // symbol: ?StrippedBirchLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedBirchLog; +// symbol: ?StrippedBirchWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const StrippedBirchWood; + // symbol: ?StrippedCherryLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedCherryLog; @@ -2290,9 +2359,15 @@ MCAPI extern class HashedString const StrippedCrimsonStem; // symbol: ?StrippedDarkOakLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedDarkOakLog; +// symbol: ?StrippedDarkOakWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const StrippedDarkOakWood; + // symbol: ?StrippedJungleLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedJungleLog; +// symbol: ?StrippedJungleWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const StrippedJungleWood; + // symbol: ?StrippedMangroveLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedMangroveLog; @@ -2302,9 +2377,15 @@ MCAPI extern class HashedString const StrippedMangroveWood; // symbol: ?StrippedOakLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedOakLog; +// symbol: ?StrippedOakWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const StrippedOakWood; + // symbol: ?StrippedSpruceLog@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedSpruceLog; +// symbol: ?StrippedSpruceWood@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const StrippedSpruceWood; + // symbol: ?StrippedWarpedHyphae@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const StrippedWarpedHyphae; @@ -2416,6 +2497,9 @@ MCAPI extern class HashedString const UnpoweredComparator; // symbol: ?UnpoweredRepeater@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const UnpoweredRepeater; +// symbol: ?Vault@VanillaBlockTypeIds@@3VHashedString@@B +MCAPI extern class HashedString const Vault; + // symbol: ?VerdantFroglight@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const VerdantFroglight; @@ -2686,9 +2770,6 @@ MCAPI extern class HashedString const WhiteWool; // symbol: ?WitherRose@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const WitherRose; -// symbol: ?Wood@VanillaBlockTypeIds@@3VHashedString@@B -MCAPI extern class HashedString const Wood; - // symbol: ?WoodenButton@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const WoodenButton; @@ -2698,9 +2779,6 @@ MCAPI extern class HashedString const WoodenDoor; // symbol: ?WoodenPressurePlate@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const WoodenPressurePlate; -// symbol: ?WoodenSlab@VanillaBlockTypeIds@@3VHashedString@@B -MCAPI extern class HashedString const WoodenSlab; - // symbol: ?YellowCandle@VanillaBlockTypeIds@@3VHashedString@@B MCAPI extern class HashedString const YellowCandle; diff --git a/src/mc/world/level/block/utils/VanillaBlockUpdater.h b/src/mc/world/level/block/utils/VanillaBlockUpdater.h index 0b68221838..28d4f324de 100644 --- a/src/mc/world/level/block/utils/VanillaBlockUpdater.h +++ b/src/mc/world/level/block/utils/VanillaBlockUpdater.h @@ -82,6 +82,9 @@ class VanillaBlockUpdater { // symbol: ?addUpdaters_1_20_60@VanillaBlockUpdater@@CAXAEAVCompoundTagUpdaterContext@@@Z MCAPI static void addUpdaters_1_20_60(class CompoundTagUpdaterContext&); + // symbol: ?addUpdaters_1_20_70@VanillaBlockUpdater@@CAXAEAVCompoundTagUpdaterContext@@@Z + MCAPI static void addUpdaters_1_20_70(class CompoundTagUpdaterContext&); + // NOLINTEND private: diff --git a/src/mc/world/level/block/utils/blockEvents/BlockFallOnEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockFallOnEvent.h new file mode 100644 index 0000000000..15c493914f --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockFallOnEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockFallOnEvent { +public: + // prevent constructor by default + BlockFallOnEvent& operator=(BlockFallOnEvent const&); + BlockFallOnEvent(BlockFallOnEvent const&); + BlockFallOnEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockFallOnEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockFallOnEventComponent.h new file mode 100644 index 0000000000..94c66f64a2 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockFallOnEventComponent.h @@ -0,0 +1,34 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated forward declare list +// clang-format off +class Block; +class BlockLegacy; +// clang-format on + +namespace BlockEvents { + +class BlockFallOnEventComponent { +public: + // prevent constructor by default + BlockFallOnEventComponent& operator=(BlockFallOnEventComponent const&); + BlockFallOnEventComponent(BlockFallOnEventComponent const&); + BlockFallOnEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockFallOnEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockFallOnEventComponent() = default; + + // symbol: ??0BlockFallOnEventComponent@BlockEvents@@QEAA@V?$not_null@PEAVBlock@@@gsl@@@Z + MCAPI explicit BlockFallOnEventComponent(gsl::not_null); + + // symbol: ??0BlockFallOnEventComponent@BlockEvents@@QEAA@V?$not_null@PEAVBlockLegacy@@@gsl@@@Z + MCAPI explicit BlockFallOnEventComponent(gsl::not_null); + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlaceEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlaceEvent.h new file mode 100644 index 0000000000..6b910f791f --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlaceEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockPlaceEvent { +public: + // prevent constructor by default + BlockPlaceEvent& operator=(BlockPlaceEvent const&); + BlockPlaceEvent(BlockPlaceEvent const&); + BlockPlaceEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlaceEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlaceEventComponent.h new file mode 100644 index 0000000000..9f42fc14be --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlaceEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockPlaceEventComponent { +public: + // prevent constructor by default + BlockPlaceEventComponent& operator=(BlockPlaceEventComponent const&); + BlockPlaceEventComponent(BlockPlaceEventComponent const&); + BlockPlaceEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockPlaceEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockPlaceEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlayerDestroyEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlayerDestroyEvent.h new file mode 100644 index 0000000000..e9a2af1e25 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlayerDestroyEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockPlayerDestroyEvent { +public: + // prevent constructor by default + BlockPlayerDestroyEvent& operator=(BlockPlayerDestroyEvent const&); + BlockPlayerDestroyEvent(BlockPlayerDestroyEvent const&); + BlockPlayerDestroyEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlayerDestroyEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlayerDestroyEventComponent.h new file mode 100644 index 0000000000..b582490562 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlayerDestroyEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockPlayerDestroyEventComponent { +public: + // prevent constructor by default + BlockPlayerDestroyEventComponent& operator=(BlockPlayerDestroyEventComponent const&); + BlockPlayerDestroyEventComponent(BlockPlayerDestroyEventComponent const&); + BlockPlayerDestroyEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockPlayerDestroyEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockPlayerDestroyEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlayerInteractEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlayerInteractEvent.h new file mode 100644 index 0000000000..b540c893e5 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlayerInteractEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockPlayerInteractEvent { +public: + // prevent constructor by default + BlockPlayerInteractEvent& operator=(BlockPlayerInteractEvent const&); + BlockPlayerInteractEvent(BlockPlayerInteractEvent const&); + BlockPlayerInteractEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlayerInteractEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlayerInteractEventComponent.h new file mode 100644 index 0000000000..60aea16905 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlayerInteractEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockPlayerInteractEventComponent { +public: + // prevent constructor by default + BlockPlayerInteractEventComponent& operator=(BlockPlayerInteractEventComponent const&); + BlockPlayerInteractEventComponent(BlockPlayerInteractEventComponent const&); + BlockPlayerInteractEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockPlayerInteractEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockPlayerInteractEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlayerPlacingEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlayerPlacingEvent.h new file mode 100644 index 0000000000..912b2c71c5 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlayerPlacingEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockPlayerPlacingEvent { +public: + // prevent constructor by default + BlockPlayerPlacingEvent& operator=(BlockPlayerPlacingEvent const&); + BlockPlayerPlacingEvent(BlockPlayerPlacingEvent const&); + BlockPlayerPlacingEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockPlayerPlacingEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockPlayerPlacingEventComponent.h new file mode 100644 index 0000000000..f30617014d --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockPlayerPlacingEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockPlayerPlacingEventComponent { +public: + // prevent constructor by default + BlockPlayerPlacingEventComponent& operator=(BlockPlayerPlacingEventComponent const&); + BlockPlayerPlacingEventComponent(BlockPlayerPlacingEventComponent const&); + BlockPlayerPlacingEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockPlayerPlacingEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockPlayerPlacingEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockQueuedTickEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockQueuedTickEvent.h new file mode 100644 index 0000000000..fb5a464291 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockQueuedTickEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockQueuedTickEvent { +public: + // prevent constructor by default + BlockQueuedTickEvent& operator=(BlockQueuedTickEvent const&); + BlockQueuedTickEvent(BlockQueuedTickEvent const&); + BlockQueuedTickEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockQueuedTickEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockQueuedTickEventComponent.h new file mode 100644 index 0000000000..be85035cd9 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockQueuedTickEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockQueuedTickEventComponent { +public: + // prevent constructor by default + BlockQueuedTickEventComponent& operator=(BlockQueuedTickEventComponent const&); + BlockQueuedTickEventComponent(BlockQueuedTickEventComponent const&); + BlockQueuedTickEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockQueuedTickEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockQueuedTickEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockRandomTickEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockRandomTickEvent.h new file mode 100644 index 0000000000..8059449cfb --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockRandomTickEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockRandomTickEvent { +public: + // prevent constructor by default + BlockRandomTickEvent& operator=(BlockRandomTickEvent const&); + BlockRandomTickEvent(BlockRandomTickEvent const&); + BlockRandomTickEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockRandomTickEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockRandomTickEventComponent.h new file mode 100644 index 0000000000..1f5766efe7 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockRandomTickEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockRandomTickEventComponent { +public: + // prevent constructor by default + BlockRandomTickEventComponent& operator=(BlockRandomTickEventComponent const&); + BlockRandomTickEventComponent(BlockRandomTickEventComponent const&); + BlockRandomTickEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockRandomTickEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockRandomTickEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockStepOffEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockStepOffEvent.h new file mode 100644 index 0000000000..1137aecfa5 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockStepOffEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockStepOffEvent { +public: + // prevent constructor by default + BlockStepOffEvent& operator=(BlockStepOffEvent const&); + BlockStepOffEvent(BlockStepOffEvent const&); + BlockStepOffEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockStepOffEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockStepOffEventComponent.h new file mode 100644 index 0000000000..dbfa6ea3bb --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockStepOffEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockStepOffEventComponent { +public: + // prevent constructor by default + BlockStepOffEventComponent& operator=(BlockStepOffEventComponent const&); + BlockStepOffEventComponent(BlockStepOffEventComponent const&); + BlockStepOffEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockStepOffEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockStepOffEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockStepOnEvent.h b/src/mc/world/level/block/utils/blockEvents/BlockStepOnEvent.h new file mode 100644 index 0000000000..8a214b7563 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockStepOnEvent.h @@ -0,0 +1,15 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +struct BlockStepOnEvent { +public: + // prevent constructor by default + BlockStepOnEvent& operator=(BlockStepOnEvent const&); + BlockStepOnEvent(BlockStepOnEvent const&); + BlockStepOnEvent(); +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/blockEvents/BlockStepOnEventComponent.h b/src/mc/world/level/block/utils/blockEvents/BlockStepOnEventComponent.h new file mode 100644 index 0000000000..466f9d47d5 --- /dev/null +++ b/src/mc/world/level/block/utils/blockEvents/BlockStepOnEventComponent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +namespace BlockEvents { + +class BlockStepOnEventComponent { +public: + // prevent constructor by default + BlockStepOnEventComponent& operator=(BlockStepOnEventComponent const&); + BlockStepOnEventComponent(BlockStepOnEventComponent const&); + BlockStepOnEventComponent(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1BlockStepOnEventComponent@BlockEvents@@UEAA@XZ + virtual ~BlockStepOnEventComponent() = default; + + // NOLINTEND +}; + +}; // namespace BlockEvents diff --git a/src/mc/world/level/block/utils/updater/Carpet.h b/src/mc/world/level/block/utils/updater/Carpet.h deleted file mode 100644 index f0a382132b..0000000000 --- a/src/mc/world/level/block/utils/updater/Carpet.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Carpet { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Carpet@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Carpet@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Carpet diff --git a/src/mc/world/level/block/utils/updater/Concrete.h b/src/mc/world/level/block/utils/updater/Concrete.h deleted file mode 100644 index 89928b9005..0000000000 --- a/src/mc/world/level/block/utils/updater/Concrete.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Concrete { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Concrete@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Concrete@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Concrete diff --git a/src/mc/world/level/block/utils/updater/ConcretePowder.h b/src/mc/world/level/block/utils/updater/ConcretePowder.h deleted file mode 100644 index 472ef9afef..0000000000 --- a/src/mc/world/level/block/utils/updater/ConcretePowder.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::ConcretePowder { -// NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@ConcretePowder@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@ConcretePowder@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::ConcretePowder diff --git a/src/mc/world/level/block/utils/updater/Coral.h b/src/mc/world/level/block/utils/updater/Coral.h deleted file mode 100644 index dbaba238cd..0000000000 --- a/src/mc/world/level/block/utils/updater/Coral.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/enums/CoralColor.h" -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Coral { -// NOLINTBEGIN -// symbol: -// ?getColorSplitStates@Coral@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@_N@Z -MCAPI std::vector getColorSplitStates(bool dead); - -// symbol: ?getComplexAliasCallback@Coral@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getDeadSplitStates@Coral@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@W4CoralColor@@@Z -MCAPI std::vector getDeadSplitStates(::CoralColor color); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Coral diff --git a/src/mc/world/level/block/utils/updater/Fence.h b/src/mc/world/level/block/utils/updater/Fence.h deleted file mode 100644 index 18c2f82262..0000000000 --- a/src/mc/world/level/block/utils/updater/Fence.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Fence { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Fence@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Fence@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Fence diff --git a/src/mc/world/level/block/utils/updater/HardStainedGlass.h b/src/mc/world/level/block/utils/updater/HardStainedGlass.h deleted file mode 100644 index 3e89eb1b9d..0000000000 --- a/src/mc/world/level/block/utils/updater/HardStainedGlass.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::HardStainedGlass { -// NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@HardStainedGlass@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@HardStainedGlass@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::HardStainedGlass diff --git a/src/mc/world/level/block/utils/updater/HardStainedGlassPane.h b/src/mc/world/level/block/utils/updater/HardStainedGlassPane.h deleted file mode 100644 index 4a0259c75c..0000000000 --- a/src/mc/world/level/block/utils/updater/HardStainedGlassPane.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::HardStainedGlassPane { -// NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@HardStainedGlassPane@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@HardStainedGlassPane@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::HardStainedGlassPane diff --git a/src/mc/world/level/block/utils/updater/Log.h b/src/mc/world/level/block/utils/updater/Log.h deleted file mode 100644 index 88ae888bdf..0000000000 --- a/src/mc/world/level/block/utils/updater/Log.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Log { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Log@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Log@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Log diff --git a/src/mc/world/level/block/utils/updater/Log2.h b/src/mc/world/level/block/utils/updater/Log2.h deleted file mode 100644 index ca251ee168..0000000000 --- a/src/mc/world/level/block/utils/updater/Log2.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Log2 { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Log2@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Log2@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Log2 diff --git a/src/mc/world/level/block/utils/updater/Planks.h b/src/mc/world/level/block/utils/updater/Planks.h deleted file mode 100644 index a296f94a56..0000000000 --- a/src/mc/world/level/block/utils/updater/Planks.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Planks { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Planks@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Planks@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Planks diff --git a/src/mc/world/level/block/utils/updater/ShulkerBox.h b/src/mc/world/level/block/utils/updater/ShulkerBox.h deleted file mode 100644 index f702faeaa3..0000000000 --- a/src/mc/world/level/block/utils/updater/ShulkerBox.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::ShulkerBox { -// NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@ShulkerBox@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@ShulkerBox@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::ShulkerBox diff --git a/src/mc/world/level/block/utils/updater/StainedGlass.h b/src/mc/world/level/block/utils/updater/StainedGlass.h deleted file mode 100644 index eac45c73d9..0000000000 --- a/src/mc/world/level/block/utils/updater/StainedGlass.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::StainedGlass { -// NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@StainedGlass@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@StainedGlass@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::StainedGlass diff --git a/src/mc/world/level/block/utils/updater/StainedGlassPane.h b/src/mc/world/level/block/utils/updater/StainedGlassPane.h deleted file mode 100644 index d50d34c8eb..0000000000 --- a/src/mc/world/level/block/utils/updater/StainedGlassPane.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::StainedGlassPane { -// NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@StainedGlassPane@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@StainedGlassPane@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::StainedGlassPane diff --git a/src/mc/world/level/block/utils/updater/Stone.h b/src/mc/world/level/block/utils/updater/Stone.h deleted file mode 100644 index 9645707d1c..0000000000 --- a/src/mc/world/level/block/utils/updater/Stone.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Stone { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Stone@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Stone@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Stone diff --git a/src/mc/world/level/block/utils/updater/Terracotta.h b/src/mc/world/level/block/utils/updater/Terracotta.h deleted file mode 100644 index 1267ee9bbf..0000000000 --- a/src/mc/world/level/block/utils/updater/Terracotta.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Terracotta { -// NOLINTBEGIN -// symbol: -// ?getComplexAliasCallback@Terracotta@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Terracotta@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Terracotta diff --git a/src/mc/world/level/block/utils/updater/VanillaComplexAliasBlockUtils.h b/src/mc/world/level/block/utils/updater/VanillaComplexAliasBlockUtils.h deleted file mode 100644 index 6e283be6a1..0000000000 --- a/src/mc/world/level/block/utils/updater/VanillaComplexAliasBlockUtils.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/enums/CoralColor.h" -#include "mc/world/level/block/BlockLegacy.h" - -namespace VanillaComplexAliasBlockUtils {}; diff --git a/src/mc/world/level/block/utils/updater/Wool.h b/src/mc/world/level/block/utils/updater/Wool.h deleted file mode 100644 index fc8752590e..0000000000 --- a/src/mc/world/level/block/utils/updater/Wool.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/block/BlockLegacy.h" - -// auto generated forward declare list -// clang-format off -class Block; -// clang-format on - -namespace VanillaComplexAliasBlockUtils::Wool { -// NOLINTBEGIN -// symbol: ?getComplexAliasCallback@Wool@VanillaComplexAliasBlockUtils@@YA?AV?$function@$$A6APEBVBlock@@H@Z@std@@XZ -MCAPI std::function getComplexAliasCallback(); - -// symbol: -// ?getSplitStates@Wool@VanillaComplexAliasBlockUtils@@YA?AV?$vector@USplitBlock@RemovedStateCollection@BlockLegacy@@V?$allocator@USplitBlock@RemovedStateCollection@BlockLegacy@@@std@@@std@@XZ -MCAPI std::vector getSplitStates(); -// NOLINTEND - -}; // namespace VanillaComplexAliasBlockUtils::Wool diff --git a/src/mc/world/level/chunk/ChunkBlenderFactory.h b/src/mc/world/level/chunk/ChunkBlenderFactory.h index 7ab1307d5e..9dd5b97ba0 100644 --- a/src/mc/world/level/chunk/ChunkBlenderFactory.h +++ b/src/mc/world/level/chunk/ChunkBlenderFactory.h @@ -49,7 +49,7 @@ class ChunkBlenderFactory { // ?_finalizeChunkAttenuationData@ChunkBlenderFactory@@AEBA?AV?$vector@V?$array@UAttenuationData@ChunkBlenderUtil@@$03@std@@V?$allocator@V?$array@UAttenuationData@ChunkBlenderUtil@@$03@std@@@2@@std@@AEBV?$vector@V?$array@UIntermediateAttenuationData@ChunkBlenderFactory@@$03@std@@V?$allocator@V?$array@UIntermediateAttenuationData@ChunkBlenderFactory@@$03@std@@@2@@3@@Z MCAPI std::vector> _finalizeChunkAttenuationData(std::vector< - std::array> const&) const; + std::array> const&) const; // symbol: // ?_processDensityColumn@ChunkBlenderFactory@@AEBAXAEAV?$vector@V?$array@UIntermediateAttenuationData@ChunkBlenderFactory@@$03@std@@V?$allocator@V?$array@UIntermediateAttenuationData@ChunkBlenderFactory@@$03@std@@@2@@std@@AEBVBlendingData@@MU?$pair@HH@3@2_N@Z diff --git a/src/mc/world/level/chunk/LevelChunk.h b/src/mc/world/level/chunk/LevelChunk.h index f24d5f92a7..d6b901368d 100644 --- a/src/mc/world/level/chunk/LevelChunk.h +++ b/src/mc/world/level/chunk/LevelChunk.h @@ -146,9 +146,6 @@ class LevelChunk { // symbol: ?deserializeFinalization@LevelChunk@@QEAAXAEAVIDataInput@@@Z MCAPI void deserializeFinalization(class IDataInput& stream); - // symbol: ?deserializeHardcodedSpawners@LevelChunk@@QEAAXAEAVIDataInput@@@Z - MCAPI void deserializeHardcodedSpawners(class IDataInput& stream); - // symbol: ?deserializeKey@LevelChunk@@QEAA_NV?$basic_string_view@DU?$char_traits@D@std@@@std@@0@Z MCAPI bool deserializeKey(std::string_view key, std::string_view value); @@ -354,6 +351,9 @@ class LevelChunk { // symbol: ?getSubChunk@LevelChunk@@QEBAPEBUSubChunk@@F@Z MCAPI struct SubChunk const* getSubChunk(short) const; + // symbol: ?getSubChunkAbsoluteIndexFromSubChunkIndex@LevelChunk@@QEBAF_K@Z + MCAPI short getSubChunkAbsoluteIndexFromSubChunkIndex(uint64) const; + // symbol: ?getSurfaceBiome@LevelChunk@@QEBAAEBVBiome@@VChunkBlockPos@@@Z MCAPI class Biome const& getSurfaceBiome(class ChunkBlockPos pos) const; @@ -472,15 +472,6 @@ class LevelChunk { // symbol: ?removeHardcodedSpawningArea@LevelChunk@@QEAAXW4HardcodedSpawnAreaType@@@Z MCAPI void removeHardcodedSpawningArea(::HardcodedSpawnAreaType type); - // symbol: - // ?runtimeRelightSubchunk@LevelChunk@@QEAAXAEAVBlockSource@@_KAEBV?$vector@USubChunkLightUpdate@@V?$allocator@USubChunkLightUpdate@@@std@@@std@@AEAV?$vector@VBlockPos@@V?$allocator@VBlockPos@@@std@@@4@@Z - MCAPI void runtimeRelightSubchunk( - class BlockSource& region, - uint64 subChunkIdx, - std::vector const& alteredBlockList, - std::vector& brightnessChangedList - ); - // symbol: ?serialize2DMaps@LevelChunk@@QEBAXAEAVIDataOutput@@@Z MCAPI void serialize2DMaps(class IDataOutput& stream) const; diff --git a/src/mc/world/level/chunk/SubChunkRelighter.h b/src/mc/world/level/chunk/SubChunkRelighter.h index d0b075300f..678fd78cd3 100644 --- a/src/mc/world/level/chunk/SubChunkRelighter.h +++ b/src/mc/world/level/chunk/SubChunkRelighter.h @@ -14,15 +14,21 @@ class SubChunkRelighter { public: // NOLINTBEGIN - // symbol: ??0SubChunkRelighter@@QEAA@AEAVBlockSource@@_KAEBVChunkPos@@_N3@Z + // symbol: ??0SubChunkRelighter@@QEAA@AEAVIBlockSource@@_KAEBVChunkPos@@_N3@Z MCAPI SubChunkRelighter( - class BlockSource& source, + class IBlockSource& source, uint64 centerSubChunkIndex, class ChunkPos const& centerChunkPos, bool originalLighting, bool useFullyDarkSubchunk ); + // symbol: ?_checkEdgeForSubtractiveBlockLightProcessing@SubChunkRelighter@@QEAAXAEBUSubChunkLightIndex@@@Z + MCAPI void _checkEdgeForSubtractiveBlockLightProcessing(struct SubChunkLightIndex const&); + + // symbol: ?_checkEdgeForSubtractiveSkyLightProcessing@SubChunkRelighter@@QEAAXAEBUSubChunkLightIndex@@@Z + MCAPI void _checkEdgeForSubtractiveSkyLightProcessing(struct SubChunkLightIndex const&); + // symbol: ?_getAbsorption@SubChunkRelighter@@QEBAPEAUSubChunk@@USubChunkLightIndex@@AEAE@Z MCAPI struct SubChunk* _getAbsorption(struct SubChunkLightIndex coordIndex, uchar& absorption) const; @@ -90,8 +96,10 @@ class SubChunkRelighter { MCAPI struct SubChunkBrightnessStorage::LightPair getLightPairWithPlaceholderCheck(class Pos const& coord, struct SubChunkBrightnessStorage::LightPair const&) const; - // symbol: ?getTouchedSubChunks@SubChunkRelighter@@QEAAXAEAV?$vector@VPos@@V?$allocator@VPos@@@std@@@std@@@Z - MCAPI void getTouchedSubChunks(std::vector& subChunkPosList); + // symbol: + // ?relightSubChunk@SubChunkRelighter@@QEAAXAEBVLevelChunk@@AEBV?$vector@USubChunkLightUpdate@@V?$allocator@USubChunkLightUpdate@@@std@@@std@@AEAV?$vector@VBlockPos@@V?$allocator@VBlockPos@@@std@@@4@@Z + MCAPI void + relightSubChunk(class LevelChunk const&, std::vector const&, std::vector&); // symbol: ?setBlockLight@SubChunkRelighter@@QEAAXAEBVPos@@UBrightness@@111@Z MCAPI void setBlockLight( diff --git a/src/mc/world/level/dimension/ActorDimensionTransferProxy.h b/src/mc/world/level/dimension/ActorDimensionTransferProxy.h new file mode 100644 index 0000000000..ad51355560 --- /dev/null +++ b/src/mc/world/level/dimension/ActorDimensionTransferProxy.h @@ -0,0 +1,39 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/world/level/dimension/IActorDimensionTransferProxy.h" + +class ActorDimensionTransferProxy : public ::IActorDimensionTransferProxy { +public: + // prevent constructor by default + ActorDimensionTransferProxy& operator=(ActorDimensionTransferProxy const&); + ActorDimensionTransferProxy(ActorDimensionTransferProxy const&); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ActorDimensionTransferProxy@@UEAA@XZ + virtual ~ActorDimensionTransferProxy() = default; + + // vIndex: 1, symbol: ?transferTickingArea@ActorDimensionTransferProxy@@UEBAXAEAVActor@@AEAVDimension@@@Z + virtual void transferTickingArea(class Actor&, class Dimension&) const; + + // vIndex: 2, symbol: ?removeActorFromLevelChunk@ActorDimensionTransferProxy@@UEBAXAEAVActor@@@Z + virtual void removeActorFromLevelChunk(class Actor&) const; + + // vIndex: 3, symbol: + // ?transferActorToDimension@ActorDimensionTransferProxy@@UEBAXAEBVActor@@AEAVDimension@@AEBVVec3@@V?$unique_ptr@VCompoundTag@@U?$default_delete@VCompoundTag@@@std@@@std@@_N@Z + virtual void transferActorToDimension( + class Actor const&, + class Dimension&, + class Vec3 const&, + std::unique_ptr, + bool + ) const; + + // symbol: ??0ActorDimensionTransferProxy@@QEAA@XZ + MCAPI ActorDimensionTransferProxy(); + + // NOLINTEND +}; diff --git a/src/mc/world/level/dimension/ActorDimensionTransferer.h b/src/mc/world/level/dimension/ActorDimensionTransferer.h new file mode 100644 index 0000000000..f74df7d18f --- /dev/null +++ b/src/mc/world/level/dimension/ActorDimensionTransferer.h @@ -0,0 +1,40 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +// auto generated inclusion list +#include "mc/common/wrapper/StackRefResult.h" +#include "mc/world/AutomaticID.h" +#include "mc/world/level/dimension/IActorDimensionTransferer.h" + +class ActorDimensionTransferer : public ::IActorDimensionTransferer { +public: + // prevent constructor by default + ActorDimensionTransferer& operator=(ActorDimensionTransferer const&); + ActorDimensionTransferer(ActorDimensionTransferer const&); + ActorDimensionTransferer(); + +public: + // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1ActorDimensionTransferer@@UEAA@XZ + virtual ~ActorDimensionTransferer() = default; + + // vIndex: 1, symbol: ?setupActorForTransfer@ActorDimensionTransferer@@UEAAXAEAVActor@@@Z + virtual void setupActorForTransfer(class Actor&); + + // vIndex: 2, symbol: + // ?findTargetPositionAndSetPosition@ActorDimensionTransferer@@UEAA?AVVec3@@AEAVActor@@V?$AutomaticID@VDimension@@H@@1AEBVIDimension@@AEBVPortalForcer@@AEBV?$optional@VVec3@@@std@@@Z + virtual class Vec3 + findTargetPositionAndSetPosition(class Actor&, DimensionType, DimensionType, class IDimension const&, class PortalForcer const&, std::optional const&); + + // vIndex: 3, symbol: + // ?transferActor@ActorDimensionTransferer@@UEAAXAEAVActor@@AEAVDimension@@AEBVVec3@@AEBV?$optional@VVec3@@@std@@@Z + virtual void transferActor(class Actor&, class Dimension&, class Vec3 const&, std::optional const&); + + // symbol: + // ??0ActorDimensionTransferer@@QEAA@V?$unique_ptr@VIActorDimensionTransferProxy@@U?$default_delete@VIActorDimensionTransferProxy@@@std@@@std@@AEBV?$not_null@V?$StackRefResult@VActorManager@@@@@gsl@@@Z + MCAPI + ActorDimensionTransferer(std::unique_ptr, gsl::not_null> const&); + + // NOLINTEND +}; diff --git a/src/mc/world/level/dimension/Dimension.h b/src/mc/world/level/dimension/Dimension.h index 6bc79cef6a..56d2461e5d 100644 --- a/src/mc/world/level/dimension/Dimension.h +++ b/src/mc/world/level/dimension/Dimension.h @@ -1,21 +1,6 @@ #pragma once #include "mc/_HeaderOutputPredefine.h" -#include "mc/common/BrightnessPair.h" -#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" -#include "mc/enums/StorageVersion.h" -#include "mc/network/packet/UpdateSubChunkBlocksPacket.h" -#include "mc/world/level/ChunkPos.h" -#include "mc/world/level/LevelListener.h" -#include "mc/world/level/SubChunkPos.h" -#include "mc/world/level/chunk/ChunkKey.h" -#include "mc/world/level/chunk/LevelChunkGarbageCollector.h" -#include "mc/world/level/dimension/ActorChunkTransferEntry.h" -#include "mc/world/level/dimension/ActorUnloadedChunkTransferEntry.h" -#include "mc/world/level/dimension/DimensionHeightRange.h" -#include "mc/world/level/dimension/IDimension.h" -#include "mc/world/level/levelgen/v1/FeatureTerrainAdjustments.h" -#include "mc/world/level/saveddata/SavedData.h" // auto generated inclusion list #include "mc/common/wrapper/OwnerPtr.h" @@ -30,36 +15,7 @@ namespace br::worldgen { class StructureSetRegistry; } namespace mce { class Color; } // clang-format on -class ServerPlayer; -class BaseLightTextureImageBuilder; -class DimensionBrightnessRamp; -class LevelChunkMetaData; -class TaskGroup; -class PostprocessingManager; -class SubChunkInterlocker; -class WireframeQueue; -class RuntimeLightingManager; -class LevelChunkBuilderData; -class BlockEventDispatcher; -class TickingAreaList; -class WorldGenerator; -class Weather; -class Seasons; -class GameEventDispatcher; -class ChunkBuildOrderPolicyBase; -class VillageManager; -class CircuitSystem; -struct NetworkIdentifierWithSubId; -class ChunkLoadActionList; -class DelayActionList; -class ILevel; -class ChunkSource; - -class Dimension : public IDimension, - public LevelListener, - public SavedData, - public Bedrock::EnableNonOwnerReferences, - public std::enable_shared_from_this { +class Dimension { public: // Dimension inner types declare // clang-format off @@ -68,13 +24,11 @@ class Dimension : public IDimension, // Dimension inner types define struct PlayerReplicationStructures { - struct PlayerAtChunk { - ChunkPos chunkPos; // this+0x0 - ushort playerIndex{}; // this+0x8 - }; - std::unordered_map> mPlayersAtChunks; // this+0x0 - std::vector mPlayerInterestMap; // this+0x40 - std::vector> unwrappedPlayerList; // this+0x58 + public: + // prevent constructor by default + PlayerReplicationStructures& operator=(PlayerReplicationStructures const&); + PlayerReplicationStructures(PlayerReplicationStructures const&); + PlayerReplicationStructures(); public: // NOLINTBEGIN @@ -86,70 +40,6 @@ class Dimension : public IDimension, // NOLINTEND }; - std::vector mActorChunkTransferQueue; // this+0x68 - std::unordered_map> - mActorUnloadedChunkTransferQueue; // this+0x80 - - ILevel& mLevel; // this+0xC0 - DimensionHeightRange mHeightRange; // this+0xC4 - short mSeaLevel; // this+0xCC - uchar mBlockSource[8]; // this+0xCE - float mMobsPerChunkSurface[8]; // this+0xE0 - float mMobsPerChunkUnderground[8]; // this+0xF8 - BrightnessPair mDefaultBrightness; // this+0x118 - std::unique_ptr mLightTextureImageBuilder; // this+0x120 - std::unique_ptr mDimensionBrightnessRamp; // this+0x128 - std::shared_ptr mTargetMetaData; // this+0x130 - std::string mName; // this+0x140 - DimensionType mId; // this+0x160 - bool mUltraWarm; // this+0x164 - bool mHasCeiling; // this+0x165 - bool mHasWeather; // this+0x166 - bool mHasSkylight; // this+0x167 - Brightness mSkyDarken; // this+0x168 - std::unique_ptr mDispatcher; // this+0x170 - std::unique_ptr mTaskGroup; // this+0x178 - std::unique_ptr mChunkGenTaskGroup; // this+0x180 - std::unique_ptr mPostProcessingManager; // this+0x188 - std::unique_ptr mSubChunkInterlocker; // this+0x190 - std::unique_ptr mChunkSource; // this+0x198 - WorldGenerator* mWorldGenerator; // this+0x1A0 - std::unique_ptr mWeather; // this+0x1A8 - std::unique_ptr mSeasons; // this+0x1B0 - std::unique_ptr mGameEventDispatcher; // this+0x1B8 - std::unique_ptr mCircuitSystem; // this+0x1C0 - int CIRCUIT_TICK_RATE; // this+0x1C8 - int mCircuitSystemTickRate; // this+0x1CC - std::unordered_map mActorIDEntityIDMap; // this+0x1D0 - std::vector mDisplayEntities; // this+0x210 - std::shared_ptr mWireframeQueue; // this+0x228 - FeatureTerrainAdjustments mFeatureTerrainAdjustments; // this+0x238 - - std::unordered_map>> mLimboEntities; // this+0x280 - - std::set mEntitiesToMoveChunks; // this+0x2C0 - std::shared_ptr mTickingAreaList; // this+0x2D0 - LevelChunkGarbageCollector mLevelChunkGarbageCollector; // this+0x2E0 - std::set mWitherIDs; // this+0x558 - std::unique_ptr mRuntimeLightingManager; // this+0x568 - std::unique_ptr mLevelChunkBuilderData; // this+0x570 - std::chrono::steady_clock::time_point mLastPruneTime; // this+0x578 - std::unique_ptr mChunkBuildOrderPolicy; // this+0x580 - std::unique_ptr mVillageManager; // this+0x588 - std::vector mTemporaryPlayerIds; // this+0x590 - std::unique_ptr mChunkLoadActionList; // this+0x5A8 - std::unique_ptr mDelayActionList; // this+0x5B0 - - std::unordered_map - mBlocksChangedBySubChunkMap; // this+0x5B8 - - // Scripting::StrongObjectHandle - uchar mClientScriptDimension[0x48]; // this+0x5F8 - - std::unique_ptr mReplicationStructures; // this+0x640 - std::vector mPlayersToReplicate; // this+0x648 - bool mRunChunkGenWatchDog; // this+0x660 - public: // prevent constructor by default Dimension& operator=(Dimension const&); @@ -158,139 +48,100 @@ class Dimension : public IDimension, public: // NOLINTBEGIN - // symbol: ??1Dimension@@UEAA@XZ - virtual ~Dimension(); - - // vIndex: 1, symbol: ?isNaturalDimension@Dimension@@UEBA_NXZ - virtual bool isNaturalDimension() const; - - // vIndex: 2, symbol: ?getDimensionId@Dimension@@UEBA?AV?$AutomaticID@VDimension@@H@@XZ - virtual DimensionType getDimensionId() const; - - // vIndex: 3, symbol: ?sendPacketForPosition@Dimension@@UEAAXAEBVBlockPos@@AEBVPacket@@PEBVPlayer@@@Z - virtual void - sendPacketForPosition(class BlockPos const& position, class Packet const& packet, class Player const* except); - - // vIndex: 4, symbol: ?flushLevelChunkGarbageCollector@Dimension@@UEAAXXZ - virtual void flushLevelChunkGarbageCollector(); - - // vIndex: 5, symbol: ?initializeWithLevelStorageManager@Dimension@@UEAAXAEAVLevelStorageManager@@@Z - virtual void initializeWithLevelStorageManager(class LevelStorageManager&); - - // vIndex: 6, symbol: ?getBiomeRegistry@Dimension@@UEAAAEAVBiomeRegistry@@XZ - virtual class BiomeRegistry& getBiomeRegistry(); - - // vIndex: 7, symbol: ?getBiomeRegistry@Dimension@@UEBAAEBVBiomeRegistry@@XZ - virtual class BiomeRegistry const& getBiomeRegistry() const; - - // vIndex: 9, symbol: ?init@Dimension@@UEAAXAEBVStructureSetRegistry@worldgen@br@@@Z - virtual void init(class br::worldgen::StructureSetRegistry const&); - - // vIndex: 10, symbol: ?tick@Dimension@@UEAAXXZ - virtual void tick(); - - // vIndex: 11, symbol: ?tickRedstone@Dimension@@UEAAXXZ - virtual void tickRedstone(); - - // vIndex: 12 - virtual std::unique_ptr createGenerator(class br::worldgen::StructureSetRegistry const&) = 0; + // symbol: + // ?_createChunkBuildOrderPolicy@Dimension@@EEAA?AV?$unique_ptr@VChunkBuildOrderPolicyBase@@U?$default_delete@VChunkBuildOrderPolicyBase@@@std@@@std@@XZ + MCVAPI std::unique_ptr _createChunkBuildOrderPolicy(); - // vIndex: 13 - virtual void - upgradeLevelChunk(class ChunkSource& source, class LevelChunk& lc, class LevelChunk& generatedChunk) = 0; + // symbol: ?deserialize@Dimension@@UEAAXAEBVCompoundTag@@@Z + MCVAPI void deserialize(class CompoundTag const& tag); - // vIndex: 14 - virtual void fixWallChunk(class ChunkSource&, class LevelChunk&) = 0; + // symbol: ?flushLevelChunkGarbageCollector@Dimension@@UEAAXXZ + MCVAPI void flushLevelChunkGarbageCollector(); - // vIndex: 15 - virtual bool levelChunkNeedsUpgrade(class LevelChunk const&) const = 0; + // symbol: ?forEachPlayer@Dimension@@UEBAXV?$function@$$A6A_NAEAVPlayer@@@Z@std@@@Z + MCVAPI void forEachPlayer(std::function callback) const; - // vIndex: 16, symbol: ?isValidSpawn@Dimension@@UEBA_NHH@Z - virtual bool isValidSpawn(int x, int z) const; + // symbol: ?forceCheckAllNeighChunkSavedStat@Dimension@@UEBA_NXZ + MCVAPI bool forceCheckAllNeighChunkSavedStat() const; - // vIndex: 17, symbol: ?getBrightnessDependentFogColor@Dimension@@UEBA?AVColor@mce@@AEBV23@M@Z - virtual class mce::Color getBrightnessDependentFogColor(class mce::Color const& baseColor, float brightness) const; + // symbol: ?getBiomeRegistry@Dimension@@UEBAAEBVBiomeRegistry@@XZ + MCVAPI class BiomeRegistry const& getBiomeRegistry() const; - // vIndex: 18, symbol: ?isFoggyAt@Dimension@@UEBA_NHH@Z - virtual bool isFoggyAt(int x, int z) const; + // symbol: ?getBiomeRegistry@Dimension@@UEAAAEAVBiomeRegistry@@XZ + MCVAPI class BiomeRegistry& getBiomeRegistry(); - // vIndex: 19, symbol: ?hasPrecipitationFog@Dimension@@UEBA_NXZ - virtual bool hasPrecipitationFog() const; + // symbol: ?getBrightnessDependentFogColor@Dimension@@UEBA?AVColor@mce@@AEBV23@M@Z + MCVAPI class mce::Color getBrightnessDependentFogColor(class mce::Color const& baseColor, float brightness) const; - // vIndex: 20, symbol: ?getCloudHeight@Dimension@@UEBAFXZ - virtual short getCloudHeight() const; + // symbol: ?getBrightnessRamp@Dimension@@UEBAAEBVDimensionBrightnessRamp@@XZ + MCVAPI class DimensionBrightnessRamp const& getBrightnessRamp() const; - // vIndex: 21, symbol: ?getDefaultBiome@Dimension@@UEBA?AVHashedString@@XZ - virtual class HashedString getDefaultBiome() const; + // symbol: ?getClearColorScale@Dimension@@UEAAMXZ + MCVAPI float getClearColorScale(); - // vIndex: 22, symbol: ?mayRespawnViaBed@Dimension@@UEBA_NXZ - virtual bool mayRespawnViaBed() const; + // symbol: ?getCloudHeight@Dimension@@UEBAFXZ + MCVAPI short getCloudHeight() const; - // vIndex: 23, symbol: ?hasGround@Dimension@@UEBA_NXZ - virtual bool hasGround() const; + // symbol: ?getDefaultBiome@Dimension@@UEBA?AVHashedString@@XZ + MCVAPI class HashedString getDefaultBiome() const; - // vIndex: 24, symbol: ?getSpawnPos@Dimension@@UEBA?AVBlockPos@@XZ - virtual class BlockPos getSpawnPos() const; + // symbol: ?getDimensionId@Dimension@@UEBA?AV?$AutomaticID@VDimension@@H@@XZ + MCVAPI DimensionType getDimensionId() const; - // vIndex: 25, symbol: ?getSpawnYPosition@Dimension@@UEBAHXZ - virtual int getSpawnYPosition() const; + // symbol: ?getLightTextureImageBuilder@Dimension@@UEBAPEAVBaseLightTextureImageBuilder@@XZ + MCVAPI class BaseLightTextureImageBuilder* getLightTextureImageBuilder() const; - // vIndex: 26, symbol: ?hasBedrockFog@Dimension@@UEAA_NXZ - virtual bool hasBedrockFog(); + // symbol: ?getSpawnPos@Dimension@@UEBA?AVBlockPos@@XZ + MCVAPI class BlockPos getSpawnPos() const; - // vIndex: 27, symbol: ?getClearColorScale@Dimension@@UEAAMXZ - virtual float getClearColorScale(); + // symbol: ?getSpawnYPosition@Dimension@@UEBAHXZ + MCVAPI int getSpawnYPosition() const; - // vIndex: 28, symbol: ?showSky@Dimension@@UEBA_NXZ - virtual bool showSky() const; + // symbol: ?getSunIntensity@Dimension@@UEBAMMAEBVVec3@@M@Z + MCVAPI float getSunIntensity(float a, class Vec3 const& viewVector, float minInfluenceAngle) const; - // vIndex: 29, symbol: ?isDay@Dimension@@UEBA_NXZ - virtual bool isDay() const; + // symbol: ?getTimeOfDay@Dimension@@MEBAMHM@Z + MCVAPI float getTimeOfDay(int time, float a) const; - // vIndex: 30, symbol: ?getTimeOfDay@Dimension@@MEBAMHM@Z - virtual float getTimeOfDay(int time, float a) const; + // symbol: ?hasBedrockFog@Dimension@@UEAA_NXZ + MCVAPI bool hasBedrockFog(); - // vIndex: 31, symbol: ?getSunIntensity@Dimension@@UEBAMMAEBVVec3@@M@Z - virtual float getSunIntensity(float a, class Vec3 const& viewVector, float minInfluenceAngle) const; + // symbol: ?hasGround@Dimension@@UEBA_NXZ + MCVAPI bool hasGround() const; - // vIndex: 32, symbol: ?forceCheckAllNeighChunkSavedStat@Dimension@@UEBA_NXZ - virtual bool forceCheckAllNeighChunkSavedStat() const; + // symbol: ?hasPrecipitationFog@Dimension@@UEBA_NXZ + MCVAPI bool hasPrecipitationFog() const; - // vIndex: 33, vIndex: 34, symbol: ?sendBroadcast@Dimension@@UEAAXAEBVPacket@@PEAVPlayer@@@Z - virtual void sendBroadcast(class Packet const& packet, class Player* except); + // symbol: ?init@Dimension@@UEAAXAEBVStructureSetRegistry@worldgen@br@@@Z + MCVAPI void init(class br::worldgen::StructureSetRegistry const&); - // vIndex: 34, symbol: ?is2DPositionRelevantForPlayer@Dimension@@UEBA_NAEBVBlockPos@@AEAVPlayer@@@Z - virtual bool is2DPositionRelevantForPlayer(class BlockPos const& position, class Player& player) const; + // symbol: ?initializeWithLevelStorageManager@Dimension@@UEAAXAEAVLevelStorageManager@@@Z + MCVAPI void initializeWithLevelStorageManager(class LevelStorageManager&); - // vIndex: 35, symbol: ?isActorRelevantForPlayer@Dimension@@UEBA_NAEAVPlayer@@AEBVActor@@@Z - virtual bool isActorRelevantForPlayer(class Player& player, class Actor const& actor) const; + // symbol: ?is2DPositionRelevantForPlayer@Dimension@@UEBA_NAEBVBlockPos@@AEAVPlayer@@@Z + MCVAPI bool is2DPositionRelevantForPlayer(class BlockPos const& position, class Player& player) const; - // vIndex: 36, symbol: ?getLightTextureImageBuilder@Dimension@@UEBAPEAVBaseLightTextureImageBuilder@@XZ - virtual class BaseLightTextureImageBuilder* getLightTextureImageBuilder() const; + // symbol: ?isActorRelevantForPlayer@Dimension@@UEBA_NAEAVPlayer@@AEBVActor@@@Z + MCVAPI bool isActorRelevantForPlayer(class Player& player, class Actor const& actor) const; - // vIndex: 37, symbol: ?getBrightnessRamp@Dimension@@UEBAAEBVDimensionBrightnessRamp@@XZ - virtual class DimensionBrightnessRamp const& getBrightnessRamp() const; + // symbol: ?isDay@Dimension@@UEBA_NXZ + MCVAPI bool isDay() const; - // vIndex: 38, symbol: ?startLeaveGame@Dimension@@UEAAXXZ - virtual void startLeaveGame(); + // symbol: ?isFoggyAt@Dimension@@UEBA_NHH@Z + MCVAPI bool isFoggyAt(int x, int z) const; - // vIndex: 39, symbol: - // ?_createChunkBuildOrderPolicy@Dimension@@EEAA?AV?$unique_ptr@VChunkBuildOrderPolicyBase@@U?$default_delete@VChunkBuildOrderPolicyBase@@@std@@@std@@XZ - virtual std::unique_ptr _createChunkBuildOrderPolicy(); + // symbol: ?isNaturalDimension@Dimension@@UEBA_NXZ + MCVAPI bool isNaturalDimension() const; - // vIndex: 40 - virtual void _upgradeOldLimboEntity(class CompoundTag& tag, ::LimboEntitiesVersion vers) = 0; + // symbol: ?isValidSpawn@Dimension@@UEBA_NHH@Z + MCVAPI bool isValidSpawn(int x, int z) const; - // vIndex: 41 - virtual std::unique_ptr _wrapStorageForVersionCompatibility( - std::unique_ptr storageSource, - ::StorageVersion levelVersion - ) = 0; + // symbol: ?mayRespawnViaBed@Dimension@@UEBA_NXZ + MCVAPI bool mayRespawnViaBed() const; - // LevelListener vtable overloaded functions - // vIndex: 4, symbol: + // symbol: // ?onBlockChanged@Dimension@@UEAAXAEAVBlockSource@@AEBVBlockPos@@IAEBVBlock@@2HPEBUActorBlockSyncMessage@@W4BlockChangedEventTarget@@PEAVActor@@@Z - virtual void onBlockChanged( + MCVAPI void onBlockChanged( class BlockSource& source, class BlockPos const& pos, uint layer, @@ -302,24 +153,39 @@ class Dimension : public IDimension, class Actor* blockChangeSource ); - // LevelListener->BlockSourceListener vtable overloaded function - // vIndex: 8, symbol: ?onBlockEvent@Dimension@@UEAAXAEAVBlockSource@@HHHHH@Z - virtual void onBlockEvent(class BlockSource& source, int x, int y, int z, int b0, int b1); + // symbol: ?onBlockEvent@Dimension@@UEAAXAEAVBlockSource@@HHHHH@Z + MCVAPI void onBlockEvent(class BlockSource& source, int x, int y, int z, int b0, int b1); - // LevelListener vtable overloaded functions - // vIndex: 19,symbol: ?onChunkLoaded@Dimension@@UEAAXAEAVChunkSource@@AEAVLevelChunk@@@Z - virtual void onChunkLoaded(class ChunkSource& source, class LevelChunk& lc); + // symbol: ?onChunkLoaded@Dimension@@UEAAXAEAVChunkSource@@AEAVLevelChunk@@@Z + MCVAPI void onChunkLoaded(class ChunkSource& source, class LevelChunk& lc); - // vIndex: 23, symbol: - // ?onLevelDestruction@Dimension@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual void onLevelDestruction(std::string const&); + // symbol: ?onLevelDestruction@Dimension@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z + MCVAPI void onLevelDestruction(std::string const&); - // SavedData vtable overloaded functions - // symbol: ?deserialize@Dimension@@UEAAXAEBVCompoundTag@@@Z - virtual void deserialize(class CompoundTag const& tag); + // symbol: ?sendBroadcast@Dimension@@UEAAXAEBVPacket@@PEAVPlayer@@@Z + MCVAPI void sendBroadcast(class Packet const& packet, class Player* except); + + // symbol: ?sendPacketForPosition@Dimension@@UEAAXAEBVBlockPos@@AEBVPacket@@PEBVPlayer@@@Z + MCVAPI void + sendPacketForPosition(class BlockPos const& position, class Packet const& packet, class Player const* except); // symbol: ?serialize@Dimension@@UEBAXAEAVCompoundTag@@@Z - virtual void serialize(class CompoundTag& tag) const; + MCVAPI void serialize(class CompoundTag& tag) const; + + // symbol: ?showSky@Dimension@@UEBA_NXZ + MCVAPI bool showSky() const; + + // symbol: ?startLeaveGame@Dimension@@UEAAXXZ + MCVAPI void startLeaveGame(); + + // symbol: ?tick@Dimension@@UEAAXXZ + MCVAPI void tick(); + + // symbol: ?tickRedstone@Dimension@@UEAAXXZ + MCVAPI void tickRedstone(); + + // symbol: ??1Dimension@@UEAA@XZ + MCVAPI ~Dimension(); // symbol: // ??0Dimension@@QEAA@AEAVILevel@@V?$AutomaticID@VDimension@@H@@VDimensionHeightRange@@AEAVScheduler@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @@ -385,9 +251,6 @@ class Dimension : public IDimension, // symbol: ?flushRunTimeLighting@Dimension@@QEAAXXZ MCAPI void flushRunTimeLighting(); - // symbol: ?forEachPlayer@Dimension@@QEBAXV?$function@$$A6A_NAEAVPlayer@@@Z@std@@@Z - MCAPI void forEachPlayer(std::function callback) const; - // symbol: ?getBlockEventDispatcher@Dimension@@QEAAAEAVBlockEventDispatcher@@XZ MCAPI class BlockEventDispatcher& getBlockEventDispatcher(); diff --git a/src/mc/world/level/dimension/DimensionDocument.h b/src/mc/world/level/dimension/DimensionDocument.h index bfe0b87b67..ab362c672f 100644 --- a/src/mc/world/level/dimension/DimensionDocument.h +++ b/src/mc/world/level/dimension/DimensionDocument.h @@ -29,7 +29,6 @@ struct DimensionDocument { // Components inner types declare // clang-format off struct Bounds; - struct Generation; // clang-format on // Components inner types define @@ -48,21 +47,6 @@ struct DimensionDocument { // NOLINTEND }; - struct Generation { - public: - // prevent constructor by default - Generation& operator=(Generation const&); - Generation(Generation const&); - Generation(); - - public: - // NOLINTBEGIN - // symbol: ?bindType@Generation@Components@Dimension@DimensionDocument@@SAXAEAUReflectionCtx@cereal@@@Z - MCAPI static void bindType(struct cereal::ReflectionCtx&); - - // NOLINTEND - }; - public: // prevent constructor by default Components(Components const&); @@ -95,9 +79,6 @@ struct DimensionDocument { // symbol: ??1Description@Dimension@DimensionDocument@@QEAA@XZ MCAPI ~Description(); - // symbol: ?bindType@Description@Dimension@DimensionDocument@@SAXAEAUReflectionCtx@cereal@@@Z - MCAPI static void bindType(struct cereal::ReflectionCtx&); - // NOLINTEND }; @@ -131,6 +112,9 @@ struct DimensionDocument { public: // NOLINTBEGIN + // symbol: ??0DimensionDocument@@QEAA@AEAUReflectionCtx@cereal@@@Z + MCAPI explicit DimensionDocument(struct cereal::ReflectionCtx&); + // symbol: ??1DimensionDocument@@QEAA@XZ MCAPI ~DimensionDocument(); diff --git a/src/mc/deps/core/common/bedrock/DimensionFactory.h b/src/mc/world/level/dimension/DimensionFactory.h similarity index 82% rename from src/mc/deps/core/common/bedrock/DimensionFactory.h rename to src/mc/world/level/dimension/DimensionFactory.h index ad8fc9b274..c762a13faf 100644 --- a/src/mc/deps/core/common/bedrock/DimensionFactory.h +++ b/src/mc/world/level/dimension/DimensionFactory.h @@ -5,8 +5,8 @@ // auto generated inclusion list #include "mc/common/wrapper/OwnerPtr.h" #include "mc/common/wrapper/OwnerPtrFactory.h" -#include "mc/deps/core/common/bedrock/IDimensionFactory.h" #include "mc/deps/core/common/bedrock/NonOwnerPointer.h" +#include "mc/world/level/dimension/IDimensionFactory.h" // auto generated forward declare list // clang-format off @@ -30,8 +30,8 @@ class DimensionFactory : public ::IDimensionFactory { public: // NOLINTBEGIN - // vIndex: 0, symbol: ??1DimensionFactory@@UEAA@XZ - virtual ~DimensionFactory(); + // vIndex: 0, symbol: __gen_??1DimensionFactory@@UEAA@XZ + virtual ~DimensionFactory() = default; // vIndex: 1, symbol: // ?create@DimensionFactory@@UEBA?AV?$OwnerPtr@VDimension@@@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @@ -49,10 +49,5 @@ class DimensionFactory : public ::IDimensionFactory { // ?getDimensionOwnerPtrFactory@DimensionFactory@@QEAAAEAV?$OwnerPtrFactory@VDimension@@AEAVILevel@@AEAVScheduler@@@@XZ MCAPI class OwnerPtrFactory& getDimensionOwnerPtrFactory(); - // symbol: - // ?getDimensionOwnerPtrFactory@DimensionFactory@@QEBAAEBV?$OwnerPtrFactory@VDimension@@AEAVILevel@@AEAVScheduler@@@@XZ - MCAPI class OwnerPtrFactory const& - getDimensionOwnerPtrFactory() const; - // NOLINTEND }; diff --git a/src/mc/deps/core/common/bedrock/DimensionManager.h b/src/mc/world/level/dimension/DimensionManager.h similarity index 83% rename from src/mc/deps/core/common/bedrock/DimensionManager.h rename to src/mc/world/level/dimension/DimensionManager.h index ac71b5e581..3f5428cc5e 100644 --- a/src/mc/deps/core/common/bedrock/DimensionManager.h +++ b/src/mc/world/level/dimension/DimensionManager.h @@ -4,20 +4,18 @@ #include "mc/common/wrapper/OwnerPtr.h" // auto generated inclusion list +#include "mc/common/wrapper/StackRefResult.h" #include "mc/common/wrapper/WeakRef.h" -#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" -#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" #include "mc/world/AutomaticID.h" #include "mc/world/level/dimension/DimensionDefinitionGroup.h" // auto generated forward declare list // clang-format off -namespace Bedrock { class EnableNonOwnerReferences; } namespace Bedrock::PubSub { class Subscription; } // clang-format on class IDimensionFactory; -class DimensionManager : public ::Bedrock::EnableNonOwnerReferences { +class DimensionManager { public: std::unordered_map> mDimensions; Bedrock::NotNullNonOwnerPtr mDimensionFactory; @@ -33,13 +31,10 @@ class DimensionManager : public ::Bedrock::EnableNonOwnerReferences { public: // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1DimensionManager@@UEAA@XZ - virtual ~DimensionManager() = default; - // symbol: - // ??0DimensionManager@@QEAA@V?$not_null@V?$NonOwnerPointer@VIDimensionFactory@@@Bedrock@@@gsl@@V?$optional@VDimensionDefinitionGroup@@@std@@@Z + // ??0DimensionManager@@QEAA@AEBV?$not_null@V?$StackRefResult@VIDimensionFactory@@@@@gsl@@V?$optional@VDimensionDefinitionGroup@@@std@@@Z MCAPI - DimensionManager(Bedrock::NotNullNonOwnerPtr dimensionFactory, std::optional); + DimensionManager(gsl::not_null> const&, std::optional); // symbol: ?forEachDimension@DimensionManager@@QEAAXV?$function@$$A6A_NAEAVDimension@@@Z@std@@@Z MCAPI void forEachDimension(std::function callback); @@ -78,5 +73,8 @@ class DimensionManager : public ::Bedrock::EnableNonOwnerReferences { // symbol: ?shutdown@DimensionManager@@QEAAXXZ MCAPI void shutdown(); + // symbol: ??1DimensionManager@@QEAA@XZ + MCAPI ~DimensionManager(); + // NOLINTEND }; diff --git a/src/mc/world/level/dimension/IActorDimensionTransferProxy.h b/src/mc/world/level/dimension/IActorDimensionTransferProxy.h new file mode 100644 index 0000000000..95c3cd4208 --- /dev/null +++ b/src/mc/world/level/dimension/IActorDimensionTransferProxy.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class IActorDimensionTransferProxy { +public: + // prevent constructor by default + IActorDimensionTransferProxy& operator=(IActorDimensionTransferProxy const&); + IActorDimensionTransferProxy(IActorDimensionTransferProxy const&); + IActorDimensionTransferProxy(); +}; diff --git a/src/mc/world/level/dimension/IActorDimensionTransferer.h b/src/mc/world/level/dimension/IActorDimensionTransferer.h new file mode 100644 index 0000000000..22b5892d7a --- /dev/null +++ b/src/mc/world/level/dimension/IActorDimensionTransferer.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class IActorDimensionTransferer { +public: + // prevent constructor by default + IActorDimensionTransferer& operator=(IActorDimensionTransferer const&); + IActorDimensionTransferer(IActorDimensionTransferer const&); + IActorDimensionTransferer(); +}; diff --git a/src/mc/world/level/dimension/IDimensionFactory.h b/src/mc/world/level/dimension/IDimensionFactory.h new file mode 100644 index 0000000000..763c8315e7 --- /dev/null +++ b/src/mc/world/level/dimension/IDimensionFactory.h @@ -0,0 +1,11 @@ +#pragma once + +#include "mc/_HeaderOutputPredefine.h" + +class IDimensionFactory { +public: + // prevent constructor by default + IDimensionFactory& operator=(IDimensionFactory const&); + IDimensionFactory(IDimensionFactory const&); + IDimensionFactory(); +}; diff --git a/src/mc/world/level/levelgen/JigsawAssembler.h b/src/mc/world/level/levelgen/JigsawAssembler.h index ab50d41edb..f3bad8d91f 100644 --- a/src/mc/world/level/levelgen/JigsawAssembler.h +++ b/src/mc/world/level/levelgen/JigsawAssembler.h @@ -5,6 +5,7 @@ // auto generated inclusion list #include "mc/world/level/levelgen/JigsawExpansion.h" #include "mc/world/level/levelgen/Type.h" +#include "mc/world/level/levelgen/structure/PoolAliasBinding.h" // auto generated forward declare list // clang-format off @@ -25,7 +26,7 @@ class JigsawAssembler { public: // NOLINTBEGIN // symbol: - // ?construct@JigsawAssembler@worldgen@br@@SA?AV?$optional@VGenerationStub@worldgen@br@@@std@@AEAUGenerationContext@23@V?$basic_string_view@DU?$char_traits@D@std@@@5@1HVBlockPos@@W4Type@HeightmapProjection@23@HW4JigsawExpansion@23@@Z + // ?construct@JigsawAssembler@worldgen@br@@SA?AV?$optional@VGenerationStub@worldgen@br@@@std@@AEAUGenerationContext@23@V?$basic_string_view@DU?$char_traits@D@std@@@5@1HVBlockPos@@W4Type@HeightmapProjection@23@H$$QEAVPoolAliasLookup@PoolAliasBinding@@W4JigsawExpansion@23@@Z MCAPI static std::optional construct( struct br::worldgen::GenerationContext&, std::string_view, @@ -34,6 +35,7 @@ class JigsawAssembler { class BlockPos, ::br::worldgen::HeightmapProjection::Type, int, + class PoolAliasBinding::PoolAliasLookup&&, ::br::worldgen::JigsawExpansion ); diff --git a/src/mc/world/level/levelgen/UniformHeight.h b/src/mc/world/level/levelgen/UniformHeight.h index f8bbb9aa78..6c9831836c 100644 --- a/src/mc/world/level/levelgen/UniformHeight.h +++ b/src/mc/world/level/levelgen/UniformHeight.h @@ -5,6 +5,7 @@ // auto generated forward declare list // clang-format off class IRandom; +namespace br::worldgen { class VerticalAnchor; } namespace br::worldgen { class WorldGenContext; } // clang-format on @@ -29,6 +30,10 @@ class UniformHeight { // ?toString@UniformHeight@worldgen@br@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCAPI std::string toString() const; + // symbol: ?of@UniformHeight@worldgen@br@@SA?AV123@VVerticalAnchor@23@0@Z + MCAPI static class br::worldgen::UniformHeight + of(class br::worldgen::VerticalAnchor, class br::worldgen::VerticalAnchor); + // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/WorldGenRandom.h b/src/mc/world/level/levelgen/WorldGenRandom.h index f0fe06676b..3b20b2441e 100644 --- a/src/mc/world/level/levelgen/WorldGenRandom.h +++ b/src/mc/world/level/levelgen/WorldGenRandom.h @@ -7,7 +7,6 @@ class BlockPos; class IPositionalRandomFactory; class IRandom; -class SimpleRandom; struct Seed128Bit; // clang-format on @@ -70,9 +69,6 @@ struct WorldGenRandom { // symbol: ??0WorldGenRandom@worldgen@br@@QEAA@XZ MCAPI WorldGenRandom(); - // symbol: ??0WorldGenRandom@worldgen@br@@QEAA@VSimpleRandom@@@Z - MCAPI explicit WorldGenRandom(class SimpleRandom); - // symbol: ??0WorldGenRandom@worldgen@br@@QEAA@AEBU012@@Z MCAPI WorldGenRandom(struct br::worldgen::WorldGenRandom const&); diff --git a/src/mc/world/level/levelgen/br.h b/src/mc/world/level/levelgen/br.h index 0819d2e0ef..f1c98ff24c 100644 --- a/src/mc/world/level/levelgen/br.h +++ b/src/mc/world/level/levelgen/br.h @@ -11,6 +11,7 @@ #include "mc/world/level/levelgen/RandomSpreadPlacement.h" #include "mc/world/level/levelgen/Type.h" #include "mc/world/level/levelgen/adjustment/Type.h" +#include "mc/world/level/levelgen/structure/PoolAliasBinding.h" #include "mc/world/level/levelgen/structure/StructureFeatureType.h" // auto generated forward declare list @@ -25,6 +26,7 @@ namespace br::worldgen { class StructureHeightProvider; } namespace br::worldgen { class StructureInstance; } namespace br::worldgen { class StructureRegistry; } namespace br::worldgen { class StructureSetRegistry; } +namespace br::worldgen { class UniformHeight; } namespace br::worldgen { class VerticalAnchor; } namespace br::worldgen { class WorldGenContext; } namespace br::worldgen { struct ChunkGeneratorStructureState; } diff --git a/src/mc/world/level/levelgen/structure/JigsawEditorData.h b/src/mc/world/level/levelgen/structure/JigsawEditorData.h index 81a449fd4b..c0f60d79f4 100644 --- a/src/mc/world/level/levelgen/structure/JigsawEditorData.h +++ b/src/mc/world/level/levelgen/structure/JigsawEditorData.h @@ -9,7 +9,6 @@ class JigsawEditorData { public: // prevent constructor by default JigsawEditorData& operator=(JigsawEditorData const&); - JigsawEditorData(JigsawEditorData const&); public: // NOLINTBEGIN @@ -19,14 +18,19 @@ class JigsawEditorData { // symbol: ??0JigsawEditorData@@QEAA@$$QEAV0@@Z MCAPI JigsawEditorData(class JigsawEditorData&&); + // symbol: ??0JigsawEditorData@@QEAA@AEBV0@@Z + MCAPI JigsawEditorData(class JigsawEditorData const&); + // symbol: - // ??0JigsawEditorData@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000W4JigsawJointType@@@Z + // ??0JigsawEditorData@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@000W4JigsawJointType@@HH@Z MCAPI JigsawEditorData( - std::string const& name, - std::string const& target, - std::string const& targetPool, std::string const&, - ::JigsawJointType + std::string const&, + std::string const&, + std::string const&, + ::JigsawJointType, + int, + int ); // symbol: ?getFinalBlock@JigsawEditorData@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ @@ -38,6 +42,12 @@ class JigsawEditorData { // symbol: ?getName@JigsawEditorData@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCAPI std::string const& getName() const; + // symbol: ?getPlacementPriority@JigsawEditorData@@QEBAHXZ + MCAPI int getPlacementPriority() const; + + // symbol: ?getSelectionPriority@JigsawEditorData@@QEBAHXZ + MCAPI int getSelectionPriority() const; + // symbol: ?getTarget@JigsawEditorData@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCAPI std::string const& getTarget() const; diff --git a/src/mc/world/level/levelgen/structure/JigsawStructureBuilder.h b/src/mc/world/level/levelgen/structure/JigsawStructureBuilder.h index a3875dd3bf..a00f4844ed 100644 --- a/src/mc/world/level/levelgen/structure/JigsawStructureBuilder.h +++ b/src/mc/world/level/levelgen/structure/JigsawStructureBuilder.h @@ -8,6 +8,7 @@ // auto generated forward declare list // clang-format off +class PoolAliasBinding; namespace br::worldgen { class StructureHeightProvider; } namespace br::worldgen { struct JigsawStructure; } // clang-format on @@ -32,6 +33,14 @@ class JigsawStructureBuilder { // symbol: ?maxDepth@JigsawStructureBuilder@worldgen@br@@QEAAAEAV123@C@Z MCAPI class br::worldgen::JigsawStructureBuilder& maxDepth(schar); + // symbol: ?maxDistanceFromCenter@JigsawStructureBuilder@worldgen@br@@QEAAAEAV123@H@Z + MCAPI class br::worldgen::JigsawStructureBuilder& maxDistanceFromCenter(int); + + // symbol: + // ?poolAliases@JigsawStructureBuilder@worldgen@br@@QEAAAEAV123@$$QEAV?$vector@V?$shared_ptr@VPoolAliasBinding@@@std@@V?$allocator@V?$shared_ptr@VPoolAliasBinding@@@std@@@2@@std@@@Z + MCAPI class br::worldgen::JigsawStructureBuilder& + poolAliases(std::vector>&&); + // symbol: ?projectStartToHeightmap@JigsawStructureBuilder@worldgen@br@@QEAAAEAV123@W4Type@HeightmapProjection@23@@Z MCAPI class br::worldgen::JigsawStructureBuilder& projectStartToHeightmap(::br::worldgen::HeightmapProjection::Type ); diff --git a/src/mc/world/level/levelgen/structure/PoolAliasBinding.h b/src/mc/world/level/levelgen/structure/PoolAliasBinding.h index a4270e7399..6fe2fdfde2 100644 --- a/src/mc/world/level/levelgen/structure/PoolAliasBinding.h +++ b/src/mc/world/level/levelgen/structure/PoolAliasBinding.h @@ -44,29 +44,40 @@ class PoolAliasBinding { public: // NOLINTBEGIN + // vIndex: 0, symbol: + // ?appendResolvedAliases@DirectPoolAliasBinding@PoolAliasBindingInternal@@UEBAXAEAVIRandom@@AEAVPoolAliasLookup@PoolAliasBinding@@@Z + virtual void appendResolvedAliases(class IRandom&, class PoolAliasBinding::PoolAliasLookup&) const = 0; + + // vIndex: 1, symbol: + // ?forAllTargets@DirectPoolAliasBinding@PoolAliasBindingInternal@@UEBAXAEBV?$function@$$A6AXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z@std@@@Z + virtual void forAllTargets(std::function const&) const = 0; + + // vIndex: 2, symbol: __gen_??1PoolAliasBinding@@UEAA@XZ + virtual ~PoolAliasBinding() = default; + // symbol: - // ?direct@PoolAliasBinding@@SA?AV?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@0@Z - MCAPI static std::unique_ptr direct(std::string&&, std::string&&); + // ?direct@PoolAliasBinding@@SA?AV?$shared_ptr@VPoolAliasBinding@@@std@@$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@0@Z + MCAPI static std::shared_ptr direct(std::string&&, std::string&&); // symbol: - // ?random@PoolAliasBinding@@SA?AV?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@$$QEAV?$vector@U?$SimpleWeightedEntry@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@V?$allocator@U?$SimpleWeightedEntry@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@@std@@@3@@Z - MCAPI static std::unique_ptr + // ?random@PoolAliasBinding@@SA?AV?$shared_ptr@VPoolAliasBinding@@@std@@$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@$$QEAV?$vector@U?$SimpleWeightedEntry@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@V?$allocator@U?$SimpleWeightedEntry@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@@std@@@3@@Z + MCAPI static std::shared_ptr random(std::string&&, std::vector>&&); // symbol: - // ?randomGroup@PoolAliasBinding@@SA?AV?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@$$QEAV?$vector@U?$SimpleWeightedEntry@V?$vector@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@V?$allocator@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@@2@@std@@@Core@@V?$allocator@U?$SimpleWeightedEntry@V?$vector@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@V?$allocator@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@@2@@std@@@Core@@@std@@@3@@Z - MCAPI static std::unique_ptr - randomGroup(std::vector>>>&&); + // ?randomGroup@PoolAliasBinding@@SA?AV?$shared_ptr@VPoolAliasBinding@@@std@@$$QEAV?$vector@U?$SimpleWeightedEntry@V?$vector@V?$shared_ptr@VPoolAliasBinding@@@std@@V?$allocator@V?$shared_ptr@VPoolAliasBinding@@@std@@@2@@std@@@Core@@V?$allocator@U?$SimpleWeightedEntry@V?$vector@V?$shared_ptr@VPoolAliasBinding@@@std@@V?$allocator@V?$shared_ptr@VPoolAliasBinding@@@std@@@2@@std@@@Core@@@std@@@3@@Z + MCAPI static std::shared_ptr + randomGroup(std::vector>>>&&); // symbol: - // ?registerTargetsAsPools@PoolAliasBinding@@SAXAEAVJigsawStructureRegistry@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$vector@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@V?$allocator@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@@2@@4@@Z + // ?registerTargetsAsPools@PoolAliasBinding@@SAXAEAVJigsawStructureRegistry@@AEAUStructureTemplateRegistrationContext@@V?$basic_string_view@DU?$char_traits@D@std@@@std@@AEBV?$vector@V?$shared_ptr@VPoolAliasBinding@@@std@@V?$allocator@V?$shared_ptr@VPoolAliasBinding@@@std@@@2@@5@@Z MCAPI static void - registerTargetsAsPools(class JigsawStructureRegistry&, std::string const&, std::vector> const&); + registerTargetsAsPools(class JigsawStructureRegistry&, struct StructureTemplateRegistrationContext&, std::string_view, std::vector> const&); // symbol: - // ?resolvePoolAliases@PoolAliasBinding@@SA?AVPoolAliasLookup@1@AEBV?$vector@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@V?$allocator@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@@2@@std@@AEBVBlockPos@@_J@Z + // ?resolvePoolAliases@PoolAliasBinding@@SA?AVPoolAliasLookup@1@AEBV?$vector@V?$shared_ptr@VPoolAliasBinding@@@std@@V?$allocator@V?$shared_ptr@VPoolAliasBinding@@@std@@@2@@std@@AEBVBlockPos@@_J@Z MCAPI static class PoolAliasBinding::PoolAliasLookup - resolvePoolAliases(std::vector> const&, class BlockPos const&, int64); + resolvePoolAliases(std::vector> const&, class BlockPos const&, int64); // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/SHPortalRoom.h b/src/mc/world/level/levelgen/structure/SHPortalRoom.h index dabcea7e1d..a92efaff7d 100644 --- a/src/mc/world/level/levelgen/structure/SHPortalRoom.h +++ b/src/mc/world/level/levelgen/structure/SHPortalRoom.h @@ -29,5 +29,17 @@ class SHPortalRoom : public ::StrongholdPiece { // vIndex: 4, symbol: ?postProcess@SHPortalRoom@@UEAA_NAEAVBlockSource@@AEAVRandom@@AEBVBoundingBox@@@Z virtual bool postProcess(class BlockSource& region, class Random& random, class BoundingBox const& chunkBB); + // symbol: + // ?createPiece@SHPortalRoom@@SA?AV?$unique_ptr@VStrongholdPiece@@U?$default_delete@VStrongholdPiece@@@std@@@std@@AEAV?$vector@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@V?$allocator@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@@2@@3@AEAVRandom@@HHHHH@Z + MCAPI static std::unique_ptr createPiece( + std::vector>& pieces, + class Random&, + int footX, + int footY, + int footZ, + int direction, + int genDepth + ); + // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/SHStraight.h b/src/mc/world/level/levelgen/structure/SHStraight.h index 9788fed69d..d8d4ce9406 100644 --- a/src/mc/world/level/levelgen/structure/SHStraight.h +++ b/src/mc/world/level/levelgen/structure/SHStraight.h @@ -32,5 +32,17 @@ class SHStraight : public ::StrongholdPiece { // vIndex: 4, symbol: ?postProcess@SHStraight@@UEAA_NAEAVBlockSource@@AEAVRandom@@AEBVBoundingBox@@@Z virtual bool postProcess(class BlockSource& region, class Random& random, class BoundingBox const& chunkBB); + // symbol: + // ?createPiece@SHStraight@@SA?AV?$unique_ptr@VStrongholdPiece@@U?$default_delete@VStrongholdPiece@@@std@@@std@@AEAV?$vector@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@V?$allocator@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@@2@@3@AEAVRandom@@HHHHH@Z + MCAPI static std::unique_ptr createPiece( + std::vector>& pieces, + class Random& random, + int footX, + int footY, + int footZ, + int direction, + int genDepth + ); + // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/StrongholdPiece.h b/src/mc/world/level/levelgen/structure/StrongholdPiece.h index 985c91cc25..fd9cb413bc 100644 --- a/src/mc/world/level/levelgen/structure/StrongholdPiece.h +++ b/src/mc/world/level/levelgen/structure/StrongholdPiece.h @@ -103,5 +103,10 @@ class StrongholdPiece : public ::StructurePiece { int zOff ); + // symbol: + // ?forceAddPortalRoom@StrongholdPiece@@SAXAEAVStructurePiece@@AEAV?$vector@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@V?$allocator@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@@2@@std@@AEAVRandom@@@Z + MCAPI static void + forceAddPortalRoom(class StructurePiece&, std::vector>&, class Random&); + // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/Structure.h b/src/mc/world/level/levelgen/structure/Structure.h index f83fa6951e..cf6610173e 100644 --- a/src/mc/world/level/levelgen/structure/Structure.h +++ b/src/mc/world/level/levelgen/structure/Structure.h @@ -15,7 +15,6 @@ struct Structure { public: // prevent constructor by default Structure& operator=(Structure const&); - Structure(Structure const&); Structure(); public: @@ -28,6 +27,9 @@ struct Structure { virtual std::optional findValidGenerationPoint(struct br::worldgen::GenerationContext&) const = 0; + // symbol: ??0Structure@worldgen@br@@QEAA@AEBU012@@Z + MCAPI Structure(struct br::worldgen::Structure const&); + // symbol: // ?generate@Structure@worldgen@br@@QEBA?AV?$shared_ptr@VStructureInstance@worldgen@br@@@std@@AEAUGenerationContext@23@@Z MCAPI std::shared_ptr diff --git a/src/mc/world/level/levelgen/structure/StructureHeightProvider.h b/src/mc/world/level/levelgen/structure/StructureHeightProvider.h index 5cef2714c0..79f263cade 100644 --- a/src/mc/world/level/levelgen/structure/StructureHeightProvider.h +++ b/src/mc/world/level/levelgen/structure/StructureHeightProvider.h @@ -6,6 +6,7 @@ // clang-format off class IRandom; namespace br::worldgen { class ConstantHeight; } +namespace br::worldgen { class UniformHeight; } namespace br::worldgen { class WorldGenContext; } // clang-format on @@ -29,6 +30,9 @@ class StructureHeightProvider { // symbol: ??0StructureHeightProvider@worldgen@br@@QEAA@VConstantHeight@12@@Z MCAPI explicit StructureHeightProvider(class br::worldgen::ConstantHeight); + // symbol: ??0StructureHeightProvider@worldgen@br@@QEAA@VUniformHeight@12@@Z + MCAPI explicit StructureHeightProvider(class br::worldgen::UniformHeight); + // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/StructurePiece.h b/src/mc/world/level/levelgen/structure/StructurePiece.h index 59f7681a95..44b2c38245 100644 --- a/src/mc/world/level/levelgen/structure/StructurePiece.h +++ b/src/mc/world/level/levelgen/structure/StructurePiece.h @@ -3,6 +3,7 @@ #include "mc/_HeaderOutputPredefine.h" // auto generated inclusion list +#include "mc/world/Direction.h" #include "mc/world/level/levelgen/structure/StructurePieceType.h" class StructurePiece { @@ -147,6 +148,9 @@ class StructurePiece { // symbol: ?getBlock@StructurePiece@@QEAAAEBVBlock@@AEAVBlockSource@@HHHAEBVBoundingBox@@@Z MCAPI class Block const& getBlock(class BlockSource& region, int x, int y, int z, class BoundingBox const& chunkBB); + // symbol: ?getOrientation@StructurePiece@@QEBA?AW4Type@Direction@@XZ + MCAPI ::Direction::Type getOrientation() const; + // symbol: ?getOrientationData@StructurePiece@@QEAAGPEBVBlock@@G@Z MCAPI ushort getOrientationData(class Block const* block, ushort data); diff --git a/src/mc/world/level/levelgen/structure/StructureSetRegistry.h b/src/mc/world/level/levelgen/structure/StructureSetRegistry.h index 80fd1c13b2..7cd5725ff7 100644 --- a/src/mc/world/level/levelgen/structure/StructureSetRegistry.h +++ b/src/mc/world/level/levelgen/structure/StructureSetRegistry.h @@ -34,6 +34,10 @@ class StructureSetRegistry { entt::internal::dense_map_node>>>>> end() const; + // symbol: + // ?record@StructureSetRegistry@worldgen@br@@QEAAXV?$basic_string_view@DU?$char_traits@D@std@@@std@@$$QEAV?$shared_ptr@UStructureSet@worldgen@br@@@5@@Z + MCAPI void record(std::string_view, std::shared_ptr&&); + // symbol: ?size@StructureSetRegistry@worldgen@br@@QEBA_KXZ MCAPI uint64 size() const; diff --git a/src/mc/world/level/levelgen/structure/StructureSettings.h b/src/mc/world/level/levelgen/structure/StructureSettings.h index db853720a0..7086c6a9bc 100644 --- a/src/mc/world/level/levelgen/structure/StructureSettings.h +++ b/src/mc/world/level/levelgen/structure/StructureSettings.h @@ -99,6 +99,12 @@ class StructureSettings { // symbol: ?setAllowNonTickingPlayerAndTickingAreaChunks@StructureSettings@@QEAAX_N@Z MCAPI void setAllowNonTickingPlayerAndTickingAreaChunks(bool allowNonPlayerTicking); + // symbol: ?setAnimationMode@StructureSettings@@QEAAXW4AnimationMode@@@Z + MCAPI void setAnimationMode(::AnimationMode); + + // symbol: ?setAnimationSeconds@StructureSettings@@QEAAXM@Z + MCAPI void setAnimationSeconds(float seconds); + // symbol: ?setIgnoreBlocks@StructureSettings@@QEAAX_N@Z MCAPI void setIgnoreBlocks(bool ignoreBlocks); @@ -111,6 +117,15 @@ class StructureSettings { // symbol: ?setIntegritySeed@StructureSettings@@QEAAXI@Z MCAPI void setIntegritySeed(uint integritySeed); + // symbol: ?setIntegrityValue@StructureSettings@@QEAAXM@Z + MCAPI void setIntegrityValue(float integrityValue); + + // symbol: ?setIsWaterLogged@StructureSettings@@QEAAX_N@Z + MCAPI void setIsWaterLogged(bool); + + // symbol: ?setMirror@StructureSettings@@QEAAXW4Mirror@@@Z + MCAPI void setMirror(::Mirror mirror); + // symbol: ?setPivot@StructureSettings@@QEAAXAEBVVec3@@@Z MCAPI void setPivot(class Vec3 const& pivot); diff --git a/src/mc/world/level/levelgen/structure/StructureTemplate.h b/src/mc/world/level/levelgen/structure/StructureTemplate.h index df6c599046..20242e442f 100644 --- a/src/mc/world/level/levelgen/structure/StructureTemplate.h +++ b/src/mc/world/level/levelgen/structure/StructureTemplate.h @@ -66,6 +66,9 @@ class StructureTemplate { // ??0StructureTemplate@@QEAA@V?$basic_string_view@DU?$char_traits@D@std@@@std@@V?$NonOwnerPointer@VIUnknownBlockTypeRegistry@@@Bedrock@@@Z MCAPI StructureTemplate(std::string_view name, class Bedrock::NonOwnerPointer); + // symbol: ?fillEmpty@StructureTemplate@@QEAAXAEBVBlockPos@@@Z + MCAPI void fillEmpty(class BlockPos const&); + // symbol: ?fillFromWorld@StructureTemplate@@QEAAXAEAVBlockSource@@AEBVBlockPos@@AEBVStructureSettings@@@Z MCAPI void fillFromWorld( class BlockSource& region, @@ -83,6 +86,9 @@ class StructureTemplate { // symbol: ?getName@StructureTemplate@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCAPI std::string const& getName() const; + // symbol: ?getRemovable@StructureTemplate@@QEBA_NXZ + MCAPI bool getRemovable() const; + // symbol: ?getSize@StructureTemplate@@QEBAAEBVBlockPos@@XZ MCAPI class BlockPos const& getSize() const; @@ -168,5 +174,19 @@ class StructureTemplate { bool ignoreJigsawBlocks ) const; + // NOLINTEND + +private: + // NOLINTBEGIN + // symbol: ?NO_BLOCK_INDEX_VALUE@StructureTemplate@@0HB + MCAPI static int const NO_BLOCK_INDEX_VALUE; + + // NOLINTEND + + // member accessor +public: + // NOLINTBEGIN + static auto& $NO_BLOCK_INDEX_VALUE() { return NO_BLOCK_INDEX_VALUE; } + // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/TrialChambersFeature.h b/src/mc/world/level/levelgen/structure/TrialChambersFeature.h deleted file mode 100644 index cc4a71df04..0000000000 --- a/src/mc/world/level/levelgen/structure/TrialChambersFeature.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/levelgen/structure/StructureFeature.h" - -class TrialChambersFeature : public ::StructureFeature { -public: - // prevent constructor by default - TrialChambersFeature& operator=(TrialChambersFeature const&); - TrialChambersFeature(TrialChambersFeature const&); - TrialChambersFeature(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1TrialChambersFeature@@UEAA@XZ - virtual ~TrialChambersFeature() = default; - - // vIndex: 5, symbol: - // ?isFeatureChunk@TrialChambersFeature@@UEAA_NAEBVBiomeSource@@AEAVRandom@@AEBVChunkPos@@IAEBVIPreliminarySurfaceProvider@@AEBVDimension@@@Z - virtual bool - isFeatureChunk(class BiomeSource const&, class Random&, class ChunkPos const&, uint, class IPreliminarySurfaceProvider const&, class Dimension const&); - - // vIndex: 6, symbol: - // ?createStructureStart@TrialChambersFeature@@MEAA?AV?$unique_ptr@VStructureStart@@U?$default_delete@VStructureStart@@@std@@@std@@AEAVDimension@@AEBVBiomeSource@@AEAVRandom@@AEBVChunkPos@@AEBVIPreliminarySurfaceProvider@@@Z - virtual std::unique_ptr - createStructureStart(class Dimension&, class BiomeSource const&, class Random&, class ChunkPos const&, class IPreliminarySurfaceProvider const&); - - // symbol: ??0TrialChambersFeature@@QEAA@IAEBVBaseGameVersion@@@Z - MCAPI TrialChambersFeature(uint, class BaseGameVersion const&); - - // NOLINTEND -}; diff --git a/src/mc/world/level/levelgen/structure/TrialChambersPiece.h b/src/mc/world/level/levelgen/structure/TrialChambersPiece.h deleted file mode 100644 index 4dc6eb40f4..0000000000 --- a/src/mc/world/level/levelgen/structure/TrialChambersPiece.h +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/enums/AdjustmentEffect.h" -#include "mc/world/level/biome/VanillaBiomeTypes.h" -#include "mc/world/level/levelgen/structure/PoolElementStructurePiece.h" -#include "mc/world/level/levelgen/structure/StructurePieceType.h" - -class TrialChambersPiece : public ::PoolElementStructurePiece { -public: - // prevent constructor by default - TrialChambersPiece& operator=(TrialChambersPiece const&); - TrialChambersPiece(TrialChambersPiece const&); - TrialChambersPiece(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1TrialChambersPiece@@UEAA@XZ - virtual ~TrialChambersPiece() = default; - - // vIndex: 13, symbol: - // ?generateHeightAtPosition@TrialChambersPiece@@UEBAHAEBVBlockPos@@AEAVDimension@@AEAVBlockVolume@@AEAV?$unordered_map@VChunkPos@@V?$unique_ptr@V?$vector@FV?$allocator@F@std@@@std@@U?$default_delete@V?$vector@FV?$allocator@F@std@@@std@@@2@@std@@U?$hash@VChunkPos@@@3@U?$equal_to@VChunkPos@@@3@V?$allocator@U?$pair@$$CBVChunkPos@@V?$unique_ptr@V?$vector@FV?$allocator@F@std@@@std@@U?$default_delete@V?$vector@FV?$allocator@F@std@@@std@@@2@@std@@@std@@@3@@std@@@Z - virtual int - generateHeightAtPosition(class BlockPos const&, class Dimension&, class BlockVolume&, std::unordered_map>>&) - const; - - // vIndex: 14, symbol: ?getSupportBlock@TrialChambersPiece@@UEBAPEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@AEBV2@@Z - virtual class Block const* getSupportBlock(class BlockSource&, class BlockPos const&, class Block const&) const; - - // vIndex: 15, symbol: ?getBeardStabilizeBlock@TrialChambersPiece@@UEBAAEBVBlock@@AEBV2@@Z - virtual class Block const& getBeardStabilizeBlock(class Block const&) const; - - // vIndex: 16, symbol: ?getTerrainAdjustmentEffect@TrialChambersPiece@@UEBA?AW4AdjustmentEffect@@XZ - virtual ::AdjustmentEffect getTerrainAdjustmentEffect() const; - - // symbol: - // ?addPieces@TrialChambersPiece@@SAXVBlockPos@@AEAV?$vector@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@V?$allocator@V?$unique_ptr@VStructurePiece@@U?$default_delete@VStructurePiece@@@std@@@std@@@2@@std@@AEAVRandom@@AEAVJigsawStructureRegistry@@W4VanillaBiomeTypes@@AEAVDimension@@@Z - MCAPI static void - addPieces(class BlockPos, std::vector>&, class Random&, class JigsawStructureRegistry&, ::VanillaBiomeTypes, class Dimension&); - - // symbol: - // ?ALIAS_BINDINGS@TrialChambersPiece@@2V?$vector@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@V?$allocator@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@@2@@std@@B - MCAPI static std::vector> const ALIAS_BINDINGS; - - // NOLINTEND -}; diff --git a/src/mc/world/level/levelgen/structure/TrialChambersStart.h b/src/mc/world/level/levelgen/structure/TrialChambersStart.h deleted file mode 100644 index 89c0a6e119..0000000000 --- a/src/mc/world/level/levelgen/structure/TrialChambersStart.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/world/level/levelgen/structure/StructureStart.h" - -class TrialChambersStart : public ::StructureStart { -public: - // prevent constructor by default - TrialChambersStart& operator=(TrialChambersStart const&); - TrialChambersStart(TrialChambersStart const&); - TrialChambersStart(); - -public: - // NOLINTBEGIN - // vIndex: 0, symbol: __gen_??1TrialChambersStart@@UEAA@XZ - virtual ~TrialChambersStart() = default; - - // vIndex: 2, symbol: ?isValid@TrialChambersStart@@UEBA_NXZ - virtual bool isValid() const; - - // NOLINTEND -}; diff --git a/src/mc/world/level/levelgen/structure/VanillaTrialChambersJigsawStructureElements.h b/src/mc/world/level/levelgen/structure/VanillaTrialChambersJigsawStructureElements.h deleted file mode 100644 index 28082007a9..0000000000 --- a/src/mc/world/level/levelgen/structure/VanillaTrialChambersJigsawStructureElements.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "mc/_HeaderOutputPredefine.h" - -// auto generated inclusion list -#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" - -class VanillaTrialChambersJigsawStructureElements { -public: - // prevent constructor by default - VanillaTrialChambersJigsawStructureElements& operator=(VanillaTrialChambersJigsawStructureElements const&); - VanillaTrialChambersJigsawStructureElements(VanillaTrialChambersJigsawStructureElements const&); - VanillaTrialChambersJigsawStructureElements(); - -public: - // NOLINTBEGIN - // symbol: - // ?initialize@VanillaTrialChambersJigsawStructureElements@@SAXAEBV?$not_null@V?$NonOwnerPointer@VStructureManager@@@Bedrock@@@gsl@@AEAVJigsawStructureRegistry@@@Z - MCAPI static void - initialize(Bedrock::NotNullNonOwnerPtr const&, class JigsawStructureRegistry&); - - // symbol: - // ?initializePoolElementsForAliasBindings@VanillaTrialChambersJigsawStructureElements@@SAXAEBV?$not_null@V?$NonOwnerPointer@VStructureManager@@@Bedrock@@@gsl@@AEAVJigsawStructureRegistry@@AEBV?$vector@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@V?$allocator@V?$unique_ptr@VPoolAliasBinding@@U?$default_delete@VPoolAliasBinding@@@std@@@std@@@2@@std@@@Z - MCAPI static void - initializePoolElementsForAliasBindings(Bedrock::NotNullNonOwnerPtr const&, class JigsawStructureRegistry&, std::vector> const&); - - // NOLINTEND -}; diff --git a/src/mc/world/level/levelgen/structure/VanillaTrialChambersJigsawStructures.h b/src/mc/world/level/levelgen/structure/VanillaTrialChambersJigsawStructures.h index 8e8f04b621..00a2b407a7 100644 --- a/src/mc/world/level/levelgen/structure/VanillaTrialChambersJigsawStructures.h +++ b/src/mc/world/level/levelgen/structure/VanillaTrialChambersJigsawStructures.h @@ -2,9 +2,6 @@ #include "mc/_HeaderOutputPredefine.h" -// auto generated inclusion list -#include "mc/deps/core/common/bedrock/NonOwnerPointer.h" - class VanillaTrialChambersJigsawStructures { public: // prevent constructor by default @@ -15,8 +12,8 @@ class VanillaTrialChambersJigsawStructures { public: // NOLINTBEGIN // symbol: - // ?initialize@VanillaTrialChambersJigsawStructures@@SAXV?$not_null@V?$NonOwnerPointer@VStructureManager@@@Bedrock@@@gsl@@AEAVJigsawStructureRegistry@@@Z - MCAPI static void initialize(Bedrock::NotNullNonOwnerPtr, class JigsawStructureRegistry&); + // ?initialize@VanillaTrialChambersJigsawStructures@@SAXAEAUStructureTemplateRegistrationContext@@AEAVJigsawStructureRegistry@@@Z + MCAPI static void initialize(struct StructureTemplateRegistrationContext&, class JigsawStructureRegistry&); // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/structurepools/JigsawBlockInfo.h b/src/mc/world/level/levelgen/structure/structurepools/JigsawBlockInfo.h index 4be5d67e37..ac234fd19f 100644 --- a/src/mc/world/level/levelgen/structure/structurepools/JigsawBlockInfo.h +++ b/src/mc/world/level/levelgen/structure/structurepools/JigsawBlockInfo.h @@ -11,6 +11,9 @@ class JigsawBlockInfo { public: // NOLINTBEGIN + // symbol: ??0JigsawBlockInfo@@QEAA@$$QEAV0@@Z + MCAPI JigsawBlockInfo(class JigsawBlockInfo&&); + // symbol: ??0JigsawBlockInfo@@QEAA@AEBVBlockPos@@PEBVBlock@@1VJigsawEditorData@@@Z MCAPI JigsawBlockInfo( class BlockPos const& pos, @@ -28,5 +31,8 @@ class JigsawBlockInfo { // symbol: ??4JigsawBlockInfo@@QEAAAEAV0@$$QEAV0@@Z MCAPI class JigsawBlockInfo& operator=(class JigsawBlockInfo&&); + // symbol: ??1JigsawBlockInfo@@QEAA@XZ + MCAPI ~JigsawBlockInfo(); + // NOLINTEND }; diff --git a/src/mc/world/level/levelgen/structure/structurepools/StructurePoolElement.h b/src/mc/world/level/levelgen/structure/structurepools/StructurePoolElement.h index a600384720..90f5e1bb59 100644 --- a/src/mc/world/level/levelgen/structure/structurepools/StructurePoolElement.h +++ b/src/mc/world/level/levelgen/structure/structurepools/StructurePoolElement.h @@ -151,6 +151,12 @@ class StructurePoolElement { ::PostProcessSettings ); + // symbol: + // ?single@StructurePoolElement@@SA?AV?$function@$$A6AAEBVStructurePoolElement@@UStructureTemplateRegistrationContext@@W4Projection@@@Z@std@@V?$basic_string_view@DU?$char_traits@D@std@@@3@@Z + MCAPI static std::function< + class StructurePoolElement const&(struct StructureTemplateRegistrationContext, ::Projection)> + single(std::string_view); + // symbol: // ?single@StructurePoolElement@@SA?AV?$function@$$A6AAEBVStructurePoolElement@@UStructureTemplateRegistrationContext@@W4Projection@@@Z@std@@V?$basic_string_view@DU?$char_traits@D@std@@@3@PEBV?$vector@V?$unique_ptr@VStructurePoolBlockRule@@U?$default_delete@VStructurePoolBlockRule@@@std@@@std@@V?$allocator@V?$unique_ptr@VStructurePoolBlockRule@@U?$default_delete@VStructurePoolBlockRule@@@std@@@std@@@2@@3@@Z MCAPI static std::function< diff --git a/src/mc/world/level/levelgen/worldgen.h b/src/mc/world/level/levelgen/worldgen.h index 17852afec7..6430b53ccd 100644 --- a/src/mc/world/level/levelgen/worldgen.h +++ b/src/mc/world/level/levelgen/worldgen.h @@ -11,6 +11,7 @@ #include "mc/world/level/levelgen/RandomSpreadPlacement.h" #include "mc/world/level/levelgen/Type.h" #include "mc/world/level/levelgen/adjustment/Type.h" +#include "mc/world/level/levelgen/structure/PoolAliasBinding.h" #include "mc/world/level/levelgen/structure/StructureFeatureType.h" // auto generated forward declare list @@ -28,6 +29,7 @@ class IPositionalRandomFactory; class IRandom; class JigsawBlockInfo; class JigsawStructureRegistry; +class PoolAliasBinding; class Random; class SimpleRandom; class StructureManager; @@ -44,6 +46,7 @@ namespace br::worldgen { class StructureHeightProvider; } namespace br::worldgen { class StructureInstance; } namespace br::worldgen { class StructureRegistry; } namespace br::worldgen { class StructureSetRegistry; } +namespace br::worldgen { class UniformHeight; } namespace br::worldgen { class VerticalAnchor; } namespace br::worldgen { class WorldGenContext; } namespace br::worldgen { struct ChunkGeneratorStructureState; } diff --git a/src/mc/world/level/pathfinder/PathFinder.h b/src/mc/world/level/pathfinder/PathFinder.h index 5a3d81229e..d3ef242e69 100644 --- a/src/mc/world/level/pathfinder/PathFinder.h +++ b/src/mc/world/level/pathfinder/PathFinder.h @@ -151,15 +151,6 @@ class PathFinder { MCAPI struct ActorPathingData::MinMaxHeightCacheEntry _getMinAndMaxHeightAroundBlock(struct ActorPathingData const&, class BlockPos const&, float) const; - // symbol: ?_getNeighbors@PathFinder@@AEAAHAEBUActorPathingData@@AEAVPathfinderNode@@AEBV3@2I@Z - MCAPI int _getNeighbors( - struct ActorPathingData const& data, - class PathfinderNode& pos, - class PathfinderNode const& size, - class PathfinderNode const& target, - uint maxDistSqr - ); - // symbol: ?_getNode@PathFinder@@AEAAPEAVPathfinderNode@@AEBVBlockPos@@W4NodeType@@@Z MCAPI class PathfinderNode* _getNode(class BlockPos const& pos, ::NodeType nodeType); @@ -205,6 +196,10 @@ class PathFinder { class BlockPos const& size ); + // symbol: ?_isNeighborPotentiallyValid@PathFinder@@AEAA_NAEBVPathfinderNode@@0AEBVBlockPos@@I@Z + MCAPI bool + _isNeighborPotentiallyValid(class PathfinderNode const&, class PathfinderNode const&, class BlockPos const&, uint); + // symbol: // ?_reconstructPath@PathFinder@@AEAA?AV?$unique_ptr@VPath@@U?$default_delete@VPath@@@std@@@std@@PEAVPathfinderNode@@W4PathCompletionType@@UActorUniqueID@@@Z MCAPI std::unique_ptr diff --git a/src/mc/world/level/storage/ExternalFileLevelStorageSource.h b/src/mc/world/level/storage/ExternalFileLevelStorageSource.h index ce9860f344..8fd6658e63 100644 --- a/src/mc/world/level/storage/ExternalFileLevelStorageSource.h +++ b/src/mc/world/level/storage/ExternalFileLevelStorageSource.h @@ -32,28 +32,24 @@ class ExternalFileLevelStorageSource : public ::LevelStorageSource { virtual std::string const& getName() const; // vIndex: 2, symbol: - // ?getLevelData@ExternalFileLevelStorageSource@@UEBA?AVLevelData@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual class LevelData getLevelData(std::string const& levelId) const; - - // vIndex: 3, symbol: // ?getLevelData@ExternalFileLevelStorageSource@@UEBA?AVResult@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVLevelData@@@Z virtual class Core::Result getLevelData(std::string const& levelId, class LevelData& levelDataOut) const; - // vIndex: 4, symbol: + // vIndex: 3, symbol: // ?saveLevelData@ExternalFileLevelStorageSource@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVLevelData@@@Z virtual void saveLevelData(std::string const& levelId, class LevelData const& data); - // vIndex: 5, symbol: + // vIndex: 4, symbol: // ?getLevelList@ExternalFileLevelStorageSource@@UEAAXAEAV?$vector@V?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@V?$allocator@V?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@@std@@@std@@@Z virtual void getLevelList(std::vector>& paths); - // vIndex: 6, symbol: + // vIndex: 5, symbol: // ?createLevelStorage@ExternalFileLevelStorageSource@@UEAA?AV?$OwnerPtr@VLevelStorage@@@@AEAVScheduler@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVContentIdentity@@AEBV?$not_null@V?$NonOwnerPointer@$$CBVIContentKeyProvider@@@Bedrock@@@gsl@@AEBV?$duration@_JU?$ratio@$00$0DLJKMKAA@@std@@@chrono@5@V?$not_null@V?$NonOwnerPointer@VLevelDbEnv@@@Bedrock@@@8@V?$unique_ptr@VLevelStorageEventing@@U?$default_delete@VLevelStorageEventing@@@std@@@5@@Z virtual class OwnerPtr createLevelStorage(class Scheduler& scheduler, std::string const& levelId, class ContentIdentity const& contentIdentity, Bedrock::NotNullNonOwnerPtr const& keyProvider, std::chrono::nanoseconds const&, Bedrock::NotNullNonOwnerPtr levelDbEnv, std::unique_ptr); - // vIndex: 7, symbol: + // vIndex: 6, symbol: // ?createLevelLooseStorage@ExternalFileLevelStorageSource@@UEAA?AV?$unique_ptr@VLevelLooseFileStorage@@U?$default_delete@VLevelLooseFileStorage@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBVContentIdentity@@AEBV?$not_null@V?$NonOwnerPointer@$$CBVIContentKeyProvider@@@Bedrock@@@gsl@@@Z virtual std::unique_ptr createLevelLooseStorage( std::string const& levelId, @@ -61,64 +57,48 @@ class ExternalFileLevelStorageSource : public ::LevelStorageSource { Bedrock::NotNullNonOwnerPtr const& keyProvider ); - // vIndex: 8, symbol: - // ?isNewLevelIdAcceptable@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual bool isNewLevelIdAcceptable(std::string const& levelId); - - // vIndex: 9, symbol: + // vIndex: 7, symbol: // ?deleteLevel@ExternalFileLevelStorageSource@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void deleteLevel(std::string const& levelId); - // vIndex: 10, symbol: + // vIndex: 8, symbol: // ?renameLevel@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z virtual bool renameLevel(std::string const& levelId, std::string const& newLevelName); - // vIndex: 11, symbol: + // vIndex: 9, symbol: // ?renameLevel@ExternalFileLevelStorageSource@@UEAAXAEAVLevelData@@AEBVPath@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void renameLevel(class LevelData& levelData, class Core::Path const& fullPath, std::string const& newLevelName); - // vIndex: 12, symbol: + // vIndex: 10, symbol: // ?createBackupCopyOfWorld@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z virtual bool createBackupCopyOfWorld(std::string const& levelId, std::string const& newLeveId, std::string const& newName); - // vIndex: 13, symbol: - // ?isConvertible@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual bool isConvertible(std::string const& levelId); - - // vIndex: 14, symbol: - // ?requiresConversion@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual bool requiresConversion(std::string const& levelId); - - // vIndex: 15, symbol: - // ?convertLevel@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEAVProgressListener@@@Z - virtual bool convertLevel(std::string const& levelId, class ProgressListener* progress); - - // vIndex: 16, symbol: ?isLevelMarkedForSync@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z + // vIndex: 11, symbol: ?isLevelMarkedForSync@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z virtual bool isLevelMarkedForSync(class Core::Path const& levelPath) const; - // vIndex: 17, symbol: ?isLevelPartiallyCopied@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z + // vIndex: 12, symbol: ?isLevelPartiallyCopied@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z virtual bool isLevelPartiallyCopied(class Core::Path const& levelPath) const; - // vIndex: 18, symbol: + // vIndex: 13, symbol: // ?getLevelDatFoundPath@ExternalFileLevelStorageSource@@UEBA?AV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@AEBVPath@3@@Z virtual class Core::PathBuffer getLevelDatFoundPath(class Core::Path const&) const; - // vIndex: 19, symbol: + // vIndex: 14, symbol: // ?getBasePath@ExternalFileLevelStorageSource@@UEBA?BV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@XZ virtual class Core::PathBuffer const getBasePath() const; - // vIndex: 20, symbol: + // vIndex: 15, symbol: // ?getPathToLevel@ExternalFileLevelStorageSource@@UEBA?BV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual class Core::PathBuffer const getPathToLevel(std::string const& levelId) const; - // vIndex: 21, symbol: + // vIndex: 16, symbol: // ?getPathToLevelInfo@ExternalFileLevelStorageSource@@UEBA?BV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@Z virtual class Core::PathBuffer const getPathToLevelInfo(std::string const& levelId, bool forceInfo) const; - // vIndex: 22, symbol: + // vIndex: 17, symbol: // ?isBetaRetailLevel@ExternalFileLevelStorageSource@@UEBA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual bool isBetaRetailLevel(std::string const& levelId) const; diff --git a/src/mc/world/level/storage/GameRule.h b/src/mc/world/level/storage/GameRule.h index 93c34efe3e..c0a50de819 100644 --- a/src/mc/world/level/storage/GameRule.h +++ b/src/mc/world/level/storage/GameRule.h @@ -69,6 +69,9 @@ class GameRule { // symbol: ?allowUseInCommand@GameRule@@QEBA_NXZ MCAPI bool allowUseInCommand() const; + // symbol: ?allowUseInScripting@GameRule@@QEBA_NXZ + MCAPI bool allowUseInScripting() const; + // symbol: ?canBeModifiedByPlayer@GameRule@@QEBA_NXZ MCAPI bool canBeModifiedByPlayer() const; @@ -81,6 +84,9 @@ class GameRule { // symbol: ?getInt@GameRule@@QEBAHXZ MCAPI int getInt() const; + // symbol: ?getLowercaseName@GameRule@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ + MCAPI std::string getLowercaseName() const; + // symbol: ?getName@GameRule@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ MCAPI std::string const& getName() const; diff --git a/src/mc/world/level/storage/GameRules.h b/src/mc/world/level/storage/GameRules.h index ab00832172..65294a3266 100644 --- a/src/mc/world/level/storage/GameRules.h +++ b/src/mc/world/level/storage/GameRules.h @@ -10,6 +10,7 @@ // auto generated forward declare list // clang-format off namespace Bedrock { class EnableNonOwnerReferences; } +namespace Bedrock::PubSub { class Subscription; } // clang-format on class GameRules : public ::Bedrock::EnableNonOwnerReferences { @@ -81,6 +82,9 @@ class GameRules : public ::Bedrock::EnableNonOwnerReferences { // symbol: ?getBool@GameRules@@QEBA_NUGameRuleId@@_N@Z MCAPI bool getBool(struct GameRuleId ruleType, bool defaultValue) const; + // symbol: ?getFloat@GameRules@@QEBAMUGameRuleId@@@Z + MCAPI float getFloat(struct GameRuleId ruleType) const; + // symbol: ?getInt@GameRules@@QEBAHUGameRuleId@@@Z MCAPI int getInt(struct GameRuleId ruleType) const; @@ -100,6 +104,14 @@ class GameRules : public ::Bedrock::EnableNonOwnerReferences { // ?nameToGameRuleIndex@GameRules@@QEBA?AUGameRuleId@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z MCAPI struct GameRuleId nameToGameRuleIndex(std::string const& name) const; + // symbol: ??4GameRules@@QEAAAEAV0@AEBV0@@Z + MCAPI class GameRules& operator=(class GameRules const&); + + // symbol: + // ?registerOnGameRuleChangeCallback@GameRules@@QEAA?AVSubscription@PubSub@Bedrock@@V?$function@$$A6AXAEBVGameRules@@W4GameRulesIndex@1@@Z@std@@@Z + MCAPI class Bedrock::PubSub::Subscription + registerOnGameRuleChangeCallback(std::function); + // symbol: ?setMarketplaceOverrides@GameRules@@QEAAXXZ MCAPI void setMarketplaceOverrides(); diff --git a/src/mc/world/level/storage/LevelStorageSource.h b/src/mc/world/level/storage/LevelStorageSource.h index ab90043b3e..1f03661ae0 100644 --- a/src/mc/world/level/storage/LevelStorageSource.h +++ b/src/mc/world/level/storage/LevelStorageSource.h @@ -32,28 +32,24 @@ class LevelStorageSource : public ::Bedrock::EnableNonOwnerReferences { virtual std::string const& getName() const = 0; // vIndex: 2, symbol: - // ?getLevelData@ExternalFileLevelStorageSource@@UEBA?AVLevelData@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual class LevelData getLevelData(std::string const& levelId) const = 0; - - // vIndex: 3, symbol: // ?getLevelData@ExternalFileLevelStorageSource@@UEBA?AVResult@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAVLevelData@@@Z virtual class Core::Result getLevelData(std::string const& levelId, class LevelData& levelDataOut) const = 0; - // vIndex: 4, symbol: + // vIndex: 3, symbol: // ?saveLevelData@ExternalFileLevelStorageSource@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVLevelData@@@Z virtual void saveLevelData(std::string const& levelId, class LevelData const& data) = 0; - // vIndex: 5, symbol: + // vIndex: 4, symbol: // ?getLevelList@ExternalFileLevelStorageSource@@UEAAXAEAV?$vector@V?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@V?$allocator@V?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@@std@@@std@@@Z virtual void getLevelList(std::vector>& paths) = 0; - // vIndex: 6, symbol: + // vIndex: 5, symbol: // ?createLevelStorage@ExternalFileLevelStorageSource@@UEAA?AV?$OwnerPtr@VLevelStorage@@@@AEAVScheduler@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVContentIdentity@@AEBV?$not_null@V?$NonOwnerPointer@$$CBVIContentKeyProvider@@@Bedrock@@@gsl@@AEBV?$duration@_JU?$ratio@$00$0DLJKMKAA@@std@@@chrono@5@V?$not_null@V?$NonOwnerPointer@VLevelDbEnv@@@Bedrock@@@8@V?$unique_ptr@VLevelStorageEventing@@U?$default_delete@VLevelStorageEventing@@@std@@@5@@Z virtual class OwnerPtr createLevelStorage(class Scheduler& scheduler, std::string const& levelId, class ContentIdentity const& contentIdentity, Bedrock::NotNullNonOwnerPtr const& keyProvider, std::chrono::nanoseconds const&, Bedrock::NotNullNonOwnerPtr levelDbEnv, std::unique_ptr) = 0; - // vIndex: 7, symbol: + // vIndex: 6, symbol: // ?createLevelLooseStorage@ExternalFileLevelStorageSource@@UEAA?AV?$unique_ptr@VLevelLooseFileStorage@@U?$default_delete@VLevelLooseFileStorage@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBVContentIdentity@@AEBV?$not_null@V?$NonOwnerPointer@$$CBVIContentKeyProvider@@@Bedrock@@@gsl@@@Z virtual std::unique_ptr createLevelLooseStorage( std::string const& levelId, @@ -61,64 +57,48 @@ class LevelStorageSource : public ::Bedrock::EnableNonOwnerReferences { Bedrock::NotNullNonOwnerPtr const& keyProvider ) = 0; - // vIndex: 8, symbol: - // ?isNewLevelIdAcceptable@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual bool isNewLevelIdAcceptable(std::string const& levelId) = 0; - - // vIndex: 9, symbol: + // vIndex: 7, symbol: // ?deleteLevel@ExternalFileLevelStorageSource@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void deleteLevel(std::string const& levelId) = 0; - // vIndex: 10, symbol: + // vIndex: 8, symbol: // ?renameLevel@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z virtual bool renameLevel(std::string const& levelId, std::string const& newLevelName) = 0; - // vIndex: 11, symbol: + // vIndex: 9, symbol: // ?renameLevel@ExternalFileLevelStorageSource@@UEAAXAEAVLevelData@@AEBVPath@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual void renameLevel(class LevelData& levelData, class Core::Path const& fullPath, std::string const& newLevelName) = 0; - // vIndex: 12, symbol: + // vIndex: 10, symbol: // ?createBackupCopyOfWorld@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z virtual bool createBackupCopyOfWorld(std::string const& levelId, std::string const& newLeveId, std::string const& newName) = 0; - // vIndex: 13, symbol: - // ?isConvertible@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual bool isConvertible(std::string const& levelId) = 0; - - // vIndex: 14, symbol: - // ?requiresConversion@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - virtual bool requiresConversion(std::string const& levelId) = 0; - - // vIndex: 15, symbol: - // ?convertLevel@ExternalFileLevelStorageSource@@UEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEAVProgressListener@@@Z - virtual bool convertLevel(std::string const& levelId, class ProgressListener* progress) = 0; - - // vIndex: 16, symbol: ?isLevelMarkedForSync@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z + // vIndex: 11, symbol: ?isLevelMarkedForSync@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z virtual bool isLevelMarkedForSync(class Core::Path const& levelPath) const = 0; - // vIndex: 17, symbol: ?isLevelPartiallyCopied@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z + // vIndex: 12, symbol: ?isLevelPartiallyCopied@ExternalFileLevelStorageSource@@UEBA_NAEBVPath@Core@@@Z virtual bool isLevelPartiallyCopied(class Core::Path const& levelPath) const = 0; - // vIndex: 18, symbol: + // vIndex: 13, symbol: // ?getLevelDatFoundPath@ExternalFileLevelStorageSource@@UEBA?AV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@AEBVPath@3@@Z virtual class Core::PathBuffer getLevelDatFoundPath(class Core::Path const&) const = 0; - // vIndex: 19, symbol: + // vIndex: 14, symbol: // ?getBasePath@ExternalFileLevelStorageSource@@UEBA?BV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@XZ virtual class Core::PathBuffer const getBasePath() const = 0; - // vIndex: 20, symbol: + // vIndex: 15, symbol: // ?getPathToLevel@ExternalFileLevelStorageSource@@UEBA?BV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual class Core::PathBuffer const getPathToLevel(std::string const& levelId) const = 0; - // vIndex: 21, symbol: + // vIndex: 16, symbol: // ?getPathToLevelInfo@ExternalFileLevelStorageSource@@UEBA?BV?$PathBuffer@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Core@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@_N@Z virtual class Core::PathBuffer const getPathToLevelInfo(std::string const& levelId, bool forceInfo) const = 0; - // vIndex: 22, symbol: + // vIndex: 17, symbol: // ?isBetaRetailLevel@ExternalFileLevelStorageSource@@UEBA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z virtual bool isBetaRetailLevel(std::string const& levelId) const = 0; diff --git a/src/mc/world/level/storage/loot/entries/EmptyLootItem.h b/src/mc/world/level/storage/loot/entries/EmptyLootItem.h index affd7c8566..6faa5db994 100644 --- a/src/mc/world/level/storage/loot/entries/EmptyLootItem.h +++ b/src/mc/world/level/storage/loot/entries/EmptyLootItem.h @@ -15,9 +15,9 @@ class EmptyLootItem : public ::LootPoolEntry { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?_createItem@EmptyLootItem@@MEAA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z + // ?_createItem@EmptyLootItem@@MEBA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z virtual bool - _createItem(std::vector& output, class Random& random, class LootTableContext& context); + _createItem(std::vector& output, class Random& random, class LootTableContext& context) const; // vIndex: 1, symbol: __gen_??1EmptyLootItem@@UEAA@XZ virtual ~EmptyLootItem() = default; diff --git a/src/mc/world/level/storage/loot/entries/LootItem.h b/src/mc/world/level/storage/loot/entries/LootItem.h index d0f5f77d0a..e88cc13834 100644 --- a/src/mc/world/level/storage/loot/entries/LootItem.h +++ b/src/mc/world/level/storage/loot/entries/LootItem.h @@ -20,9 +20,9 @@ class LootItem : public ::LootPoolEntry { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?_createItem@LootItem@@MEAA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z + // ?_createItem@LootItem@@MEBA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z virtual bool - _createItem(std::vector& output, class Random& random, class LootTableContext& context); + _createItem(std::vector& output, class Random& random, class LootTableContext& context) const; // vIndex: 1, symbol: __gen_??1LootItem@@UEAA@XZ virtual ~LootItem() = default; diff --git a/src/mc/world/level/storage/loot/entries/LootPoolEntry.h b/src/mc/world/level/storage/loot/entries/LootPoolEntry.h index d1b37e98eb..c963932e76 100644 --- a/src/mc/world/level/storage/loot/entries/LootPoolEntry.h +++ b/src/mc/world/level/storage/loot/entries/LootPoolEntry.h @@ -17,9 +17,9 @@ class LootPoolEntry { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?_createItem@EmptyLootItem@@MEAA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z + // ?_createItem@EmptyLootItem@@MEBA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z virtual bool - _createItem(std::vector& output, class Random& random, class LootTableContext& context) = 0; + _createItem(std::vector& output, class Random& random, class LootTableContext& context) const = 0; // vIndex: 1, symbol: ??1LootPoolEntry@@UEAA@XZ virtual ~LootPoolEntry(); diff --git a/src/mc/world/level/storage/loot/entries/LootTableEntry.h b/src/mc/world/level/storage/loot/entries/LootTableEntry.h index 66c210ff69..3019d710eb 100644 --- a/src/mc/world/level/storage/loot/entries/LootTableEntry.h +++ b/src/mc/world/level/storage/loot/entries/LootTableEntry.h @@ -15,9 +15,9 @@ class LootTableEntry : public ::LootPoolEntry { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?_createItem@LootTableEntry@@MEAA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z + // ?_createItem@LootTableEntry@@MEBA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z virtual bool - _createItem(std::vector& output, class Random& random, class LootTableContext& context); + _createItem(std::vector& output, class Random& random, class LootTableContext& context) const; // vIndex: 1, symbol: __gen_??1LootTableEntry@@UEAA@XZ virtual ~LootTableEntry() = default; diff --git a/src/mc/world/level/storage/loot/entries/LootTableReference.h b/src/mc/world/level/storage/loot/entries/LootTableReference.h index cc1600275e..de5dbca517 100644 --- a/src/mc/world/level/storage/loot/entries/LootTableReference.h +++ b/src/mc/world/level/storage/loot/entries/LootTableReference.h @@ -20,9 +20,9 @@ class LootTableReference : public ::LootPoolEntry { public: // NOLINTBEGIN // vIndex: 0, symbol: - // ?_createItem@LootTableReference@@MEAA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z + // ?_createItem@LootTableReference@@MEBA_NAEAV?$vector@VItemStack@@V?$allocator@VItemStack@@@std@@@std@@AEAVRandom@@AEAVLootTableContext@@@Z virtual bool - _createItem(std::vector& output, class Random& random, class LootTableContext& context); + _createItem(std::vector& output, class Random& random, class LootTableContext& context) const; // vIndex: 1, symbol: __gen_??1LootTableReference@@UEAA@XZ virtual ~LootTableReference() = default; diff --git a/src/mc/world/level/ticking/TickingArea.h b/src/mc/world/level/ticking/TickingArea.h index 403b1f106d..561a93d887 100644 --- a/src/mc/world/level/ticking/TickingArea.h +++ b/src/mc/world/level/ticking/TickingArea.h @@ -103,17 +103,6 @@ class TickingArea : public ::ITickingArea { // vIndex: 26, symbol: ?updateBlockSourceCurrentTick@TickingArea@@UEAAXAEBUTick@@@Z virtual void updateBlockSourceCurrentTick(struct Tick const& currentTick); - // symbol: - // ??0TickingArea@@QEAA@AEAVDimension@@VUUID@mce@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUBounds@@_NW4TickingAreaLoadMode@@@Z - MCAPI TickingArea( - class Dimension& dimension, - class mce::UUID uniqueId, - std::string const& name, - struct Bounds const& bounds, - bool isCircle, - ::TickingAreaLoadMode loadMode - ); - // NOLINTEND // private: diff --git a/src/mc/world/phys/AABB.h b/src/mc/world/phys/AABB.h index d8eff9baf8..6f62bdfb22 100644 --- a/src/mc/world/phys/AABB.h +++ b/src/mc/world/phys/AABB.h @@ -59,6 +59,9 @@ class AABB : public ll::math::CommutativeGroup { // symbol: ??0AABB@@QEAA@MMMMMM@Z MCAPI AABB(float minX, float minY, float minZ, float maxX, float maxY, float maxZ); + // symbol: ?addAABB@AABB@@QEAAAEAV1@AEBV1@@Z + MCAPI class AABB& addAABB(class AABB const&); + // symbol: ?axisInside@AABB@@QEBA?AVVec3@@AEBV1@V2@@Z MCAPI class Vec3 axisInside(class AABB const& other, class Vec3 axis) const; diff --git a/src/mc/world/scores/Objective.h b/src/mc/world/scores/Objective.h index ac356becff..6262d6de8f 100644 --- a/src/mc/world/scores/Objective.h +++ b/src/mc/world/scores/Objective.h @@ -4,7 +4,15 @@ #include "mc/world/scores/ObjectiveCriteria.h" #include "mc/world/scores/ScoreboardId.h" -class Objective { +// auto generated inclusion list +#include "mc/deps/core/common/bedrock/EnableNonOwnerReferences.h" + +// auto generated forward declare list +// clang-format off +namespace Bedrock { class EnableNonOwnerReferences; } +// clang-format on + +class Objective : public ::Bedrock::EnableNonOwnerReferences { public: std::unordered_map mScores; const std::string mName; @@ -17,6 +25,9 @@ class Objective { public: // NOLINTBEGIN + // vIndex: 0, symbol: __gen_??1Objective@@UEAA@XZ + virtual ~Objective() = default; + // symbol: // ??0Objective@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVObjectiveCriteria@@@Z MCAPI Objective(std::string const& name, class ObjectiveCriteria const& criteria); diff --git a/src/mc/world/scores/Scoreboard.h b/src/mc/world/scores/Scoreboard.h index 2256ddc0a1..961d8e58d7 100644 --- a/src/mc/world/scores/Scoreboard.h +++ b/src/mc/world/scores/Scoreboard.h @@ -240,6 +240,9 @@ class Scoreboard { // symbol: ?resetPlayerScore@Scoreboard@@QEAAXAEBUScoreboardId@@@Z MCAPI void resetPlayerScore(struct ScoreboardId const& id); + // symbol: ?tryGetIdScore@Scoreboard@@QEBA?AV?$optional@UScoreInfo@@@std@@AEBUScoreboardId@@AEB_K@Z + MCAPI std::optional tryGetIdScore(struct ScoreboardId const&, uint64 const&) const; + // symbol: ?shouldClearScoresOnDeath@Scoreboard@@SA_NAEBVActor@@@Z MCAPI static bool shouldClearScoresOnDeath(class Actor const& actor); diff --git a/src/mc/world/trim/ArmorTrim.h b/src/mc/world/trim/ArmorTrim.h index 6add8227c0..3976b4f0f6 100644 --- a/src/mc/world/trim/ArmorTrim.h +++ b/src/mc/world/trim/ArmorTrim.h @@ -14,8 +14,8 @@ class ArmorTrim { // symbol: ??0ArmorTrim@@QEAA@AEBVCompoundTag@@@Z MCAPI explicit ArmorTrim(class CompoundTag const& tag); - // symbol: ?getMaterialId@ArmorTrim@@QEBA?AVHashedString@@XZ - MCAPI class HashedString getMaterialId() const; + // symbol: ?getMaterialId@ArmorTrim@@QEBAAEBVHashedString@@XZ + MCAPI class HashedString const& getMaterialId() const; // symbol: ??1ArmorTrim@@QEAA@XZ MCAPI ~ArmorTrim();