diff --git a/LiteLoader/Header/MC/CommandRegistry.hpp b/LiteLoader/Header/MC/CommandRegistry.hpp index 2cbd56f..1ee3bd6 100644 --- a/LiteLoader/Header/MC/CommandRegistry.hpp +++ b/LiteLoader/Header/MC/CommandRegistry.hpp @@ -359,18 +359,18 @@ public: std::vector mCommandSymbols; // 320 std::map mSignatures; // 344 std::map, int> mTypeLookup; // 360 - std::map unk376; // 376 - std::map mAliases; // 392 - std::vector mSemanticConstraints; // 408 - std::map mSemanticConstraintLookup; // 432 - std::vector mConstrainedValues; // 448 - std::map, unsigned int> mConstrainedValueLookup; // 472 - std::vector mSoftEnums; // 488 - std::map mSoftEnumLookup; // 512 - std::vector mStateStack; // 528 - ParamSymbols mArgs; // 552 - CommandOverrideFunctor mCommandOverrideFunctor; // 640 - // 704 +// std::map unk376; // 376 + std::map mAliases; // 376 + std::vector mSemanticConstraints; // 392 + std::map mSemanticConstraintLookup; // 416 + std::vector mConstrainedValues; // 432 + std::map, unsigned int> mConstrainedValueLookup; // 456 + std::vector mSoftEnums; // 472 + std::map mSoftEnumLookup; // 496 + std::vector mStateStack; // 512 + ParamSymbols mArgs; // 536 + CommandOverrideFunctor mCommandOverrideFunctor; // 624 + // 688 inline void printAll() const; inline void printSize() const; @@ -381,7 +381,7 @@ public: auto mEnumValueLookupCopy = mEnumValueLookup; auto mSignaturesCopy = mSignatures; auto mTypeLookupCopy = mTypeLookup; - auto unk376Copy = unk376; +// auto unk376Copy = unk376; auto mAliasesCopy = mAliases; auto mSemanticConstraintLookupCopy = mSemanticConstraintLookup; auto mConstrainedValueLookupCopy = mConstrainedValueLookup; @@ -392,7 +392,7 @@ public: static_assert(sizeof(Enum) == 72); static_assert(sizeof(ParseTable) == 48); static_assert(sizeof(ParseRule) == 104); - static_assert(sizeof(CommandRegistry) == 0x2c0); + static_assert(sizeof(CommandRegistry) == 0x2b0); static_assert(offsetof(CommandRegistry, mGetScoreForObjective) == 0); static_assert(offsetof(CommandRegistry, mNetworkUpdateCallback) == 64); static_assert(offsetof(CommandRegistry, mRules) == 128); @@ -407,17 +407,17 @@ public: static_assert(offsetof(CommandRegistry, mCommandSymbols) == 320); static_assert(offsetof(CommandRegistry, mSignatures) == 344); static_assert(offsetof(CommandRegistry, mTypeLookup) == 360); - static_assert(offsetof(CommandRegistry, unk376) == 376); - static_assert(offsetof(CommandRegistry, mAliases) == 392); - static_assert(offsetof(CommandRegistry, mSemanticConstraints) == 408); - static_assert(offsetof(CommandRegistry, mSemanticConstraintLookup) == 432); - static_assert(offsetof(CommandRegistry, mConstrainedValues) == 448); - static_assert(offsetof(CommandRegistry, mConstrainedValueLookup) == 472); - static_assert(offsetof(CommandRegistry, mSoftEnums) == 488); - static_assert(offsetof(CommandRegistry, mSoftEnumLookup) == 512); - static_assert(offsetof(CommandRegistry, mStateStack) == 528); - static_assert(offsetof(CommandRegistry, mArgs) == 552); - static_assert(offsetof(CommandRegistry, mCommandOverrideFunctor) == 640); +// static_assert(offsetof(CommandRegistry, unk376) == 376); + static_assert(offsetof(CommandRegistry, mAliases) == 376); + static_assert(offsetof(CommandRegistry, mSemanticConstraints) == 392); + static_assert(offsetof(CommandRegistry, mSemanticConstraintLookup) == 416); + static_assert(offsetof(CommandRegistry, mConstrainedValues) == 432); + static_assert(offsetof(CommandRegistry, mConstrainedValueLookup) == 456); + static_assert(offsetof(CommandRegistry, mSoftEnums) == 472); + static_assert(offsetof(CommandRegistry, mSoftEnumLookup) == 496); + static_assert(offsetof(CommandRegistry, mStateStack) == 512); + static_assert(offsetof(CommandRegistry, mArgs) == 536); + static_assert(offsetof(CommandRegistry, mCommandOverrideFunctor) == 624); } #endif COMMAND_REGISTRY_EXTRA diff --git a/LiteLoader/Kernel/Command/CommandRegistryAPI.cpp b/LiteLoader/Kernel/Command/CommandRegistryAPI.cpp index c5b3e54..3d30beb 100644 --- a/LiteLoader/Kernel/Command/CommandRegistryAPI.cpp +++ b/LiteLoader/Kernel/Command/CommandRegistryAPI.cpp @@ -239,7 +239,7 @@ log["mCommandSymbols "].append(fmt::format(", {:4}", mCommandSymbols.size())); log["mSignatures "].append(fmt::format(", {:4}", mSignatures.size())); log["mTypeLookup "].append(fmt::format(", {:4}", mTypeLookup.size())); - log["unk376 "].append(fmt::format(", {:4}", unk376.size())); +// log["unk376 "].append(fmt::format(", {:4}", unk376.size())); log["mAliases "].append(fmt::format(", {:4}", mAliases.size())); log["mSemanticConstraints "].append(fmt::format(", {:4}", mSemanticConstraints.size())); log["mSemanticConstraintLookup"].append(fmt::format(", {:4}", mSemanticConstraintLookup.size()));