diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index dcc25f3713..be9a898a9c 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -190,7 +190,6 @@ jobs: with: prerelease: false tag: ${{ github.event.inputs.tag }} - bodyFile: RELEASE_NOTES.md artifacts: | build/LiteLoaderBDS.zip build/PDB.zip @@ -203,7 +202,6 @@ jobs: with: prerelease: true tag: ${{ github.event.inputs.tag }} - bodyFile: RELEASE_NOTES.md artifacts: | build/LiteLoaderBDS.zip build/PDB.zip diff --git a/LiteLoader/include/liteloader/Version.h b/LiteLoader/include/liteloader/Version.h index 95b8a15a94..961a58a40c 100644 --- a/LiteLoader/include/liteloader/Version.h +++ b/LiteLoader/include/liteloader/Version.h @@ -5,13 +5,13 @@ #define LITELOADER_VERSION_RELEASE 2 #define LITELOADER_VERSION_MAJOR 2 -#define LITELOADER_VERSION_MINOR 14 -#define LITELOADER_VERSION_REVISION 1 +#define LITELOADER_VERSION_MINOR 15 +#define LITELOADER_VERSION_REVISION 0 #define LITELOADER_VERSION_COMMIT_SHA UNKNOWN #define LITELOADER_VERSION_STATUS LITELOADER_VERSION_DEV #define LITELOADER_VERSION_STATUS_VERSION 0 -#define TARGET_BDS_PROTOCOL_VERSION 589 +#define TARGET_BDS_PROTOCOL_VERSION 594 #define LITELOADER_VERSION ll::getLoaderVersion() diff --git a/LiteLoader/include/llapi/DynamicCommandAPI.h b/LiteLoader/include/llapi/DynamicCommandAPI.h index d7588464e3..d527f5f07a 100644 --- a/LiteLoader/include/llapi/DynamicCommandAPI.h +++ b/LiteLoader/include/llapi/DynamicCommandAPI.h @@ -49,7 +49,8 @@ class Player; bool const*, int const*, float const*, std::string const*, CommandSelector const*, \ CommandSelector const*, CommandPosition const*, CommandPositionFloat const*, CommandRawText const*, \ CommandMessage const*, Json::Value const*, CommandItem const*, CommandBlockName const*, \ - MobEffect const* const*, ActorDefinitionIdentifier const* const*, std::unique_ptr const* + MobEffect const* const*, ActorDefinitionIdentifier const* const*, std::unique_ptr const*, \ + std::vector const* /** * @brief The dynamic command @@ -221,6 +222,7 @@ class DynamicCommand : public Command { ActorType, // ActorDefinitionIdentifier const* Command, // std::unique_ptr WildcardSelector, // WildcardCommandSelector + BlockState, #ifdef ENABLE_PARAMETER_TYPE_POSTFIX Postfix, // int? @@ -466,6 +468,8 @@ class DynamicCommand : public Command { return std::is_same_v>; case ParameterType::Block: return std::is_same_v>; + case ParameterType::BlockState: + return std::is_same_v, std::remove_cv_t<_Ty>>; case ParameterType::Effect: return std::is_same_v>; // case ParameterType::Position: diff --git a/LiteLoader/include/llapi/SendPacketAPI.h b/LiteLoader/include/llapi/SendPacketAPI.h index 6cdc62ab29..4d9e3d7951 100644 --- a/LiteLoader/include/llapi/SendPacketAPI.h +++ b/LiteLoader/include/llapi/SendPacketAPI.h @@ -1,7 +1,6 @@ #pragma once #include "llapi/mc/BinaryStream.hpp" #include "llapi/mc/Packet.hpp" -#include "llapi/mc/ExtendedStreamReadResult.hpp" template class NetworkPacket : public Packet { @@ -26,7 +25,8 @@ class NetworkPacket : public Packet { virtual void write(BinaryStream& bs) const { bs.getRaw().append(view); } - virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &) { + + virtual class Bedrock::Result read(class ReadOnlyBinaryStream&) { throw("TODO"); } virtual bool disallowBatching() const { @@ -36,8 +36,8 @@ class NetworkPacket : public Packet { throw("TODO"); } - virtual ExtendedStreamReadResult _read(class ReadOnlyBinaryStream&) override { + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&) override { throw("TODO in MyPkt::_read()"); - return ExtendedStreamReadResult{(enum StreamReadResult)0, ""}; + //return ExtendedStreamReadResult{(enum StreamReadResult)0, ""}; } }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AABBShapeComponent.hpp b/LiteLoader/include/llapi/mc/AABBShapeComponent.hpp deleted file mode 100644 index 8f581d224c..0000000000 --- a/LiteLoader/include/llapi/mc/AABBShapeComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file AABBShapeComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure AABBShapeComponent. - * - */ -struct AABBShapeComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AABBSHAPECOMPONENT -public: - struct AABBShapeComponent& operator=(struct AABBShapeComponent const &) = delete; - AABBShapeComponent(struct AABBShapeComponent const &) = delete; - AABBShapeComponent() = delete; -#endif - -public: - /** - * @symbol ?toString\@AABBShapeComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string toString() const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Abilities.hpp b/LiteLoader/include/llapi/mc/Abilities.hpp index 57a1837dbe..732cb529d8 100644 --- a/LiteLoader/include/llapi/mc/Abilities.hpp +++ b/LiteLoader/include/llapi/mc/Abilities.hpp @@ -113,10 +113,6 @@ class Abilities { * @symbol ?getDefault\@Abilities\@\@SAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z */ MCAPI static class Ability const & getDefault(enum class AbilitiesIndex); - /** - * @symbol ?getDiff\@Abilities\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z - */ - MCAPI static class std::optional getDiff(class Abilities const &, class Abilities const &); /** * @symbol ?nameToAbilityIndex\@Abilities\@\@SA?AW4AbilitiesIndex\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AbilityCommand.hpp b/LiteLoader/include/llapi/mc/AbilityCommand.hpp index 8d06441766..57b5469794 100644 --- a/LiteLoader/include/llapi/mc/AbilityCommand.hpp +++ b/LiteLoader/include/llapi/mc/AbilityCommand.hpp @@ -36,7 +36,7 @@ class AbilityCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@AbilityCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/AbstractArrow.hpp b/LiteLoader/include/llapi/mc/AbstractArrow.hpp index c98d976496..9037cedb41 100644 --- a/LiteLoader/include/llapi/mc/AbstractArrow.hpp +++ b/LiteLoader/include/llapi/mc/AbstractArrow.hpp @@ -47,157 +47,157 @@ class AbstractArrow : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 46 + * @vftbl 41 * @symbol ?lerpMotion\@AbstractArrow\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@AbstractArrow\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@AbstractArrow\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 87 + * @vftbl 78 * @symbol ?playerTouch\@AbstractArrow\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@AbstractArrow\@\@MEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@AbstractArrow\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@AbstractArrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@AbstractArrow\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?shoot\@AbstractArrow\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?_playPickupSound\@AbstractArrow\@\@MEAAXXZ */ virtual void _playPickupSound(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?_getPickupItem\@ThrownTrident\@\@MEBA?AVItemStack\@\@XZ */ virtual class ItemStack _getPickupItem() const = 0; diff --git a/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp b/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp index ceba2dd89b..7e8ff5a302 100644 --- a/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp @@ -36,20 +36,10 @@ class AbstractCandleBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -60,16 +50,11 @@ class AbstractCandleBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@AbstractCandleBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -82,9 +67,9 @@ class AbstractCandleBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@AbstractCandleBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class AbstractCandleBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class AbstractCandleBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,55 +121,60 @@ class AbstractCandleBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 - * @symbol ?canContainLiquid\@AbstractCandleBlock\@\@UEBA_NXZ + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canContainLiquid() const; + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 98 - * @symbol ?neighborChanged\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 64 + * @symbol ?canContainLiquid\@AbstractCandleBlock\@\@UEBA_NXZ */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + virtual bool canContainLiquid() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 112 - * @symbol ?entityInside\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + virtual void __unk_vfn_84(); + /** + * @vftbl 101 + * @symbol ?neighborChanged\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + */ + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,82 +186,92 @@ class AbstractCandleBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 150 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 148 * @symbol ?animateTick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@AbstractCandleBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 188 + * @symbol ?entityInside\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + /** + * @vftbl 192 * @symbol ?_getNumCandles\@AbstractCandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?_iterateCandles\@AbstractCandleBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ virtual void _iterateCandles(class Block const &, class BlockPos const &, class std::function) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?_tryLightOnFire\@AbstractCandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; diff --git a/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp b/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp index 27ea984fe7..47320f09a5 100644 --- a/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp @@ -50,10 +50,10 @@ class AbstractCompassItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp b/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp deleted file mode 100644 index b768a1c28a..0000000000 --- a/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp +++ /dev/null @@ -1,141 +0,0 @@ -/** - * @file AccessRecordingConstBlockSource.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class AccessRecordingConstBlockSource. - * - */ -class AccessRecordingConstBlockSource { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACCESSRECORDINGCONSTBLOCKSOURCE -public: - class AccessRecordingConstBlockSource& operator=(class AccessRecordingConstBlockSource const &) = delete; - AccessRecordingConstBlockSource(class AccessRecordingConstBlockSource const &) = delete; - AccessRecordingConstBlockSource() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z - */ - virtual class Block const & getBlock(int, int, int) const; - /** - * @vftbl 2 - * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Block const & getBlock(class BlockPos const &) const; - /** - * @vftbl 3 - * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z - */ - virtual class Block const & getBlock(class BlockPos const &, unsigned int) const; - /** - * @vftbl 4 - * @symbol ?getBlockEntity\@AccessRecordingConstBlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z - */ - virtual class BlockActor const * getBlockEntity(class BlockPos const &) const; - /** - * @vftbl 5 - * @symbol ?getExtraBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Block const & getExtraBlock(class BlockPos const &) const; - /** - * @vftbl 6 - * @symbol ?getLiquidBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Block const & getLiquidBlock(class BlockPos const &) const; - /** - * @vftbl 7 - * @symbol ?hasBlock\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z - */ - virtual bool hasBlock(class BlockPos const &) const; - /** - * @vftbl 8 - * @symbol ?containsAnyLiquid\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@\@Z - */ - virtual bool containsAnyLiquid(class AABB const &) const; - /** - * @vftbl 9 - * @symbol ?containsMaterial\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z - */ - virtual bool containsMaterial(class AABB const &, enum class MaterialType) const; - /** - * @vftbl 10 - * @symbol ?getMaterial\@AccessRecordingConstBlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Material const & getMaterial(class BlockPos const &) const; - /** - * @vftbl 11 - * @symbol ?getMaterial\@AccessRecordingConstBlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z - */ - virtual class Material const & getMaterial(int, int, int) const; - /** - * @vftbl 12 - * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z - */ - virtual bool hasChunksAt(struct Bounds const &, bool) const; - /** - * @vftbl 13 - * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z - */ - virtual bool hasChunksAt(class BlockPos const &, int, bool) const; - /** - * @vftbl 14 - * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z - */ - virtual bool hasChunksAt(class AABB const &, bool) const; - /** - * @vftbl 15 - * @symbol ?getDimensionId\@AccessRecordingConstBlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ - */ - virtual class AutomaticID getDimensionId() const; - /** - * @vftbl 16 - * @symbol ?fetchAABBs\@AccessRecordingConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z - */ - virtual void fetchAABBs(std::vector &, class AABB const &, bool) const; - /** - * @vftbl 17 - * @symbol ?fetchCollisionShapes\@AccessRecordingConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z - */ - virtual void fetchCollisionShapes(std::vector &, class AABB const &, float *, bool, class optional_ref) const; - /** - * @vftbl 18 - * @symbol ?getTallestCollisionShape\@AccessRecordingConstBlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z - */ - virtual class AABB getTallestCollisionShape(class AABB const &, float *, bool, class optional_ref) const; - /** - * @vftbl 19 - * @symbol ?getBrightness\@AccessRecordingConstBlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z - */ - virtual float getBrightness(class BlockPos const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACCESSRECORDINGCONSTBLOCKSOURCE - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~AccessRecordingConstBlockSource(); -#endif - /** - * @symbol ?takeAccessedBlocks\@AccessRecordingConstBlockSource\@\@QEHAA?AUAccessedBlockSourceBlocks\@\@XZ - */ - MCAPI struct AccessedBlockSourceBlocks takeAccessedBlocks(); - -}; diff --git a/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp b/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp deleted file mode 100644 index f1e935fa46..0000000000 --- a/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file AccessedBlockSourceBlock.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure AccessedBlockSourceBlock. - * - */ -struct AccessedBlockSourceBlock { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACCESSEDBLOCKSOURCEBLOCK -public: - struct AccessedBlockSourceBlock& operator=(struct AccessedBlockSourceBlock const &) = delete; - AccessedBlockSourceBlock(struct AccessedBlockSourceBlock const &) = delete; - AccessedBlockSourceBlock() = delete; -#endif - -public: - /** - * @symbol ??1AccessedBlockSourceBlock\@\@QEAA\@XZ - */ - MCAPI ~AccessedBlockSourceBlock(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp index 38b6d012d4..c77587b001 100644 --- a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp @@ -36,20 +36,10 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ActivatorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ActivatorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ActivatorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 72 - * @symbol ?onRedstoneUpdate\@ActivatorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 75 + * @symbol ?onRedstoneUpdate\@ActivatorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ - virtual void __unk_vfn_81(); + virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,60 +176,65 @@ class ActivatorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@ActivatorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0ActivatorRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Actor.hpp b/LiteLoader/include/llapi/mc/Actor.hpp index 469ce6bf96..bc6c5c9caf 100644 --- a/LiteLoader/include/llapi/mc/Actor.hpp +++ b/LiteLoader/include/llapi/mc/Actor.hpp @@ -237,1211 +237,1141 @@ class Actor { virtual class Vec3 const getPosExtrapolated(float) const; /** * @vftbl 25 - * @symbol ?getAttachPos\@Actor\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z - */ - virtual class Vec3 getAttachPos(enum class ActorLocation, float) const; - /** - * @vftbl 26 * @symbol ?getFiringPos\@Actor\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 27 - * @symbol ?move\@Actor\@\@UEAAXAEBVVec3\@\@\@Z - */ - virtual void move(class Vec3 const &); - /** - * @vftbl 28 - * @symbol ?move\@Actor\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z - */ - virtual void move(struct IActorMovementProxy &, class Vec3 const &) const; - /** - * @vftbl 29 + * @vftbl 26 * @symbol ?getInterpolatedRidingPosition\@Actor\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getInterpolatedRidingPosition(float) const; /** - * @vftbl 30 + * @vftbl 27 * @symbol ?getInterpolatedBodyRot\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyRot(float) const; /** - * @vftbl 31 + * @vftbl 28 * @symbol ?getInterpolatedHeadRot\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedHeadRot(float) const; /** - * @vftbl 32 + * @vftbl 29 * @symbol ?getInterpolatedBodyYaw\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 33 + * @vftbl 30 * @symbol ?getYawSpeedInDegreesPerSecond\@Actor\@\@UEBAMXZ */ virtual float getYawSpeedInDegreesPerSecond() const; /** - * @vftbl 34 + * @vftbl 31 * @symbol ?getInterpolatedWalkAnimSpeed\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedWalkAnimSpeed(float) const; /** - * @vftbl 35 + * @vftbl 32 * @symbol ?getInterpolatedRidingOffset\@Actor\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 36 + * @vftbl 33 * @symbol ?resetInterpolated\@Actor\@\@UEAAXXZ */ virtual void resetInterpolated(); /** - * @vftbl 37 - * @symbol ?updateEntityInside\@Actor\@\@UEAAXAEBVAABB\@\@\@Z - */ - virtual void updateEntityInside(class AABB const &); - /** - * @vftbl 38 - * @symbol ?updateEntityInside\@Actor\@\@UEAAXXZ - */ - virtual void updateEntityInside(); - /** - * @vftbl 39 + * @vftbl 34 * @symbol ?isFireImmune\@Actor\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 41 + * @vftbl 36 * @symbol ?blockedByShield\@Actor\@\@UEAAXAEBVActorDamageSource\@\@AEAV1\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 42 + * @vftbl 37 * @symbol ?canDisableShield\@Actor\@\@UEAA_NXZ */ virtual bool canDisableShield(); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@Actor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 44 + * @vftbl 39 * @symbol ?tryTeleportTo\@Actor\@\@UEAA_NAEBVVec3\@\@_N1HH\@Z */ virtual bool tryTeleportTo(class Vec3 const &, bool, bool, int, int); /** - * @vftbl 45 + * @vftbl 40 * @symbol ?chorusFruitTeleport\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void chorusFruitTeleport(class Vec3 const &); /** - * @vftbl 46 + * @vftbl 41 * @symbol ?lerpMotion\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 47 + * @vftbl 42 * @symbol ?tryCreateAddActorPacket\@Actor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Actor\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 49 + * @vftbl 44 * @symbol ?baseTick\@Actor\@\@UEAAXXZ */ virtual void baseTick(); /** - * @vftbl 50 + * @vftbl 45 * @symbol ?passengerTick\@Actor\@\@UEAAXXZ */ virtual void passengerTick(); /** - * @vftbl 51 + * @vftbl 46 * @symbol ?positionPassenger\@Actor\@\@UEAAXAEAV1\@M\@Z */ virtual void positionPassenger(class Actor &, float); /** - * @vftbl 52 + * @vftbl 47 * @symbol ?startRiding\@Actor\@\@UEAA_NAEAV1\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 53 + * @vftbl 48 * @symbol ?addPassenger\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 54 - * @symbol ?flagPassengerToRemove\@Actor\@\@UEAAXAEAV1\@\@Z - */ - virtual void flagPassengerToRemove(class Actor &); - /** - * @vftbl 55 + * @vftbl 49 * @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 &, enum class InputMode, enum class NewInteractionModel) const; /** - * @vftbl 56 + * @vftbl 50 * @symbol ?getEntityLocNameString\@Actor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getEntityLocNameString() const; /** - * @vftbl 57 + * @vftbl 51 * @symbol ?intersects\@Actor\@\@UEBA_NAEBVVec3\@\@0\@Z */ virtual bool intersects(class Vec3 const &, class Vec3 const &) const; /** - * @vftbl 58 + * @vftbl 52 * @symbol ?isInWall\@Actor\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 59 + * @vftbl 53 * @symbol ?isInvisible\@Actor\@\@UEBA_NXZ */ virtual bool isInvisible() const; /** - * @vftbl 60 + * @vftbl 54 * @symbol ?canShowNameTag\@Actor\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 62 + * @vftbl 56 * @symbol ?setNameTagVisible\@Actor\@\@UEAAX_N\@Z */ virtual void setNameTagVisible(bool); /** - * @vftbl 63 + * @vftbl 57 * @symbol ?getNameTag\@Actor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getNameTag() const; /** - * @vftbl 64 + * @vftbl 58 * @symbol ?getNameTagAsHash\@Actor\@\@UEBA_KXZ */ virtual unsigned __int64 getNameTagAsHash() const; /** - * @vftbl 65 + * @vftbl 59 * @symbol ?getFormattedNameTag\@Actor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getFormattedNameTag() const; /** - * @vftbl 66 + * @vftbl 60 * @symbol ?filterFormattedNameTag\@Actor\@\@UEAAXAEBVUIProfanityContext\@\@\@Z */ virtual void filterFormattedNameTag(class UIProfanityContext const &); /** - * @vftbl 67 + * @vftbl 61 * @symbol ?setNameTag\@Actor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setNameTag(std::string const &); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 69 + * @vftbl 63 * @symbol ?setScoreTag\@Actor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setScoreTag(std::string const &); /** - * @vftbl 70 + * @vftbl 64 * @symbol ?getScoreTag\@Actor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getScoreTag() const; /** - * @vftbl 71 + * @vftbl 65 * @symbol ?isInWater\@Actor\@\@UEBA_NXZ */ virtual bool isInWater() const; /** - * @vftbl 72 + * @vftbl 66 * @symbol ?isUnderLiquid\@Actor\@\@UEBA_NW4MaterialType\@\@\@Z */ virtual bool isUnderLiquid(enum class MaterialType) const; /** - * @vftbl 73 + * @vftbl 67 * @symbol ?isOverWater\@Actor\@\@UEBA_NXZ */ virtual bool isOverWater() const; /** - * @vftbl 74 - * @symbol ?setBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z - */ - virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); - /** - * @vftbl 75 - * @symbol ?resetBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXXZ - */ - virtual void resetBlockMovementSlowdownMultiplier(); - /** - * @vftbl 76 - * @symbol ?getCameraOffset\@Actor\@\@UEBAMXZ - */ - virtual float getCameraOffset() const; - /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@Actor\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Actor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 79 + * @vftbl 70 * @symbol ?getHeadLookVector\@Actor\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getHeadLookVector(float) const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 81 + * @vftbl 72 * @symbol ?canSee\@Actor\@\@UEBA_NAEBV1\@\@Z */ virtual bool canSee(class Actor const &) const; /** - * @vftbl 82 + * @vftbl 73 * @symbol ?canSee\@Actor\@\@UEBA_NAEBVVec3\@\@\@Z */ virtual bool canSee(class Vec3 const &) const; /** - * @vftbl 83 + * @vftbl 74 * @symbol ?canInteractWithOtherEntitiesInGame\@Actor\@\@UEBA_NXZ */ virtual bool canInteractWithOtherEntitiesInGame() const; /** - * @vftbl 84 + * @vftbl 75 * @symbol ?isSkyLit\@Actor\@\@UEAA_NM\@Z */ virtual bool isSkyLit(float); /** - * @vftbl 85 + * @vftbl 76 * @symbol ?getBrightness\@Actor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 87 + * @vftbl 78 * @symbol ?playerTouch\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 88 - * @symbol ?onAboveBubbleColumn\@Actor\@\@UEAAX_N\@Z - */ - virtual void onAboveBubbleColumn(bool); - /** - * @vftbl 89 - * @symbol ?onInsideBubbleColumn\@Actor\@\@UEAAX_N\@Z - */ - virtual void onInsideBubbleColumn(bool); - /** - * @vftbl 90 + * @vftbl 79 * @symbol ?isImmobile\@Actor\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 91 + * @vftbl 80 * @symbol ?isSilent\@Actor\@\@UEBA_NXZ */ virtual bool isSilent() const; /** - * @vftbl 92 + * @vftbl 81 * @symbol ?isSilentObserver\@Actor\@\@UEBA_NXZ */ virtual bool isSilentObserver() const; /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Actor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 95 + * @vftbl 84 * @symbol ?isSleeping\@Actor\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 96 + * @vftbl 85 * @symbol ?setSleeping\@Actor\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 98 + * @vftbl 87 * @symbol ?setSneaking\@Actor\@\@UEAAX_N\@Z */ virtual void setSneaking(bool); /** - * @vftbl 99 + * @vftbl 88 * @symbol ?isBlocking\@Actor\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 100 + * @vftbl 89 * @symbol ?isDamageBlocked\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isDamageBlocked(class ActorDamageSource const &) const; /** - * @vftbl 101 + * @vftbl 90 * @symbol ?isAlive\@Actor\@\@UEBA_NXZ */ virtual bool isAlive() const; /** - * @vftbl 102 + * @vftbl 91 * @symbol ?isOnFire\@Actor\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 103 + * @vftbl 92 * @symbol ?isOnHotBlock\@Actor\@\@UEBA_NXZ */ virtual bool isOnHotBlock() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 105 + * @vftbl 94 * @symbol ?isSurfaceMob\@Actor\@\@UEBA_NXZ */ virtual bool isSurfaceMob() const; /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 108 + * @vftbl 97 * @symbol ?isRemotePlayer\@Actor\@\@UEBA_NXZ */ virtual bool isRemotePlayer() const; /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 110 + * @vftbl 99 * @symbol ?isAffectedByWaterBottle\@Actor\@\@UEBA_NXZ */ virtual bool isAffectedByWaterBottle() const; /** - * @vftbl 111 + * @vftbl 100 * @symbol ?canAttack\@Actor\@\@UEBA_NPEAV1\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 112 + * @vftbl 101 * @symbol ?setTarget\@Actor\@\@UEAAXPEAV1\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 113 + * @vftbl 102 * @symbol ?isValidTarget\@Actor\@\@UEBA_NPEAV1\@\@Z */ virtual bool isValidTarget(class Actor *) const; /** - * @vftbl 114 + * @vftbl 103 * @symbol ?attack\@Actor\@\@UEAA_NAEAV1\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 115 + * @vftbl 104 * @symbol ?performRangedAttack\@Actor\@\@UEAAXAEAV1\@M\@Z */ virtual void performRangedAttack(class Actor &, float); /** - * @vftbl 116 + * @vftbl 105 * @symbol ?getEquipmentCount\@Actor\@\@UEBAHXZ */ virtual int getEquipmentCount() const; /** - * @vftbl 117 + * @vftbl 106 * @symbol ?setOwner\@Actor\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 118 + * @vftbl 107 * @symbol ?setSitting\@Actor\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 119 + * @vftbl 108 * @symbol ?onTame\@Actor\@\@UEAAXXZ */ virtual void onTame(); /** - * @vftbl 120 + * @vftbl 109 * @symbol ?onFailedTame\@Actor\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 121 + * @vftbl 110 * @symbol ?getInventorySize\@Actor\@\@UEBAHXZ */ virtual int getInventorySize() const; /** - * @vftbl 122 + * @vftbl 111 * @symbol ?getEquipSlots\@Actor\@\@UEBAHXZ */ virtual int getEquipSlots() const; /** - * @vftbl 123 + * @vftbl 112 * @symbol ?getChestSlots\@Actor\@\@UEBAHXZ */ virtual int getChestSlots() const; /** - * @vftbl 124 + * @vftbl 113 * @symbol ?setStanding\@Actor\@\@UEAAX_N\@Z */ virtual void setStanding(bool); /** - * @vftbl 125 + * @vftbl 114 * @symbol ?canPowerJump\@Actor\@\@UEBA_NXZ */ virtual bool canPowerJump() const; /** - * @vftbl 126 + * @vftbl 115 * @symbol ?setCanPowerJump\@Actor\@\@UEAAX_N\@Z */ virtual void setCanPowerJump(bool); /** - * @vftbl 127 + * @vftbl 116 * @symbol ?isEnchanted\@Actor\@\@UEBA_NXZ */ virtual bool isEnchanted() const; /** - * @vftbl 128 - * @symbol ?vehicleLanded\@Actor\@\@UEAAXAEBVVec3\@\@0\@Z - */ - virtual void vehicleLanded(class Vec3 const &, class Vec3 const &); - /** - * @vftbl 129 + * @vftbl 117 * @symbol ?shouldRender\@Actor\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 130 + * @vftbl 118 * @symbol ?playAmbientSound\@Actor\@\@UEAAXXZ */ virtual void playAmbientSound(); /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@Actor\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 133 + * @vftbl 121 * @symbol ?getBlockDamageCause\@Actor\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z */ virtual enum class ActorDamageCause getBlockDamageCause(class Block const &) const; /** - * @vftbl 134 + * @vftbl 122 * @symbol ?animateHurt\@Actor\@\@UEAAXXZ */ virtual void animateHurt(); /** - * @vftbl 135 + * @vftbl 123 * @symbol ?doFireHurt\@Actor\@\@UEAA_NH\@Z */ virtual bool doFireHurt(int); /** - * @vftbl 136 + * @vftbl 124 * @symbol ?onLightningHit\@Actor\@\@UEAAXXZ */ virtual void onLightningHit(); /** - * @vftbl 137 + * @vftbl 125 * @symbol ?onBounceStarted\@Actor\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 138 + * @vftbl 126 * @symbol ?feed\@Actor\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Actor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 140 + * @vftbl 128 * @symbol ?getPickRadius\@Actor\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 141 + * @vftbl 129 * @symbol ?getActorRendererId\@Actor\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getActorRendererId() const; /** - * @vftbl 142 + * @vftbl 130 * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HH\@Z */ virtual class ItemActor * spawnAtLocation(int, int); /** - * @vftbl 143 + * @vftbl 131 * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HHM\@Z */ virtual class ItemActor * spawnAtLocation(int, int, float); /** - * @vftbl 144 + * @vftbl 132 * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@AEBVItemStack\@\@M\@Z */ virtual class ItemActor * spawnAtLocation(class ItemStack const &, float); /** - * @vftbl 145 + * @vftbl 133 * @symbol ?despawn\@Actor\@\@UEAAXXZ */ virtual void despawn(); /** - * @vftbl 146 + * @vftbl 134 * @symbol ?killed\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void killed(class Actor &); /** - * @vftbl 147 + * @vftbl 135 * @symbol ?awardKillScore\@Actor\@\@UEAAXAEAV1\@H\@Z */ virtual void awardKillScore(class Actor &, int); /** - * @vftbl 148 + * @vftbl 136 * @symbol ?setArmor\@Actor\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 149 + * @vftbl 137 * @symbol ?getArmor\@Actor\@\@UEBAAEBVItemStack\@\@W4ArmorSlot\@\@\@Z */ virtual class ItemStack const & getArmor(enum class ArmorSlot) const; /** - * @vftbl 150 + * @vftbl 138 * @symbol ?getAllArmor\@Actor\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllArmor() const; /** - * @vftbl 151 + * @vftbl 139 * @symbol ?getArmorMaterialTypeInSlot\@Actor\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorMaterialType getArmorMaterialTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 152 + * @vftbl 140 * @symbol ?getArmorMaterialTextureTypeInSlot\@Actor\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorTextureType getArmorMaterialTextureTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 153 + * @vftbl 141 * @symbol ?getArmorColorInSlot\@Actor\@\@UEBAMW4ArmorSlot\@\@H\@Z */ virtual float getArmorColorInSlot(enum class ArmorSlot, int) const; /** - * @vftbl 154 + * @vftbl 142 * @symbol ?getEquippedSlot\@Actor\@\@UEBAAEBVItemStack\@\@W4EquipmentSlot\@\@\@Z */ virtual class ItemStack const & getEquippedSlot(enum class EquipmentSlot) const; /** - * @vftbl 155 + * @vftbl 143 * @symbol ?setEquippedSlot\@Actor\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setEquippedSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 156 + * @vftbl 144 * @symbol ?setCarriedItem\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 157 + * @vftbl 145 * @symbol ?getCarriedItem\@Actor\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getCarriedItem() const; /** - * @vftbl 158 + * @vftbl 146 * @symbol ?setOffhandSlot\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 159 + * @vftbl 147 * @symbol ?getEquippedTotem\@Actor\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getEquippedTotem() const; /** - * @vftbl 160 + * @vftbl 148 * @symbol ?consumeTotem\@Actor\@\@UEAA_NXZ */ virtual bool consumeTotem(); /** - * @vftbl 161 + * @vftbl 149 * @symbol ?save\@Actor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 162 + * @vftbl 150 * @symbol ?saveWithoutId\@Actor\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void saveWithoutId(class CompoundTag &) const; /** - * @vftbl 163 + * @vftbl 151 * @symbol ?load\@Actor\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 164 + * @vftbl 152 * @symbol ?loadLinks\@Actor\@\@UEAAXAEBVCompoundTag\@\@AEAV?$vector\@UActorLink\@\@V?$allocator\@UActorLink\@\@\@std\@\@\@std\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void loadLinks(class CompoundTag const &, std::vector &, class DataLoadHelper &); /** - * @vftbl 165 + * @vftbl 153 * @symbol ?getEntityTypeId\@Actor\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 166 + * @vftbl 154 * @symbol ?queryEntityRenderer\@Actor\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & queryEntityRenderer() const; /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 168 + * @vftbl 156 * @symbol ?thawFreezeEffect\@Actor\@\@UEAAXXZ */ virtual void thawFreezeEffect(); /** - * @vftbl 169 + * @vftbl 157 * @symbol ?canFreeze\@Actor\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 170 + * @vftbl 158 * @symbol ?isWearingLeatherArmor\@Actor\@\@UEBA?B_NXZ */ virtual bool const isWearingLeatherArmor() const; /** - * @vftbl 171 + * @vftbl 159 * @symbol ?getLiquidAABB\@Actor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z */ virtual class AABB getLiquidAABB(enum class MaterialType) const; /** - * @vftbl 172 + * @vftbl 160 * @symbol ?handleInsidePortal\@Actor\@\@UEAAXAEBVBlockPos\@\@\@Z */ virtual void handleInsidePortal(class BlockPos const &); /** - * @vftbl 173 + * @vftbl 161 * @symbol ?getPortalCooldown\@Actor\@\@UEBAHXZ */ virtual int getPortalCooldown() const; /** - * @vftbl 174 + * @vftbl 162 * @symbol ?getPortalWaitTime\@Actor\@\@UEBAHXZ */ virtual int getPortalWaitTime() const; /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@Actor\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 177 + * @vftbl 165 * @symbol ?changeDimension\@Actor\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimension(class AutomaticID); /** - * @vftbl 178 + * @vftbl 166 * @symbol ?getControllingPlayer\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 179 + * @vftbl 167 * @symbol ?checkFallDamage\@Actor\@\@UEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@Actor\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 181 + * @vftbl 169 * @symbol ?handleFallDistanceOnServer\@Actor\@\@UEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 182 + * @vftbl 170 * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@_N\@Z */ virtual void playSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, class Block const &, bool); /** - * @vftbl 183 + * @vftbl 171 * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H_N\@Z */ virtual void playSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, int, bool); /** - * @vftbl 184 + * @vftbl 172 * @symbol ?onSynchedFlagUpdate\@Actor\@\@UEAAXH_J0\@Z */ virtual void onSynchedFlagUpdate(int, __int64, __int64); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Actor\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 186 + * @vftbl 174 * @symbol ?canAddPassenger\@Actor\@\@UEBA_NAEAV1\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 187 + * @vftbl 175 * @symbol ?canPickupItem\@Actor\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canPickupItem(class ItemStack const &) const; /** - * @vftbl 188 + * @vftbl 176 * @symbol ?canBePulledIntoVehicle\@Actor\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 189 + * @vftbl 177 * @symbol ?inCaravan\@Actor\@\@UEBA_NXZ */ virtual bool inCaravan() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 191 + * @vftbl 179 * @symbol ?tickLeash\@Actor\@\@UEAAXXZ */ virtual void tickLeash(); /** - * @vftbl 192 + * @vftbl 180 * @symbol ?sendMotionPacketIfNeeded\@Actor\@\@UEAAXXZ */ virtual void sendMotionPacketIfNeeded(); /** - * @vftbl 193 + * @vftbl 181 * @symbol ?canSynchronizeNewEntity\@Actor\@\@UEBA_NXZ */ virtual bool canSynchronizeNewEntity() const; /** - * @vftbl 194 - * @symbol ?stopRiding\@Actor\@\@UEAAX_N00\@Z - */ - virtual void stopRiding(bool, bool, bool); - /** - * @vftbl 195 + * @vftbl 182 * @symbol ?startSwimming\@Actor\@\@UEAAXXZ */ virtual void startSwimming(); /** - * @vftbl 196 + * @vftbl 183 * @symbol ?stopSwimming\@Actor\@\@UEAAXXZ */ virtual void stopSwimming(); /** - * @vftbl 197 + * @vftbl 184 * @symbol ?buildDebugInfo\@Actor\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 198 + * @vftbl 185 * @symbol ?getCommandPermissionLevel\@Actor\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getCommandPermissionLevel() const; /** - * @vftbl 199 + * @vftbl 186 * @symbol ?isClientSide\@Actor\@\@UEBA_NXZ */ virtual bool isClientSide() const; /** - * @vftbl 200 + * @vftbl 187 * @symbol ?getMutableAttribute\@Actor\@\@UEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ virtual class AttributeInstance * getMutableAttribute(class Attribute const &); /** - * @vftbl 201 + * @vftbl 188 * @symbol ?getAttribute\@Actor\@\@UEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ virtual class AttributeInstance const & getAttribute(class Attribute const &) const; /** - * @vftbl 202 + * @vftbl 189 * @symbol ?getDeathTime\@Actor\@\@UEBAHXZ */ virtual int getDeathTime() const; /** - * @vftbl 203 + * @vftbl 190 * @symbol ?heal\@Actor\@\@UEAAXH\@Z */ virtual void heal(int); /** - * @vftbl 204 + * @vftbl 191 * @symbol ?isInvertedHealAndHarm\@Actor\@\@UEBA_NXZ */ virtual bool isInvertedHealAndHarm() const; /** - * @vftbl 205 + * @vftbl 192 * @symbol ?canBeAffected\@Actor\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 206 + * @vftbl 193 * @symbol ?canBeAffectedByArrow\@Actor\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 207 + * @vftbl 194 * @symbol ?onEffectAdded\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectAdded(class MobEffectInstance &); /** - * @vftbl 208 + * @vftbl 195 * @symbol ?onEffectUpdated\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectUpdated(class MobEffectInstance &); /** - * @vftbl 209 + * @vftbl 196 * @symbol ?onEffectRemoved\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectRemoved(class MobEffectInstance &); /** - * @vftbl 210 + * @vftbl 197 * @symbol ?canObstructSpawningAndBlockPlacement\@Actor\@\@UEBA_NXZ */ virtual bool canObstructSpawningAndBlockPlacement() const; /** - * @vftbl 211 + * @vftbl 198 * @symbol ?getAnimationComponent\@Actor\@\@UEAAAEAVAnimationComponent\@\@XZ */ virtual class AnimationComponent & getAnimationComponent(); /** - * @vftbl 212 + * @vftbl 199 * @symbol ?openContainerComponent\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void openContainerComponent(class Player &); /** - * @vftbl 213 + * @vftbl 200 * @symbol ?swing\@Actor\@\@UEAAXXZ */ virtual void swing(); /** - * @vftbl 214 + * @vftbl 201 * @symbol ?useItem\@Actor\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z */ virtual void useItem(class ItemStackBase &, enum class ItemUseMethod, bool); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 217 + * @vftbl 204 * @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 &); /** - * @vftbl 218 + * @vftbl 205 * @symbol ?getMapDecorationRotation\@Actor\@\@UEBAMXZ */ virtual float getMapDecorationRotation() const; /** - * @vftbl 219 + * @vftbl 206 * @symbol ?getPassengerYRotation\@Actor\@\@UEBAMAEBV1\@\@Z */ virtual float getPassengerYRotation(class Actor const &) const; /** - * @vftbl 220 + * @vftbl 207 * @symbol ?add\@Actor\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 221 + * @vftbl 208 * @symbol ?drop\@Actor\@\@UEAA_NAEBVItemStack\@\@_N\@Z */ virtual bool drop(class ItemStack const &, bool); /** - * @vftbl 222 + * @vftbl 209 * @symbol ?getInteraction\@Actor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 223 + * @vftbl 210 * @symbol ?canDestroyBlock\@Actor\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroyBlock(class Block const &) const; /** - * @vftbl 224 + * @vftbl 211 * @symbol ?setAuxValue\@Actor\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 225 + * @vftbl 212 * @symbol ?setSize\@Actor\@\@UEAAXMM\@Z */ virtual void setSize(float, float); /** - * @vftbl 226 + * @vftbl 213 * @symbol ?onOrphan\@Actor\@\@UEAAXXZ */ virtual void onOrphan(); /** - * @vftbl 227 + * @vftbl 214 * @symbol ?wobble\@Actor\@\@UEAAXXZ */ virtual void wobble(); /** - * @vftbl 228 + * @vftbl 215 * @symbol ?wasHurt\@Actor\@\@UEAA_NXZ */ virtual bool wasHurt(); /** - * @vftbl 229 + * @vftbl 216 * @symbol ?startSpinAttack\@Actor\@\@UEAAXXZ */ virtual void startSpinAttack(); /** - * @vftbl 230 + * @vftbl 217 * @symbol ?stopSpinAttack\@Actor\@\@UEAAXXZ */ virtual void stopSpinAttack(); /** - * @vftbl 231 + * @vftbl 218 * @symbol ?setDamageNearbyMobs\@Actor\@\@UEAAX_N\@Z */ virtual void setDamageNearbyMobs(bool); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 233 + * @vftbl 220 * @symbol ?reloadLootTable\@Actor\@\@UEAAXXZ */ virtual void reloadLootTable(); /** - * @vftbl 234 + * @vftbl 221 * @symbol ?reloadLootTable\@Actor\@\@UEAAXAEBUEquipmentTableDefinition\@\@\@Z */ virtual void reloadLootTable(struct EquipmentTableDefinition const &); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 236 + * @vftbl 223 * @symbol ?kill\@Actor\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@Actor\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 238 + * @vftbl 225 * @symbol ?shouldDropDeathLoot\@Actor\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 239 + * @vftbl 226 * @symbol ?shouldTick\@Actor\@\@UEBA_NXZ */ virtual bool shouldTick() const; /** - * @vftbl 240 + * @vftbl 227 * @symbol ?applySnapshot\@Actor\@\@UEAAXAEBVEntityContext\@\@0\@Z */ virtual void applySnapshot(class EntityContext const &, class EntityContext const &); /** - * @vftbl 241 + * @vftbl 228 * @symbol ?getNextStep\@Actor\@\@UEAAMM\@Z */ virtual float getNextStep(float); /** - * @vftbl 242 + * @vftbl 229 * @symbol ?getLootTable\@Actor\@\@UEAAPEAVLootTable\@\@XZ */ virtual class LootTable * getLootTable(); /** - * @vftbl 243 + * @vftbl 230 * @symbol ?onPush\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void onPush(class Actor &); /** - * @vftbl 244 + * @vftbl 231 * @symbol ?getLastDeathPos\@Actor\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getLastDeathPos() const; /** - * @vftbl 245 + * @vftbl 232 * @symbol ?getLastDeathDimension\@Actor\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ */ virtual class std::optional> getLastDeathDimension() const; /** - * @vftbl 246 + * @vftbl 233 * @symbol ?hasDiedBefore\@Actor\@\@UEBA_NXZ */ virtual bool hasDiedBefore() const; /** - * @vftbl 247 + * @vftbl 234 * @symbol ?doWaterSplashEffect\@Actor\@\@UEAAXXZ */ virtual void doWaterSplashEffect(); /** - * @vftbl 248 + * @vftbl 235 * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Actor\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnHandContainerItemSet(enum class HandSlot, class ItemStack const &) const; /** - * @vftbl 249 + * @vftbl 236 * @symbol ?_shouldProvideFeedbackOnArmorSet\@Actor\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnArmorSet(enum class ArmorSlot, class ItemStack const &) const; /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Actor\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 251 + * @vftbl 238 * @symbol ?shouldTryMakeStepSound\@Actor\@\@MEAA_NXZ */ virtual bool shouldTryMakeStepSound(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Actor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 254 + * @vftbl 241 * @symbol ?markHurt\@Actor\@\@MEAAXXZ */ virtual void markHurt(); /** - * @vftbl 255 + * @vftbl 242 * @symbol ?_getAnimationComponent\@Actor\@\@MEAAAEAVAnimationComponent\@\@AEAV?$shared_ptr\@VAnimationComponent\@\@\@std\@\@W4AnimationComponentGroupType\@\@\@Z */ virtual class AnimationComponent & _getAnimationComponent(class std::shared_ptr &, enum class AnimationComponentGroupType); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Actor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Actor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 259 + * @vftbl 246 * @symbol ?_playFlySound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playFlySound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 261 - * @symbol ?checkInsideBlocks\@Actor\@\@MEAAXM\@Z + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void checkInsideBlocks(float); + virtual void __unk_vfn_247(); /** - * @vftbl 262 + * @vftbl 248 * @symbol ?pushOutOfBlocks\@Actor\@\@MEAAXAEBVVec3\@\@\@Z */ virtual void pushOutOfBlocks(class Vec3 const &); /** - * @vftbl 263 + * @vftbl 249 * @symbol ?spawnTrailBubbles\@Actor\@\@MEAAXXZ */ virtual void spawnTrailBubbles(); /** - * @vftbl 264 + * @vftbl 250 * @symbol ?updateInsideBlock\@Actor\@\@MEAAXXZ */ virtual void updateInsideBlock(); /** - * @vftbl 265 + * @vftbl 251 * @symbol ?_removePassenger\@Actor\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z */ virtual void _removePassenger(struct ActorUniqueID const &, bool, bool, bool); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Actor\@\@EEAAXXZ */ virtual void _onSizeUpdated(); @@ -1583,10 +1513,6 @@ class Actor { * @symbol ?burn\@Actor\@\@QEAAXH_N\@Z */ MCAPI void burn(int, bool); - /** - * @symbol ?cacheComponentData\@Actor\@\@QEAAXXZ - */ - MCAPI void cacheComponentData(); /** * @symbol ?calcCenterPos\@Actor\@\@QEBA?AVVec3\@\@XZ */ @@ -1631,22 +1557,18 @@ class Actor { * @symbol ?celebrateHunt\@Actor\@\@QEAAXH_N\@Z */ MCAPI void celebrateHunt(int, bool); - /** - * @symbol ?checkInsideCauldron\@Actor\@\@QEAAXXZ - */ - MCAPI void checkInsideCauldron(); /** * @symbol ?clearFishingHookID\@Actor\@\@QEAAXXZ */ MCAPI void clearFishingHookID(); - /** - * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@MM\@Z - */ - MCAPI bool closerThan(class Actor const &, float, float) const; /** * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@M\@Z */ MCAPI bool closerThan(class Actor const &, float) const; + /** + * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@MM\@Z + */ + MCAPI bool closerThan(class Actor const &, float, float) const; /** * @symbol ?consumeItem\@Actor\@\@QEAAXAEAVItemActor\@\@H\@Z */ @@ -1671,14 +1593,14 @@ class Actor { * @symbol ?distanceSqrToBlockPosCenter\@Actor\@\@QEBAMAEBVBlockPos\@\@\@Z */ MCAPI float distanceSqrToBlockPosCenter(class BlockPos const &) const; - /** - * @symbol ?distanceTo\@Actor\@\@QEBAMAEBVVec3\@\@\@Z - */ - MCAPI float distanceTo(class Vec3 const &) const; /** * @symbol ?distanceTo\@Actor\@\@QEBAMAEBV1\@\@Z */ MCAPI float distanceTo(class Actor const &) const; + /** + * @symbol ?distanceTo\@Actor\@\@QEBAMAEBVVec3\@\@\@Z + */ + MCAPI float distanceTo(class Vec3 const &) const; /** * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBV1\@\@Z */ @@ -1739,26 +1661,26 @@ class Actor { * @symbol ?getAllEffects\@Actor\@\@QEBAAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getAllEffects() const; - /** - * @symbol ?getArmorContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ - */ - MCAPI class SimpleContainer & getArmorContainer(); /** * @symbol ?getArmorContainer\@Actor\@\@QEBAAEBVSimpleContainer\@\@XZ */ MCAPI class SimpleContainer const & getArmorContainer() const; /** - * @symbol ?getAttributes\@Actor\@\@QEAA?AV?$not_null\@PEAVBaseAttributeMap\@\@\@gsl\@\@XZ + * @symbol ?getArmorContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ */ - MCAPI class gsl::not_null getAttributes(); + MCAPI class SimpleContainer & getArmorContainer(); + /** + * @symbol ?getAttachPos\@Actor\@\@QEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z + */ + MCAPI class Vec3 getAttachPos(enum class ActorLocation, float) const; /** * @symbol ?getAttributes\@Actor\@\@QEBA?AV?$not_null\@PEBVBaseAttributeMap\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null getAttributes() const; /** - * @symbol ?getBlockMovementSlowdownMultiplier\@Actor\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getAttributes\@Actor\@\@QEAA?AV?$not_null\@PEAVBaseAttributeMap\@\@\@gsl\@\@XZ */ - MCAPI class Vec3 const & getBlockMovementSlowdownMultiplier() const; + MCAPI class gsl::not_null getAttributes(); /** * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@QEBA?AVBlockPos\@\@PEBV1\@\@Z */ @@ -1783,6 +1705,10 @@ class Actor { * @symbol ?getChainedDamageEffects\@Actor\@\@QEBA_NXZ */ MCAPI bool getChainedDamageEffects() const; + /** + * @symbol ?getCollidableMob\@Actor\@\@QEBA_NXZ + */ + MCAPI bool getCollidableMob() const; /** * @symbol ?getColor\@Actor\@\@QEBA?AW4PaletteColor\@\@XZ */ @@ -1831,14 +1757,14 @@ class Actor { * @symbol ?getDimensionId\@Actor\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID getDimensionId() const; - /** - * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z - */ - MCAPI class MobEffectInstance const * getEffect(unsigned int) const; /** * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@AEBVMobEffect\@\@\@Z */ MCAPI class MobEffectInstance const * getEffect(class MobEffect const &) const; + /** + * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z + */ + MCAPI class MobEffectInstance const * getEffect(unsigned int) const; /** * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ */ @@ -1991,14 +1917,14 @@ class Actor { * @symbol ?getOnDeathExperience\@Actor\@\@QEAAHXZ */ MCAPI int getOnDeathExperience(); - /** - * @symbol ?getOnewayPhysicsBlocks\@Actor\@\@QEBAAEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getOnewayPhysicsBlocks() const; /** * @symbol ?getOrAddDynamicProperties\@Actor\@\@QEAAAEAVDynamicProperties\@\@XZ */ MCAPI class DynamicProperties & getOrAddDynamicProperties(); + /** + * @symbol ?getOrCreateUniqueID\@Actor\@\@QEBAAEBUActorUniqueID\@\@XZ + */ + MCAPI struct ActorUniqueID const & getOrCreateUniqueID() const; /** * @symbol ?getOwner\@Actor\@\@QEBAPEAVMob\@\@XZ */ @@ -2123,10 +2049,6 @@ class Actor { * @symbol ?getTradingPlayer\@Actor\@\@QEBAPEAVPlayer\@\@XZ */ MCAPI class Player * getTradingPlayer() const; - /** - * @symbol ?getUniqueID\@Actor\@\@QEBAAEBUActorUniqueID\@\@XZ - */ - MCAPI struct ActorUniqueID const & getUniqueID() const; /** * @symbol ?getVariant\@Actor\@\@QEBAHXZ */ @@ -2475,10 +2397,6 @@ class Actor { * @symbol ?isRiding\@Actor\@\@QEBA_NXZ */ MCAPI bool isRiding() const; - /** - * @symbol ?isSafeToSleepNear\@Actor\@\@QEBA_NXZ - */ - MCAPI bool isSafeToSleepNear() const; /** * @symbol ?isSheared\@Actor\@\@QEBA_NXZ */ @@ -2576,9 +2494,9 @@ class Actor { */ MCAPI void migrateUniqueID(struct ActorUniqueID); /** - * @symbol ?moveBBs\@Actor\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?move\@Actor\@\@QEAAXAEBVVec3\@\@\@Z */ - MCAPI void moveBBs(class Vec3 const &); + MCAPI void move(class Vec3 const &); /** * @symbol ?moveRelative\@Actor\@\@QEAAXMMMM\@Z */ @@ -2619,14 +2537,14 @@ class Actor { * @symbol ?playSound\@Actor\@\@QEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z */ MCAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int); - /** - * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z - */ - MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, class Block const &); /** * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z */ MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int); + /** + * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z + */ + MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, class Block const &); /** * @symbol ?positionAllPassengers\@Actor\@\@QEAAXXZ */ @@ -2763,6 +2681,10 @@ class Actor { * @symbol ?setColor\@Actor\@\@QEAAXW4PaletteColor\@\@\@Z */ MCAPI void setColor(enum class PaletteColor); + /** + * @symbol ?setColor2\@Actor\@\@QEAAXW4PaletteColor\@\@\@Z + */ + MCAPI void setColor2(enum class PaletteColor); /** * @symbol ?setControllingSeat\@Actor\@\@QEAAXH\@Z */ @@ -2931,10 +2853,6 @@ class Actor { * @symbol ?setScared\@Actor\@\@QEAAX_N\@Z */ MCAPI void setScared(bool); - /** - * @symbol ?setSeatDescription\@Actor\@\@QEAAXAEBVVec3\@\@AEBUSeatDescription\@\@\@Z - */ - MCAPI void setSeatDescription(class Vec3 const &, struct SeatDescription const &); /** * @symbol ?setShakeTime\@Actor\@\@QEAAXH\@Z */ @@ -2943,10 +2861,6 @@ class Actor { * @symbol ?setSkinID\@Actor\@\@QEAAXH\@Z */ MCAPI void setSkinID(int); - /** - * @symbol ?setSlideOffset\@Actor\@\@QEAAXAEBVVec2\@\@\@Z - */ - MCAPI void setSlideOffset(class Vec2 const &); /** * @symbol ?setStrength\@Actor\@\@QEAAXH\@Z */ @@ -3028,21 +2942,17 @@ class Actor { */ MCAPI void spinAttack(); /** - * @symbol ?teleportPassengersTo\@Actor\@\@QEAAXAEBVVec3\@\@HH\@Z + * @symbol ?stopRiding\@Actor\@\@QEAAX_N00\@Z */ - MCAPI void teleportPassengersTo(class Vec3 const &, int, int); + MCAPI void stopRiding(bool, bool, bool); /** - * @symbol ?testForEntityStacking\@Actor\@\@QEAAXAEAVBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?teleportPassengersTo\@Actor\@\@QEAAXAEBVVec3\@\@HH\@Z */ - MCAPI void testForEntityStacking(class BlockSource &, class AABB const &, std::vector &); + MCAPI void teleportPassengersTo(class Vec3 const &, int, int); /** * @symbol ?tick\@Actor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool tick(class BlockSource &); - /** - * @symbol ?tickBlockDamage\@Actor\@\@QEAAXXZ - */ - MCAPI void tickBlockDamage(); /** * @symbol ?transferTickingArea\@Actor\@\@QEAAXAEAVDimension\@\@\@Z */ @@ -3091,10 +3001,6 @@ class Actor { * @symbol ?wasLoadedFromNBTThisFrame\@Actor\@\@QEBA_NXZ */ MCAPI bool wasLoadedFromNBTThisFrame() const; - /** - * @symbol ?_move\@Actor\@\@SAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z - */ - MCAPI static void _move(struct IActorMovementProxy &, class Vec3 const &); /** * @symbol ?_moveRelative\@Actor\@\@SAXAEAVVec3\@\@MMMMM\@Z */ @@ -3107,14 +3013,14 @@ class Actor { * @symbol ?canBeginOrContinueClimbingLadder\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static bool canBeginOrContinueClimbingLadder(struct IActorMovementProxy const &, class IConstBlockSource const &); - /** - * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@SA?AVBlockPos\@\@AEBUIActorMovementProxy\@\@PEBU3\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static class BlockPos getBlockPosCurrentlyStandingOn(struct IActorMovementProxy const &, struct IActorMovementProxy const *, class IConstBlockSource const &); /** * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@SA?AVBlockPos\@\@AEBVVec3\@\@VAABB\@\@AEBVIConstBlockSource\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ MCAPI static class BlockPos getBlockPosCurrentlyStandingOn(class Vec3 const &, class AABB, class IConstBlockSource const &, class optional_ref); + /** + * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@SA?AVBlockPos\@\@AEBUIActorMovementProxy\@\@PEBU3\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI static class BlockPos getBlockPosCurrentlyStandingOn(struct IActorMovementProxy const &, struct IActorMovementProxy const *, class IConstBlockSource const &); /** * @symbol ?getCenter\@Actor\@\@SA?AVVec3\@\@MAEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@M\@Z */ @@ -3147,14 +3053,6 @@ class Actor { * @symbol ?getViewVector\@Actor\@\@SA?AVVec3\@\@AEBVVec2\@\@0M\@Z */ MCAPI static class Vec3 getViewVector(class Vec2 const &, class Vec2 const &, float); - /** - * @symbol ?hasSubBBIn\@Actor\@\@SA_NAEBVIConstBlockSource\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@W4MaterialType\@\@\@Z - */ - MCAPI static bool hasSubBBIn(class IConstBlockSource const &, std::vector const &, enum class MaterialType); - /** - * @symbol ?isFree\@Actor\@\@SA_NAEAUIActorMovementProxy\@\@AEBVVec3\@\@AEBVIConstBlockSource\@\@M\@Z - */ - MCAPI static bool isFree(struct IActorMovementProxy &, class Vec3 const &, class IConstBlockSource const &, float); /** * @symbol ?isImmersedInWater\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ @@ -3175,18 +3073,14 @@ class Actor { * @symbol ?isStanding\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isStanding(struct IActorMovementProxy const &); - /** - * @symbol ?moveRelative\@Actor\@\@SAXAEAUIActorMovementProxy\@\@MMMM\@Z - */ - MCAPI static void moveRelative(struct IActorMovementProxy &, float, float, float, float); /** * @symbol ?onClimbableBlock\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool onClimbableBlock(struct IActorMovementProxy const &); /** - * @symbol ?testForCollidableMobs\@Actor\@\@SAXAEBUIActorMovementProxy\@\@AEAVBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?onClimbableBlock\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void testForCollidableMobs(struct IActorMovementProxy const &, class BlockSource &, class AABB const &, std::vector &); + MCAPI static bool onClimbableBlock(struct IActorMovementProxy const &, class IConstBlockSource const &); /** * @symbol ?tryGetFromComponent\@Actor\@\@SAPEAV1\@AEAVActorOwnerComponent\@\@_N\@Z */ @@ -3270,13 +3164,9 @@ class Actor { */ MCAPI void enableAutoSendPosRot(bool); /** - * @symbol ?updateWaterState\@Actor\@\@IEAA_NXZ + * @symbol ?updateWaterState\@Actor\@\@IEAAXXZ */ - MCAPI bool updateWaterState(); - /** - * @symbol ?getBlockWhenClimbing\@Actor\@\@KAAEBVBlock\@\@AEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static class Block const & getBlockWhenClimbing(struct IActorMovementProxy const &, class IConstBlockSource const &); + MCAPI void updateWaterState(); /** * @symbol ?getBlockWhenClimbing\@Actor\@\@KAAEBVBlock\@\@AEBUIActorMovementProxy\@\@\@Z */ @@ -3312,9 +3202,9 @@ class Actor { */ MCAPI bool _isItemStackNetManagerEnabled() const; /** - * @symbol ?_onVibrationDetected\@Actor\@\@AEAAXXZ + * @symbol ?_moveHitboxTo\@Actor\@\@AEAAXAEBVVec3\@\@\@Z */ - MCAPI void _onVibrationDetected(); + MCAPI void _moveHitboxTo(class Vec3 const &); /** * @symbol ?_serializeComponents\@Actor\@\@AEBAXAEAVCompoundTag\@\@\@Z */ @@ -3331,10 +3221,6 @@ class Actor { * @symbol ?_updateComposition\@Actor\@\@AEAAX_N\@Z */ MCAPI void _updateComposition(bool); - /** - * @symbol ?_containsSneakCollisionShapes\@Actor\@\@CA_NAEAUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static bool _containsSneakCollisionShapes(struct IActorMovementProxy &, class IConstBlockSource const &, class AABB const &, std::vector &); protected: diff --git a/LiteLoader/include/llapi/mc/ActorBlock.hpp b/LiteLoader/include/llapi/mc/ActorBlock.hpp index bfb2d4f621..848d78ef6a 100644 --- a/LiteLoader/include/llapi/mc/ActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActorBlock.hpp @@ -36,20 +36,10 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ActorBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ActorBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ActorBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +116,70 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@ActorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 115 + * @vftbl 116 * @symbol ?triggerEvent\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,57 +191,62 @@ class ActorBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getEntityResourceItem\@ActorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp index 409687af91..53c10f1702 100644 --- a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp +++ b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp @@ -25,10 +25,6 @@ namespace ActorContainerDiffHelperImpl { * @symbol ?_applyDiff\@ActorContainerDiffHelperImpl\@\@YAXAEAVBaseAttributeMap\@\@AEBV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _applyDiff(class BaseAttributeMap &, std::vector> const &); - /** - * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@\@Z - */ - MCAPI std::vector> const _createListOfPointers(std::vector const &); /** * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVBaseAttributeMap\@\@\@Z */ @@ -37,6 +33,10 @@ namespace ActorContainerDiffHelperImpl { * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVSynchedActorData\@\@\@Z */ MCAPI std::vector> const _createListOfPointers(class SynchedActorData const &); + /** + * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@\@Z + */ + MCAPI std::vector> const _createListOfPointers(std::vector const &); /** * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?AV?$vector\@V?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVSynchedActorData\@\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp index 9df03ff98e..85f044f653 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp @@ -22,6 +22,10 @@ class ActorDefinitionDescriptor { #undef AFTER_EXTRA public: + /** + * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &); /** * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@XZ */ @@ -30,10 +34,6 @@ class ActorDefinitionDescriptor { * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor &&); - /** - * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &); /** * @symbol ?combine\@ActorDefinitionDescriptor\@\@QEAAAEAV1\@AEBV1\@\@Z */ @@ -62,14 +62,14 @@ class ActorDefinitionDescriptor { * @symbol ?hasNavigationSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ */ MCAPI bool hasNavigationSubComponent(); - /** - * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor &&); /** * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor const &); + /** + * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z + */ + MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor &&); /** * @symbol ?overlaps\@ActorDefinitionDescriptor\@\@QEBA_NAEBV1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp index 1572e85b85..f97b6ad3ba 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp @@ -53,6 +53,10 @@ struct LoadActorResult { * @symbol ?tryGetDefinitionGroup\@ActorDefinitionGroup\@\@QEAA?AVActorDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI class ActorDefinitionPtr tryGetDefinitionGroup(std::string const &, std::string const &); + /** + * @symbol ?forEachComponentOf\@ActorDefinitionGroup\@\@SAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AXAEAVValue\@Json\@\@0\@Z\@5\@\@Z + */ + MCAPI static void forEachComponentOf(class Json::Value &, std::string const &, class std::function const &); /** * @symbol ?loadActorDefinitionIdentifier\@ActorDefinitionGroup\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp index f6f70d0422..f8bad6662e 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp @@ -32,14 +32,14 @@ struct ActorDefinitionIdentifier { * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@W4ActorType\@\@\@Z */ MCAPI ActorDefinitionIdentifier(enum class ActorType); - /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); /** * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ */ MCAPI ActorDefinitionIdentifier(); + /** + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z + */ + MCAPI ActorDefinitionIdentifier(char const *); /** * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@$$QEAU0\@\@Z */ @@ -48,14 +48,14 @@ struct ActorDefinitionIdentifier { * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCAPI ActorDefinitionIdentifier(std::string, std::string, std::string); - /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z - */ - MCAPI ActorDefinitionIdentifier(char const *); /** * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ActorDefinitionIdentifier(std::string const &); + /** + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); /** * @symbol ?_getLegacyActorType\@ActorDefinitionIdentifier\@\@QEBA?AW4ActorType\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorEnvironment.hpp b/LiteLoader/include/llapi/mc/ActorEnvironment.hpp index 74fa87f9d7..f530317407 100644 --- a/LiteLoader/include/llapi/mc/ActorEnvironment.hpp +++ b/LiteLoader/include/llapi/mc/ActorEnvironment.hpp @@ -20,10 +20,6 @@ namespace ActorEnvironment { * @symbol ?getHeadInWater\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool getHeadInWater(class EntityContext const &); - /** - * @symbol ?getIsInLava\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z - */ - MCAPI bool getIsInLava(class EntityContext const &); /** * @symbol ?getIsInWater\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z */ @@ -32,10 +28,6 @@ namespace ActorEnvironment { * @symbol ?setHeadInWater\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setHeadInWater(class EntityContext &, bool); - /** - * @symbol ?setIsInLava\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z - */ - MCAPI void setIsInLava(class EntityContext &, bool); /** * @symbol ?setIsInWater\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorEventBroadcaster.hpp b/LiteLoader/include/llapi/mc/ActorEventBroadcaster.hpp new file mode 100644 index 0000000000..37f4487bac --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorEventBroadcaster.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorEventBroadcaster.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorEventBroadcaster { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTOREVENTBROADCASTER +public: + class ActorEventBroadcaster& operator=(class ActorEventBroadcaster const &) = delete; + ActorEventBroadcaster(class ActorEventBroadcaster const &) = delete; + ActorEventBroadcaster() = delete; +#endif + +public: + /** + * @symbol ?broadcastActorEvent\@ActorEventBroadcaster\@\@QEBAXAEAVActor\@\@W4ActorEvent\@\@HAEAVDimension\@\@\@Z + */ + MCAPI void broadcastActorEvent(class Actor &, enum class ActorEvent, int, class Dimension &) const; + +}; diff --git a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp index 4128fa238b..5d0a08a5fe 100644 --- a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp @@ -45,10 +45,6 @@ class ActorEventCoordinator { * @symbol ?sendActorCreationAttemptFailed\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI void sendActorCreationAttemptFailed(class Actor &, class std::basic_string_view>); - /** - * @symbol ?sendActorMove\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z - */ - MCAPI void sendActorMove(class Actor &, class Vec3 const &); /** * @symbol ?sendActorPredictedMove\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@W4MovePredictionType\@\@AEBVVec3\@\@\@Z */ @@ -77,14 +73,14 @@ class ActorEventCoordinator { * @symbol ?sendActorTick\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void sendActorTick(class Actor &); - /** - * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$ActorGameplayEvent\@X\@\@\@\@\@Z - */ - MCAPI void sendEvent(class EventRef> const &); /** * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ MCAPI enum class CoordinatorResult sendEvent(class EventRef>); + /** + * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$ActorGameplayEvent\@X\@\@\@\@\@Z + */ + MCAPI void sendEvent(class EventRef> const &); /** * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorEventListener.hpp b/LiteLoader/include/llapi/mc/ActorEventListener.hpp index 5e1c22896f..ec371ebbfd 100644 --- a/LiteLoader/include/llapi/mc/ActorEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventListener.hpp @@ -50,10 +50,6 @@ class ActorEventListener { * @symbol ?onActorMobInteraction\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@W4InteractionType\@MinecraftEventing\@\@W4ActorType\@\@\@Z */ MCVAPI enum class EventResult onActorMobInteraction(class Actor &, enum class MinecraftEventing::InteractionType, enum class ActorType); - /** - * @symbol ?onActorMove\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBVVec3\@\@\@Z - */ - MCVAPI enum class EventResult onActorMove(class Actor &, class Vec3 const &); /** * @symbol ?onActorPredictedMove\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@W4MovePredictionType\@\@AEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp index b1a5afdb4f..4408a5f196 100644 --- a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -54,9 +55,9 @@ class ActorEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ActorEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ActorEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTOREVENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ActorFactory.hpp b/LiteLoader/include/llapi/mc/ActorFactory.hpp index 2e582353c3..a98e2b9fa2 100644 --- a/LiteLoader/include/llapi/mc/ActorFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorFactory.hpp @@ -30,6 +30,12 @@ class ActorFactory { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORFACTORY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorFactory(); +#endif /** * @symbol ??0ActorFactory\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ @@ -94,10 +100,6 @@ class ActorFactory { * @symbol ?setEntityInitializer\@ActorFactory\@\@QEAAXV?$shared_ptr\@VIEntityInitializer\@\@\@std\@\@\@Z */ MCAPI void setEntityInitializer(class std::shared_ptr); - /** - * @symbol ??1ActorFactory\@\@QEAA\@XZ - */ - MCAPI ~ActorFactory(); /** * @symbol ?clearEntityMappings\@ActorFactory\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ActorHasSneakHeldTest.hpp b/LiteLoader/include/llapi/mc/ActorHasSneakHeldTest.hpp new file mode 100644 index 0000000000..7d50cd5555 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorHasSneakHeldTest.hpp @@ -0,0 +1,71 @@ +/** + * @file ActorHasSneakHeldTest.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "FilterTest.hpp" +#include "Json.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorHasSneakHeldTest { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORHASSNEAKHELDTEST +public: + class ActorHasSneakHeldTest& operator=(class ActorHasSneakHeldTest const &) = delete; + ActorHasSneakHeldTest(class ActorHasSneakHeldTest const &) = delete; + ActorHasSneakHeldTest() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorHasSneakHeldTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + */ + virtual bool evaluate(struct FilterContext const &) const; + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorHasSneakHeldTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASSNEAKHELDTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasSneakHeldTest(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/ActorHealthChangedEvent.hpp b/LiteLoader/include/llapi/mc/ActorHealthChangedEvent.hpp new file mode 100644 index 0000000000..fd46d85a2b --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorHealthChangedEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorHealthChangedEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorHealthChangedEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORHEALTHCHANGEDEVENT +public: + struct ActorHealthChangedEvent& operator=(struct ActorHealthChangedEvent const &) = delete; + ActorHealthChangedEvent(struct ActorHealthChangedEvent const &) = delete; + ActorHealthChangedEvent() = delete; +#endif + +public: + /** + * @symbol ??1ActorHealthChangedEvent\@\@QEAA\@XZ + */ + MCAPI ~ActorHealthChangedEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp index 7f747653fa..f72dcd2281 100644 --- a/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp @@ -27,6 +27,7 @@ class ActorInCloudsTest { public: class ActorInCloudsTest& operator=(class ActorInCloudsTest const &) = delete; ActorInCloudsTest(class ActorInCloudsTest const &) = delete; + ActorInCloudsTest() = delete; #endif public: @@ -71,9 +72,5 @@ class ActorInCloudsTest { */ MCVAPI ~ActorInCloudsTest(); #endif - /** - * @symbol ??0ActorInCloudsTest\@\@QEAA\@XZ - */ - MCAPI ActorInCloudsTest(); }; diff --git a/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp b/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp index 21449a140b..3a6ad1e469 100644 --- a/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp +++ b/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp @@ -55,6 +55,10 @@ namespace ActorMobilityUtils { * @symbol ?endJump\@ActorMobilityUtils\@\@YAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAUMobJumpComponent\@\@AEAUSynchedActorDataComponent\@\@PEBUVehicleComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ //MCAPI void endJump(class StrictEntityContext const &, struct StateVectorComponent const &, struct MobJumpComponent &, struct SynchedActorDataComponent &, struct VehicleComponent const *, class ViewT>, struct PassengerComponent const>, class EntityModifierT, class FlagComponent, class FlagComponent> &); + /** + * @symbol ?getBlockWhenClimbing\@ActorMobilityUtils\@\@YAAEBVBlock\@\@AEBUAABBShapeComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@\@Z + */ + MCAPI class Block const & getBlockWhenClimbing(struct AABBShapeComponent const &, class IConstBlockSource const &, struct StateVectorComponent const &); /** * @symbol ?getBrightness\@ActorMobilityUtils\@\@YAMAEBVStrictEntityContext\@\@MAEBVIConstBlockSource\@\@AEBUAABBShapeComponent\@\@AEBUOffsetsComponent\@\@AEBUStateVectorComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBlazeFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULavaSlimeFlag\@\@\@\@\@\@\@\@\@Z */ @@ -63,6 +67,10 @@ namespace ActorMobilityUtils { * @symbol ?getJumpEffectAmplifierValue\@ActorMobilityUtils\@\@YAMAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z */ MCAPI float getJumpEffectAmplifierValue(std::vector const &); + /** + * @symbol ?getJumpEffectAmplifierValue\@ActorMobilityUtils\@\@YAMAEBUMobEffectsComponent\@\@\@Z + */ + MCAPI float getJumpEffectAmplifierValue(struct MobEffectsComponent const &); /** * @symbol ?getJumpPower\@ActorMobilityUtils\@\@YAMPEBVJumpControlComponent\@\@_N\@Z */ @@ -75,10 +83,6 @@ namespace ActorMobilityUtils { * @symbol ?getSpeed\@ActorMobilityUtils\@\@YAMAEBVStrictEntityContext\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAttributesComponent\@\@$$CBUMovementSpeedComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z */ //MCAPI float getSpeed(class StrictEntityContext const &, class ViewT const &, class ViewT>> const &); - /** - * @symbol ?isDamagingNearbyMobs\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z - */ - MCAPI bool isDamagingNearbyMobs(struct SynchedActorDataComponent const &); /** * @symbol ?isFlying\@ActorMobilityUtils\@\@YA_NAEBUAbilitiesComponent\@\@\@Z */ @@ -135,10 +139,6 @@ namespace ActorMobilityUtils { * @symbol ?onHoverableBlock\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBVVec3\@\@AEBVAABB\@\@\@Z */ MCAPI bool onHoverableBlock(class IConstBlockSource const &, class Vec3 const &, class AABB const &); - /** - * @symbol ?setLocalPlayerSneaking\@ActorMobilityUtils\@\@YAXAEAUSynchedActorDataComponent\@\@PEAUPlayerActionComponent\@\@_N\@Z - */ - MCAPI void setLocalPlayerSneaking(struct SynchedActorDataComponent &, struct PlayerActionComponent *, bool); /** * @symbol ?setSpeed\@ActorMobilityUtils\@\@YAXAEBVStrictEntityContext\@\@MAEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UMovementSpeedComponent\@\@ULocalMoveVelocityComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z */ @@ -163,9 +163,5 @@ namespace ActorMobilityUtils { * @symbol ?tryApplyingLevitation\@ActorMobilityUtils\@\@YA_NAEBUMobEffectsComponent\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI bool tryApplyingLevitation(struct MobEffectsComponent const &, struct StateVectorComponent &); - /** - * @symbol ?updateBBFromDefinition\@ActorMobilityUtils\@\@YAXAEAVStrictEntityContext\@\@V?$optional_ref\@$$CBUCollisionBoxDefinitionComponent\@\@\@\@AEAUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@UOffsetsComponent\@\@\@\@\@Z - */ - //MCAPI void updateBBFromDefinition(class StrictEntityContext &, class optional_ref, struct SynchedActorDataComponent &, struct AABBShapeComponent &, struct StateVectorComponent const &, class EntityModifierT> &, class ViewT>, struct OffsetsComponent>); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp deleted file mode 100644 index 94500b79ae..0000000000 --- a/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file ActorMoveNotifierSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ActorMoveNotifierSystem. - * - */ -class ActorMoveNotifierSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORMOVENOTIFIERSYSTEM -public: - class ActorMoveNotifierSystem& operator=(class ActorMoveNotifierSystem const &) = delete; - ActorMoveNotifierSystem(class ActorMoveNotifierSystem const &) = delete; - ActorMoveNotifierSystem() = delete; -#endif - -public: - /** - * @symbol ?createActorMoveNotifierSystem\@ActorMoveNotifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createActorMoveNotifierSystem(); - /** - * @symbol ?tickActorMoveNotifierSystem\@ActorMoveNotifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUMoveRequestComponent\@\@VActorMovementProxyComponent\@\@\@\@\@Z - */ - MCAPI static void tickActorMoveNotifierSystem(class ViewT); - -}; diff --git a/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp index 3b024f7dd9..25e713286c 100644 --- a/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp @@ -35,13 +35,5 @@ class ActorMoveSystem { * @symbol ?createUpdateHitboxSystem\@ActorMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createUpdateHitboxSystem(); - /** - * @symbol ?tickActorMoveSystem\@ActorMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUOnewayPhysicsBlocksComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@USubBBsComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UIsStuckItemFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UUsesOneWayCollisionFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UIsStuckInColliderFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UIsStuckInColliderFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@UShouldMoveTowardClosestSpaceFlagComponent\@\@\@\@\@Z - */ - MCAPI static void tickActorMoveSystem(class ViewT const>, class Optional const>>, class ViewT const>>, class ViewT const>>, class EntityModifierT, class FlagComponent, struct ShouldMoveTowardClosestSpaceFlagComponent>); - /** - * @symbol ?tickUpdateHitboxSystem\@ActorMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UMoveRequestComponent\@\@\@\@$$CBUStateVectorComponent\@\@VHitboxComponent\@\@\@\@\@Z - */ - MCAPI static void tickUpdateHitboxSystem(class ViewT, struct StateVectorComponent const, class HitboxComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ActorMoveSystemImpl.hpp b/LiteLoader/include/llapi/mc/ActorMoveSystemImpl.hpp new file mode 100644 index 0000000000..5614d1c355 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorMoveSystemImpl.hpp @@ -0,0 +1,28 @@ +/** + * @file ActorMoveSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorMoveSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doActorMoveSystem\@ActorMoveSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUOnewayPhysicsBlocksComponent\@\@AEAUMoveRequestComponent\@\@AEAUAABBShapeComponent\@\@AEAUSubBBsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UIsStuckItemFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UUsesOneWayCollisionFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UIsStuckInColliderFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UIsStuckInColliderFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@V?$FlagComponent\@UMoveTowardsClosestSpaceFlag\@\@\@\@\@\@\@Z + */ + MCAPI void doActorMoveSystem(class StrictEntityContext &, struct OnewayPhysicsBlocksComponent const &, struct MoveRequestComponent &, struct AABBShapeComponent &, struct SubBBsComponent &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class ViewT const>>, class ViewT const>>, class EntityModifierT, class FlagComponent, class FlagComponent>); + /** + * @symbol ?updateHitboxSystem\@ActorMoveSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAVHitboxComponent\@\@\@Z + */ + MCAPI void updateHitboxSystem(class StrictEntityContext const &, struct StateVectorComponent const &, class HitboxComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp index cb3ac87303..2556c1ebaf 100644 --- a/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp @@ -33,9 +33,5 @@ class ActorMovementTickFilterSystem { * @symbol ?createBase\@ActorMovementTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createBase(); - /** - * @symbol ?createInputPacketDependentFilter\@ActorMovementTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createInputPacketDependentFilter(); }; diff --git a/LiteLoader/include/llapi/mc/ActorOffset.hpp b/LiteLoader/include/llapi/mc/ActorOffset.hpp index cd98ddc517..80d4067330 100644 --- a/LiteLoader/include/llapi/mc/ActorOffset.hpp +++ b/LiteLoader/include/llapi/mc/ActorOffset.hpp @@ -20,14 +20,6 @@ namespace ActorOffset { * @symbol ?getBreathingOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getBreathingOffset(class EntityContext const &); - /** - * @symbol ?getDropOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z - */ - MCAPI class Vec3 getDropOffset(class EntityContext const &); - /** - * @symbol ?getExplosionOffset\@ActorOffset\@\@YAMAEBVEntityContext\@\@\@Z - */ - MCAPI float getExplosionOffset(class EntityContext const &); /** * @symbol ?getEyeOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ @@ -40,10 +32,6 @@ namespace ActorOffset { * @symbol ?getHeightOffset\@ActorOffset\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getHeightOffset(class EntityContext const &); - /** - * @symbol ?getMouthOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z - */ - MCAPI class Vec3 getMouthOffset(class EntityContext const &); /** * @symbol ?initializeActor\@ActorOffset\@\@YAXAEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp b/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp index 84c9fe412b..7a9d765a7e 100644 --- a/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp @@ -29,14 +29,14 @@ class ActorOwnerComponent { #endif public: - /** - * @symbol ??0ActorOwnerComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI ActorOwnerComponent(class ActorOwnerComponent &&); /** * @symbol ??0ActorOwnerComponent\@\@QEAA\@V?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI ActorOwnerComponent(std::unique_ptr); + /** + * @symbol ??0ActorOwnerComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI ActorOwnerComponent(class ActorOwnerComponent &&); /** * @symbol ?getActor\@ActorOwnerComponent\@\@QEBAAEAVActor\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp index d61c646dad..6447992697 100644 --- a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ActorPickRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ActorPickRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ActorPickRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ActorPickRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp index 84975221bc..93710b4dc2 100644 --- a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp +++ b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp @@ -57,10 +57,10 @@ class ActorPlacerItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -152,7 +152,7 @@ class ActorPlacerItem : public Item { */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@ActorPlacerItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/ActorRiding.hpp b/LiteLoader/include/llapi/mc/ActorRiding.hpp index 162f1bd956..259eea2cbf 100644 --- a/LiteLoader/include/llapi/mc/ActorRiding.hpp +++ b/LiteLoader/include/llapi/mc/ActorRiding.hpp @@ -16,10 +16,6 @@ namespace ActorRiding { #define AFTER_EXTRA #undef AFTER_EXTRA - /** - * @symbol ?clearVehicle\@ActorRiding\@\@YAXAEAVEntityContext\@\@\@Z - */ - MCAPI void clearVehicle(class EntityContext &); /** * @symbol ?clearVehiclePrev\@ActorRiding\@\@YAXAEAVEntityContext\@\@\@Z */ @@ -52,10 +48,6 @@ namespace ActorRiding { * @symbol ?setVehicle\@ActorRiding\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI void setVehicle(class EntityContext &, class StrictEntityContext, struct ActorUniqueID const &); - /** - * @symbol ?setVehiclePrev\@ActorRiding\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI void setVehiclePrev(class EntityContext &, class StrictEntityContext, struct ActorUniqueID const &); /** * @symbol ?tryRemoveLastPendingPassenger\@ActorRiding\@\@YA?AUStrictActorIDEntityContextPair\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorRotationComponent.hpp b/LiteLoader/include/llapi/mc/ActorRotationComponent.hpp deleted file mode 100644 index 539397f932..0000000000 --- a/LiteLoader/include/llapi/mc/ActorRotationComponent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file ActorRotationComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct ActorRotationComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORROTATIONCOMPONENT -public: - struct ActorRotationComponent& operator=(struct ActorRotationComponent const &) = delete; - ActorRotationComponent(struct ActorRotationComponent const &) = delete; - ActorRotationComponent() = delete; -#endif - -public: - /** - * @symbol ?toString\@ActorRotationComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string toString() const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorSetPosSystemImpl.hpp b/LiteLoader/include/llapi/mc/ActorSetPosSystemImpl.hpp index cb9499f33e..09504a4cd2 100644 --- a/LiteLoader/include/llapi/mc/ActorSetPosSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/ActorSetPosSystemImpl.hpp @@ -17,17 +17,13 @@ namespace ActorSetPosSystemImpl { #undef AFTER_EXTRA /** - * @symbol ?_tickActorUpdatePositionAndAABBSystem2\@ActorSetPosSystemImpl\@\@YAXAEBUActorSetPositionRequestComponent\@\@AEBUOffsetsComponent\@\@AEBUSlideOffsetComponent\@\@AEAUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@V?$FlagComponent\@UPaintingFlag\@\@\@\@\@\@\@Z + * @symbol ?_tickActorUpdatePositionAndAABBSystem2\@ActorSetPosSystemImpl\@\@YAXAEBUActorSetPositionRequestComponent\@\@AEBUOffsetsComponent\@\@V?$Optional\@$$CBUSlideOffsetComponent\@\@\@\@AEAUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@V?$FlagComponent\@UPaintingFlag\@\@\@\@\@\@\@Z */ - MCAPI void _tickActorUpdatePositionAndAABBSystem2(struct ActorSetPositionRequestComponent const &, struct OffsetsComponent const &, struct SlideOffsetComponent const &, struct AABBShapeComponent &, struct StateVectorComponent &, class Optional>); + MCAPI void _tickActorUpdatePositionAndAABBSystem2(struct ActorSetPositionRequestComponent const &, struct OffsetsComponent const &, class Optional, struct AABBShapeComponent &, struct StateVectorComponent &, class Optional>); /** * @symbol ?_tickAddLocalPlayerEntityMovedSystemAsynchronous1\@ActorSetPosSystemImpl\@\@YAXAEAVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorChunkMoveFlag\@\@\@\@V?$FlagComponent\@UActorLocalPlayerEntityMovedFlag\@\@\@\@UActorSetPositionRequestComponent\@\@\@\@\@Z */ MCAPI void _tickAddLocalPlayerEntityMovedSystemAsynchronous1(class StrictEntityContext &, class EntityModifierT, class FlagComponent, struct ActorSetPositionRequestComponent>); - /** - * @symbol ?_tickAddLocalPlayerEntityMovedSystemSynchronous1\@ActorSetPosSystemImpl\@\@YAXAEBVActorOwnerComponent\@\@\@Z - */ - MCAPI void _tickAddLocalPlayerEntityMovedSystemSynchronous1(class ActorOwnerComponent const &); /** * @symbol ?_tickChunkMoveNeededSystemAsynchronous4\@ActorSetPosSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUChunkPositionComponent\@\@AEBUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorChunkMoveFlag\@\@\@\@V?$FlagComponent\@UActorLocalPlayerEntityMovedFlag\@\@\@\@UActorSetPositionRequestComponent\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorStartRidingEvent.hpp b/LiteLoader/include/llapi/mc/ActorStartRidingEvent.hpp new file mode 100644 index 0000000000..0aae9ec605 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorStartRidingEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorStartRidingEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorStartRidingEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORSTARTRIDINGEVENT +public: + struct ActorStartRidingEvent& operator=(struct ActorStartRidingEvent const &) = delete; + ActorStartRidingEvent(struct ActorStartRidingEvent const &) = delete; + ActorStartRidingEvent() = delete; +#endif + +public: + /** + * @symbol ??1ActorStartRidingEvent\@\@QEAA\@XZ + */ + MCAPI ~ActorStartRidingEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorStopRidingEvent.hpp b/LiteLoader/include/llapi/mc/ActorStopRidingEvent.hpp new file mode 100644 index 0000000000..a61616fd19 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorStopRidingEvent.hpp @@ -0,0 +1,35 @@ +/** + * @file ActorStopRidingEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorStopRidingEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORSTOPRIDINGEVENT +public: + struct ActorStopRidingEvent& operator=(struct ActorStopRidingEvent const &) = delete; + ActorStopRidingEvent() = delete; +#endif + +public: + /** + * @symbol ??0ActorStopRidingEvent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI ActorStopRidingEvent(struct ActorStopRidingEvent const &); + /** + * @symbol ??1ActorStopRidingEvent\@\@QEAA\@XZ + */ + MCAPI ~ActorStopRidingEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp index 59ec2d59a7..28f65f5b82 100644 --- a/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp @@ -28,16 +28,12 @@ class ActorStopRidingEventSystem { public: /** - * @symbol ?createSystem\@ActorStopRidingEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@ActorStopRidingEventSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@VActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@\@\@Z + * @symbol ?createCancelableEventSystem\@ActorStopRidingEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void tick(class ViewT>, class ActorOwnerComponent, class Optional const>, class Optional const>, class Optional const>, class Optional const>>); + MCAPI static struct TickingSystemWithInfo createCancelableEventSystem(); /** - * @symbol ?tickSendEvent\@ActorStopRidingEventSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@Z + * @symbol ?createSystem\@ActorStopRidingEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void tickSendEvent(class StrictEntityContext &, class ActorOwnerComponent &, class Optional const>, class Optional const>, class Optional const>, class Optional const>); + MCAPI static struct TickingSystemWithInfo createSystem(); }; diff --git a/LiteLoader/include/llapi/mc/ActorStopRidingEventSystemImpl.hpp b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystemImpl.hpp new file mode 100644 index 0000000000..761a2bc974 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystemImpl.hpp @@ -0,0 +1,28 @@ +/** + * @file ActorStopRidingEventSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorStopRidingEventSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tickHandlerEvent\@ActorStopRidingEventSystemImpl\@\@YAXU?$type_list\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@entt\@\@AEBVStrictEntityContext\@\@AEBVActorOwnerComponent\@\@AEBUPassengerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBVActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z + */ + MCAPI void tickHandlerEvent(struct entt::type_list>>, class StrictEntityContext const &, class ActorOwnerComponent const &, struct PassengerComponent const &, class Optional const>, class Optional const>, class Optional const>, class ViewT, class ActorOwnerComponent const>, class EntityModifierT>); + /** + * @symbol ?tickListenerEvent\@ActorStopRidingEventSystemImpl\@\@YAXU?$type_list\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@entt\@\@AEBVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@Z + */ + MCAPI void tickListenerEvent(struct entt::type_list>>, class ActorOwnerComponent const &, class Optional const>, class Optional const>, class Optional const>, class Optional const>); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorSynchedData.hpp b/LiteLoader/include/llapi/mc/ActorSynchedData.hpp index 2205883089..b083770441 100644 --- a/LiteLoader/include/llapi/mc/ActorSynchedData.hpp +++ b/LiteLoader/include/llapi/mc/ActorSynchedData.hpp @@ -24,6 +24,10 @@ namespace ActorSynchedData { * @symbol ?updateAmbientSound\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void updateAmbientSound(class EntityContext &); + /** + * @symbol ?updateBoundingBox\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEBVSynchedActorDataEntityWrapper\@\@\@Z + */ + MCAPI void updateBoundingBox(class EntityContext &, class SynchedActorDataEntityWrapper const &); /** * @symbol ?updateBuoyancyData\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEBVSynchedActorDataEntityWrapper\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorTransform.hpp b/LiteLoader/include/llapi/mc/ActorTransform.hpp index d6ee2ff596..7fd382ded8 100644 --- a/LiteLoader/include/llapi/mc/ActorTransform.hpp +++ b/LiteLoader/include/llapi/mc/ActorTransform.hpp @@ -16,10 +16,6 @@ namespace ActorTransform { #define AFTER_EXTRA #undef AFTER_EXTRA - /** - * @symbol ?getRenderPosition\@ActorTransform\@\@YAAEBVVec3\@\@AEBVEntityContext\@\@\@Z - */ - MCAPI class Vec3 const & getRenderPosition(class EntityContext const &); /** * @symbol ?getRenderRotation\@ActorTransform\@\@YAAEBVVec2\@\@AEBVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp index 1a47d2f2cf..2f15b0ffef 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp @@ -32,12 +32,4 @@ class ActorUpdatePostTickPositionDeltaSystem { */ MCAPI static struct TickingSystemWithInfo createActorUpdatePostTickPositionDeltaSystem(); -//private: - /** - * @symbol ?_tickActorUpdatePostTickPositionDeltaSystem\@ActorUpdatePostTickPositionDeltaSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@UPostTickPositionDeltaComponent\@\@\@\@\@Z - */ - MCAPI static void _tickActorUpdatePostTickPositionDeltaSystem(class ViewT>, struct StateVectorComponent const, struct PostTickPositionDeltaComponent>); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp index 54a9fd9faf..4a20d6da53 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp @@ -33,5 +33,9 @@ class ActorUpdatePreviousPositionSystem { * @symbol ?create\@ActorUpdatePreviousPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?tickSystem\@ActorUpdatePreviousPositionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + */ + MCAPI static void tickSystem(class ViewT>, class ActorOwnerComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp index cfea41d379..00f5abeec3 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp @@ -39,25 +39,5 @@ class ActorUpdateRidingIDSystem { * @symbol ?createUpdatePrevRidingIDSystem\@ActorUpdateRidingIDSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createUpdatePrevRidingIDSystem(); - /** - * @symbol ?tickClearRidingID\@ActorUpdateRidingIDSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPassengerComponent\@\@\@\@\@Z - */ - MCAPI static void tickClearRidingID(class StrictEntityContext &, struct PassengerComponent const &, class EntityModifierT &); - /** - * @symbol ?tickUpdateRidingPrevID\@ActorUpdateRidingIDSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URidingPrevIDComponent\@\@\@\@\@Z - */ - MCAPI static void tickUpdateRidingPrevID(class StrictEntityContext &, struct PassengerComponent const &, class ViewT, class EntityModifierT); - -//private: - /** - * @symbol ?_tickClearRidingID\@ActorUpdateRidingIDSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPassengerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickClearRidingID(class ViewT>, struct PassengerComponent const>, class EntityModifierT); - /** - * @symbol ?_tickUpdateRidingPrevID\@ActorUpdateRidingIDSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URidingPrevIDComponent\@\@\@\@\@Z - */ - MCAPI static void _tickUpdateRidingPrevID(class ViewT>, struct PassengerComponent const>, class ViewT, class EntityModifierT); - -private: }; diff --git a/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystemImpl.hpp b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystemImpl.hpp new file mode 100644 index 0000000000..3ebfcdbde2 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file ActorUpdateRidingIDSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorUpdateRidingIDSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?updateRidingPrevID\@ActorUpdateRidingIDSystemImpl\@\@YAXU?$type_list\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@entt\@\@AEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URidingPrevIDComponent\@\@\@\@\@Z + */ + MCAPI void updateRidingPrevID(struct entt::type_list>>, class StrictEntityContext const &, struct PassengerComponent const &, class ViewT, class EntityModifierT); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp index 683aab0a0b..ebd3202afd 100644 --- a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp +++ b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp @@ -19,14 +19,14 @@ namespace ActorValueValidation { #define AFTER_EXTRA #undef AFTER_EXTRA - /** - * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVBlockPos\@\@PEBD\@Z - */ - MCAPI void _fireTelemetryEvent(class BlockPos const &, char const *); /** * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z */ MCAPI void _fireTelemetryEvent(class Vec3 const &, char const *); + /** + * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVBlockPos\@\@PEBD\@Z + */ + MCAPI void _fireTelemetryEvent(class BlockPos const &, char const *); /** * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z */ diff --git a/LiteLoader/include/llapi/mc/AddActorPacket.hpp b/LiteLoader/include/llapi/mc/AddActorPacket.hpp index 11cc0e0842..80484f359a 100644 --- a/LiteLoader/include/llapi/mc/AddActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddActorPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class AddActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddActorPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDACTORPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~AddActorPacket(); #endif - /** - * @symbol ??0AddActorPacket\@\@QEAA\@AEAVActor\@\@\@Z - */ - MCAPI AddActorPacket(class Actor &); /** * @symbol ??0AddActorPacket\@\@QEAA\@XZ */ MCAPI AddActorPacket(); + /** + * @symbol ??0AddActorPacket\@\@QEAA\@AEAVActor\@\@\@Z + */ + MCAPI AddActorPacket(class Actor &); }; diff --git a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp index a7df2bd1bb..92453790cb 100644 --- a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp +++ b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class AddBehaviorTreePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddBehaviorTreePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddBehaviorTreePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AddBehaviorTreePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/AddEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp index 1a19086703..12699ad433 100644 --- a/LiteLoader/include/llapi/mc/AddEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp @@ -5,7 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Packet.hpp" +#include "Bedrock.hpp" +#include "EntityServerPacket.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +17,7 @@ * @brief MC class AddEntityPacket. * */ -class AddEntityPacket : public Packet { +class AddEntityPacket : public EntityServerPacket { #define AFTER_EXTRA // Add Member There diff --git a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp index 2371bdbbfa..f8025cc024 100644 --- a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class AddItemActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddItemActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddItemActorPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AddItemActorPacket\@\@QEAA\@AEAVItemActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp index fc19765cce..c70e9ff039 100644 --- a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,16 +52,16 @@ class AddPaintingPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddPaintingPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddPaintingPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0AddPaintingPacket\@\@QEAA\@AEBVPainting\@\@\@Z - */ - MCAPI AddPaintingPacket(class Painting const &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AddPaintingPacket\@\@QEAA\@XZ */ MCAPI AddPaintingPacket(); + /** + * @symbol ??0AddPaintingPacket\@\@QEAA\@AEBVPainting\@\@\@Z + */ + MCAPI AddPaintingPacket(class Painting const &); }; diff --git a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp index 5d1ac35844..52df7b6a11 100644 --- a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class AddPlayerPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddPlayerPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddPlayerPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDPLAYERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp index cc9ebc7be8..738e9d5d1a 100644 --- a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class AddVolumeEntityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AddVolumeEntityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AddVolumeEntityPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDVOLUMEENTITYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Agent.hpp b/LiteLoader/include/llapi/mc/Agent.hpp index d4198c74a4..953a89a83d 100644 --- a/LiteLoader/include/llapi/mc/Agent.hpp +++ b/LiteLoader/include/llapi/mc/Agent.hpp @@ -42,220 +42,210 @@ class Agent : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@Agent\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Agent\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 59 + * @vftbl 53 * @symbol ?isInvisible\@Agent\@\@UEBA_NXZ */ virtual bool isInvisible() const; /** - * @vftbl 60 + * @vftbl 54 * @symbol ?canShowNameTag\@Agent\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 65 + * @vftbl 59 * @symbol ?getFormattedNameTag\@Agent\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getFormattedNameTag() const; /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Agent\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 117 + * @vftbl 106 * @symbol ?setOwner\@Agent\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Agent\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 156 + * @vftbl 144 * @symbol ?setCarriedItem\@Agent\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 188 + * @vftbl 176 * @symbol ?canBePulledIntoVehicle\@Agent\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 205 + * @vftbl 192 * @symbol ?canBeAffected\@Agent\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 236 + * @vftbl 223 * @symbol ?kill\@Agent\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Agent\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Agent\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?knockback\@Agent\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 278 - * @symbol ?travel\@Agent\@\@UEAAXMMM_N\@Z + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void travel(float, float, float, bool); + virtual void __unk_vfn_276(); /** * @vftbl 280 - * @symbol ?aiStep\@Agent\@\@UEAAXXZ - */ - virtual void aiStep(); - /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_280(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 - */ - virtual void __unk_vfn_297(); - /** - * @vftbl 323 + * @vftbl 306 * @symbol ?createAIGoals\@Agent\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 330 + * @vftbl 313 * @symbol ?canExistWhenDisallowMob\@Agent\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 335 + * @vftbl 317 * @symbol ?initBodyControl\@Agent\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AGENT /** * @symbol ?breaksFallingBlocks\@Agent\@\@UEBA_NXZ @@ -298,6 +288,14 @@ class Agent : public Mob { * @symbol ?getSelectedSlot\@Agent\@\@QEBAHXZ */ MCAPI int getSelectedSlot() const; + /** + * @symbol ?handleAnimationEvent\@Agent\@\@QEAAXW4AgentAnimation\@\@\@Z + */ + MCAPI void handleAnimationEvent(enum class AgentAnimation); + /** + * @symbol ?isEmoting\@Agent\@\@QEBA_NXZ + */ + MCAPI bool isEmoting() const; /** * @symbol ?isValidSlotNum\@Agent\@\@QEAA_NH\@Z */ @@ -318,6 +316,10 @@ class Agent : public Mob { * @symbol ?setNameTagFromOwner\@Agent\@\@QEAAXAEBVPlayer\@\@\@Z */ MCAPI void setNameTagFromOwner(class Player const &); + /** + * @symbol ?shrug\@Agent\@\@QEAAXXZ + */ + MCAPI void shrug(); /** * @symbol ?startCommandMode\@Agent\@\@QEAAXXZ */ @@ -326,10 +328,6 @@ class Agent : public Mob { * @symbol ?stopCommandMode\@Agent\@\@QEAAXXZ */ MCAPI void stopCommandMode(); - /** - * @symbol ?swingAnimationCompleted\@Agent\@\@QEAA_NXZ - */ - MCAPI bool swingAnimationCompleted(); /** * @symbol ?swingArm\@Agent\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/AgentAbilitiesHelper.hpp b/LiteLoader/include/llapi/mc/AgentAbilitiesHelper.hpp deleted file mode 100644 index ba77d89e94..0000000000 --- a/LiteLoader/include/llapi/mc/AgentAbilitiesHelper.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file AgentAbilitiesHelper.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace AgentAbilitiesHelper { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?updateAbilities\@AgentAbilitiesHelper\@\@YAXAEBVLayeredAbilities\@\@AEBV?$optional\@_N\@std\@\@AEAV2\@\@Z - */ - MCAPI void updateAbilities(class LayeredAbilities const &, class std::optional const &, class LayeredAbilities &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp index ad85c04b5a..531224ac24 100644 --- a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Json.hpp" #include "Packet.hpp" @@ -50,9 +51,9 @@ class AgentActionEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AgentActionEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AgentActionEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AGENTACTIONEVENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/AgentActionSystems.hpp b/LiteLoader/include/llapi/mc/AgentActionSystems.hpp index fbd42a0103..7ac13e6f11 100644 --- a/LiteLoader/include/llapi/mc/AgentActionSystems.hpp +++ b/LiteLoader/include/llapi/mc/AgentActionSystems.hpp @@ -17,8 +17,8 @@ namespace AgentActionSystems { #undef AFTER_EXTRA /** - * @symbol ?tickActionFailed\@AgentActionSystems\@\@YAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActionDetails\@AgentComponents\@\@V?$FlagComponent\@UArmSwingFailFlag\@AgentComponents\@\@\@\@VCommandCooldown\@4\@V?$FlagComponent\@UExecutingFlag\@AgentComponents\@\@\@\@\@\@\@Z + * @symbol ?tickActionFailed\@AgentActionSystems\@\@YAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActionDetails\@AgentComponents\@\@V?$FlagComponent\@UAnimationShrugFlag\@AgentComponents\@\@\@\@VCommandCooldown\@4\@V?$FlagComponent\@UExecutingFlag\@AgentComponents\@\@\@\@\@\@\@Z */ - MCAPI void tickActionFailed(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT, class AgentComponents::CommandCooldown, class FlagComponent> &); + MCAPI void tickActionFailed(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT, class AgentComponents::CommandCooldown, class FlagComponent> &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AgentAnimationPacket.hpp b/LiteLoader/include/llapi/mc/AgentAnimationPacket.hpp new file mode 100644 index 0000000000..4c2d3d48fc --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentAnimationPacket.hpp @@ -0,0 +1,68 @@ +/** + * @file AgentAnimationPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AgentAnimationPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AGENTANIMATIONPACKET +public: + class AgentAnimationPacket& operator=(class AgentAnimationPacket const &) = delete; + AgentAnimationPacket(class AgentAnimationPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@AgentAnimationPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@AgentAnimationPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@AgentAnimationPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 7 + * @symbol ?_read\@AgentAnimationPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_AGENTANIMATIONPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AgentAnimationPacket(); +#endif + /** + * @symbol ??0AgentAnimationPacket\@\@QEAA\@W4AgentAnimation\@\@VActorRuntimeID\@\@\@Z + */ + MCAPI AgentAnimationPacket(enum class AgentAnimation, class ActorRuntimeID); + /** + * @symbol ??0AgentAnimationPacket\@\@QEAA\@XZ + */ + MCAPI AgentAnimationPacket(); + +}; diff --git a/LiteLoader/include/llapi/mc/AgentAnimationSystem.hpp b/LiteLoader/include/llapi/mc/AgentAnimationSystem.hpp new file mode 100644 index 0000000000..2b91bdb3a6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentAnimationSystem.hpp @@ -0,0 +1,43 @@ +/** + * @file AgentAnimationSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AgentAnimationSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AGENTANIMATIONSYSTEM +public: + class AgentAnimationSystem& operator=(class AgentAnimationSystem const &) = delete; + AgentAnimationSystem(class AgentAnimationSystem const &) = delete; + AgentAnimationSystem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol __unk_vfn_1 + */ + virtual void __unk_vfn_1(); + /** + * @vftbl 2 + * @symbol ?tick\@AgentAnimationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + */ + virtual void tick(class EntityRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/AgentAnimationSystems.hpp b/LiteLoader/include/llapi/mc/AgentAnimationSystems.hpp new file mode 100644 index 0000000000..821b611c48 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentAnimationSystems.hpp @@ -0,0 +1,24 @@ +/** + * @file AgentAnimationSystems.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AgentAnimationSystems { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?animationTick\@AgentAnimationSystems\@\@YAXAEAVStrictEntityContext\@\@AEAVAnimating\@AgentComponents\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UAnimationCompleteFlag\@AgentComponents\@\@\@\@\@\@\@Z + */ + MCAPI void animationTick(class StrictEntityContext &, class AgentComponents::Animating &, class EntityModifierT> &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AgentCommand.hpp b/LiteLoader/include/llapi/mc/AgentCommand.hpp index 7be89e7d80..0b1aa98bc3 100644 --- a/LiteLoader/include/llapi/mc/AgentCommand.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommand.hpp @@ -36,7 +36,7 @@ class AgentCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@AgentCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -46,6 +46,10 @@ class AgentCommand : public Command { MCAPI static void setup(class CommandRegistry &); //private: + /** + * @symbol ?collect\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + MCAPI void collect(class CommandOrigin const &, class CommandOutput &) const; /** * @symbol ?createAgent\@AgentCommand\@\@AEBAXAEAVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AgentCommandHelper.hpp b/LiteLoader/include/llapi/mc/AgentCommandHelper.hpp deleted file mode 100644 index 13f78b1a27..0000000000 --- a/LiteLoader/include/llapi/mc/AgentCommandHelper.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file AgentCommandHelper.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace AgentCommandHelper. - * - */ -namespace AgentCommandHelper { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?isInRange\@AgentCommandHelper\@\@YA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVAgent\@\@\@Z - */ - MCAPI bool isInRange(class CommandOrigin const &, class CommandOutput &, class Player &, class Agent &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp b/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp index 984329ecaa..95dc75f1ba 100644 --- a/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp @@ -11,46 +11,18 @@ #undef BEFORE_EXTRA -class AgentTravelSystem { +namespace AgentTravelSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AGENTTRAVELSYSTEM -public: - class AgentTravelSystem& operator=(class AgentTravelSystem const &) = delete; - AgentTravelSystem(class AgentTravelSystem const &) = delete; - AgentTravelSystem() = delete; -#endif - -public: - /** - * @symbol ?createClientSystem\@AgentTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createClientSystem(); /** - * @symbol ?createServerSystem\@AgentTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClientSystem\@AgentTravelSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createServerSystem(); + MCAPI struct TickingSystemWithInfo createClientSystem(); /** - * @symbol ?tickClient\@AgentTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UAgentFlag\@\@\@\@\@\@VActorMovementProxyComponent\@\@VActorOwnerComponent\@\@\@\@\@Z + * @symbol ?createServerSystem\@AgentTravelSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void tickClient(class ViewT, class FlagComponent, class FlagComponent>, class ActorMovementProxyComponent, class ActorOwnerComponent>); - /** - * @symbol ?tickServer\@AgentTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UAgentFlag\@\@\@\@\@\@VActorMovementProxyComponent\@\@VActorOwnerComponent\@\@UStateVectorComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z - */ - MCAPI static void tickServer(class ViewT, class FlagComponent, class FlagComponent>, class ActorMovementProxyComponent, class ActorOwnerComponent, struct StateVectorComponent>, class EntityModifierT); - -//private: - /** - * @symbol ?_doClientAgentTravelSystem\@AgentTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doClientAgentTravelSystem(class StrictEntityContext const &, class ActorMovementProxyComponent &, class ActorOwnerComponent &); - /** - * @symbol ?_doServerAgentTravelSystem\@AgentTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAVActorOwnerComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z - */ - MCAPI static void _doServerAgentTravelSystem(class StrictEntityContext const &, class ActorMovementProxyComponent &, class ActorOwnerComponent &, struct StateVectorComponent &, class EntityModifierT); - -private: + MCAPI struct TickingSystemWithInfo createServerSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AgentTravelSystemImpl.hpp b/LiteLoader/include/llapi/mc/AgentTravelSystemImpl.hpp new file mode 100644 index 0000000000..a8bc609885 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentTravelSystemImpl.hpp @@ -0,0 +1,28 @@ +/** + * @file AgentTravelSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AgentTravelSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doClientAgentTravel\@AgentTravelSystemImpl\@\@YAXAEAVActorOwnerComponent\@\@AEAUAbilitiesComponent\@\@\@Z + */ + MCAPI void doClientAgentTravel(class ActorOwnerComponent &, struct AbilitiesComponent &); + /** + * @symbol ?doServerAgentTravel\@AgentTravelSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUAbilitiesComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z + */ + MCAPI void doServerAgentTravel(class StrictEntityContext const &, class ActorOwnerComponent &, struct AbilitiesComponent &, struct StateVectorComponent &, class EntityModifierT); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AirBlock.hpp b/LiteLoader/include/llapi/mc/AirBlock.hpp index ddc89134a6..bbf0522bf3 100644 --- a/LiteLoader/include/llapi/mc/AirBlock.hpp +++ b/LiteLoader/include/llapi/mc/AirBlock.hpp @@ -36,45 +36,45 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@AirBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 6 - * @symbol ?isObstructingChests\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 7 + * @symbol ?addCollisionShapes\@AirBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ - virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; + /** + * @vftbl 8 + * @symbol ?getAABB\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** * @vftbl 9 * @symbol ?addAABBs\@AirBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; - /** - * @vftbl 10 - * @symbol ?getAABB\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** * @vftbl 11 - * @symbol ?addCollisionShapes\@AirBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?getVisualShapeInWorld\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 15 + * @symbol ?isObstructingChests\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -86,10 +86,10 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -100,11 +100,6 @@ class AirBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -125,6 +120,11 @@ class AirBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -135,11 +135,6 @@ class AirBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -156,85 +151,95 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 68 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@AirBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 88 + * @vftbl 91 * @symbol ?mayPick\@AirBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 89 + * @vftbl 92 * @symbol ?mayPick\@AirBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 96 * @symbol ?tryToPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z */ virtual bool tryToPlace(class BlockSource &, class BlockPos const &, class Block const &, struct ActorBlockSyncMessage const *) const; /** - * @vftbl 96 + * @vftbl 99 * @symbol ?destroy\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@AirBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -246,75 +251,70 @@ class AirBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 - */ - virtual void __unk_vfn_127(); - /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_125(); /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AIRBLOCK /** * @symbol ?canBeSilkTouched\@AirBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/AirBlockItem.hpp b/LiteLoader/include/llapi/mc/AirBlockItem.hpp index 4e0562b790..beac052c0c 100644 --- a/LiteLoader/include/llapi/mc/AirBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AirBlockItem.hpp @@ -52,10 +52,10 @@ class AirBlockItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/AirTravelSystem.hpp b/LiteLoader/include/llapi/mc/AirTravelSystem.hpp index 8ec97a7030..c00cea6a6b 100644 --- a/LiteLoader/include/llapi/mc/AirTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/AirTravelSystem.hpp @@ -28,9 +28,5 @@ class AirTravelSystem { * @symbol ?createAirTravelSystem\@AirTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAirTravelSystem(); - /** - * @symbol ?tickAirTravelSystem\@AirTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UAirTravelFlag\@\@\@\@\@\@$$CBUFlySpeedComponent\@\@UMobTravelComponent\@\@\@\@\@Z - */ - MCAPI static void tickAirTravelSystem(class ViewT, class FlagComponent, class FlagComponent>, struct FlySpeedComponent const, struct MobTravelComponent>); }; diff --git a/LiteLoader/include/llapi/mc/Allay.hpp b/LiteLoader/include/llapi/mc/Allay.hpp index 7efaf7635f..9371d3ffc1 100644 --- a/LiteLoader/include/llapi/mc/Allay.hpp +++ b/LiteLoader/include/llapi/mc/Allay.hpp @@ -40,135 +40,135 @@ class Allay : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Allay\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Allay\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Allay\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Allay\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AllowListCommand.hpp b/LiteLoader/include/llapi/mc/AllowListCommand.hpp index e370c2d7e0..c68e710449 100644 --- a/LiteLoader/include/llapi/mc/AllowListCommand.hpp +++ b/LiteLoader/include/llapi/mc/AllowListCommand.hpp @@ -34,7 +34,7 @@ class AllowListCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@AllowListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp deleted file mode 100644 index 9beee5d54c..0000000000 --- a/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file AllowedAnywhereConsume.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct AllowedAnywhereConsume { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ALLOWEDANYWHERECONSUME -public: - struct AllowedAnywhereConsume& operator=(struct AllowedAnywhereConsume const &) = delete; - AllowedAnywhereConsume(struct AllowedAnywhereConsume const &) = delete; - AllowedAnywhereConsume() = delete; -#endif - -public: - /** - * @symbol ??0AllowedAnywhereConsume\@\@QEAA\@W4ContainerEnumName\@\@EE\@Z - */ - MCAPI AllowedAnywhereConsume(enum class ContainerEnumName, unsigned char, unsigned char); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AmethystBlock.hpp b/LiteLoader/include/llapi/mc/AmethystBlock.hpp index c448203bc4..140670d4ec 100644 --- a/LiteLoader/include/llapi/mc/AmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystBlock.hpp @@ -36,25 +36,15 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 15 + * @vftbl 18 * @symbol ?onProjectileHit\@AmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class AmethystBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class AmethystBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class AmethystBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,40 +121,50 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,55 +176,60 @@ class AmethystBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AMETHYSTBLOCK /** * @symbol ?isSilentWhenJumpingOff\@AmethystBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp index 01610c9470..192bb3b614 100644 --- a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp @@ -36,25 +36,20 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@AmethystClusterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@AmethystClusterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@AmethystClusterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class AmethystClusterBlock : public AmethystBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class AmethystClusterBlock : public AmethystBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class AmethystClusterBlock : public AmethystBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +126,80 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 68 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@AmethystClusterBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@AmethystClusterBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,87 +211,87 @@ class AmethystClusterBlock : public AmethystBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@AmethystClusterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@AmethystClusterBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@AmethystClusterBlock\@\@EEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@AmethystClusterBlock\@\@EEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@AmethystClusterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/Animal.hpp b/LiteLoader/include/llapi/mc/Animal.hpp index 2f120391cd..16690a9e40 100644 --- a/LiteLoader/include/llapi/mc/Animal.hpp +++ b/LiteLoader/include/llapi/mc/Animal.hpp @@ -42,140 +42,140 @@ class Animal : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Animal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Animal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Animal\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Animal\@\@MEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMAL /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp b/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp index 88bae624b3..ab270ae10f 100644 --- a/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class AnimateEntityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AnimateEntityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AnimateEntityPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMATEENTITYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/AnimatePacket.hpp b/LiteLoader/include/llapi/mc/AnimatePacket.hpp index fe8501466d..2fcf7f7473 100644 --- a/LiteLoader/include/llapi/mc/AnimatePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimatePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -65,9 +66,9 @@ class AnimatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AnimatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AnimatePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMATEPACKET /** * @symbol __unk_destructor_-1 @@ -82,13 +83,13 @@ class AnimatePacket : public Packet { * @symbol ??0AnimatePacket\@\@QEAA\@XZ */ MCAPI AnimatePacket(); - /** - * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@M\@Z - */ - MCAPI AnimatePacket(enum class AnimatePacket::Action, class ActorRuntimeID, float); /** * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@\@Z */ MCAPI AnimatePacket(enum class AnimatePacket::Action, class ActorRuntimeID); + /** + * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@M\@Z + */ + MCAPI AnimatePacket(enum class AnimatePacket::Action, class ActorRuntimeID, float); }; diff --git a/LiteLoader/include/llapi/mc/AnvilBlock.hpp b/LiteLoader/include/llapi/mc/AnvilBlock.hpp index 440c0e118f..8b37cefcf3 100644 --- a/LiteLoader/include/llapi/mc/AnvilBlock.hpp +++ b/LiteLoader/include/llapi/mc/AnvilBlock.hpp @@ -36,7 +36,7 @@ class AnvilBlock : public FallingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@AnvilBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; @@ -46,25 +46,15 @@ class AnvilBlock : public FallingBlock { */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@AnvilBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +66,10 @@ class AnvilBlock : public FallingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +80,6 @@ class AnvilBlock : public FallingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class AnvilBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class AnvilBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,60 +131,70 @@ class AnvilBlock : public FallingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@AnvilBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@AnvilBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@AnvilBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,107 +206,112 @@ class AnvilBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@AnvilBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@AnvilBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@AnvilBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@AnvilBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** - * @vftbl 197 + * @vftbl 195 * @symbol ?onLand\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp index 4bab784ec8..ac02d838c7 100644 --- a/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class AnvilDamagePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AnvilDamagePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AnvilDamagePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0AnvilDamagePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/AppPlatform.hpp b/LiteLoader/include/llapi/mc/AppPlatform.hpp index b685734c20..ebcf92bc4c 100644 --- a/LiteLoader/include/llapi/mc/AppPlatform.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform.hpp @@ -722,10 +722,6 @@ struct AndroidScopedStorageInfo { * @symbol ?requiresLiveGoldForMultiplayer\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool requiresLiveGoldForMultiplayer() const; - /** - * @symbol ?requiresPatchNoticePopup\@AppPlatform\@\@UEBA_NXZ - */ - MCVAPI bool requiresPatchNoticePopup() const; /** * @symbol ?requiresXboxLiveSigninToPlay\@AppPlatform\@\@UEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp b/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp index d26d193cc3..3e1eaa964e 100644 --- a/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp @@ -25,13 +25,13 @@ class ApplyJumpModifierSystem { public: /** - * @symbol ?createApplyJumpModifierSystem\@ApplyJumpModifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?_tickApplyJumpModifierSystem\@ApplyJumpModifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UPowerJump\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@$$CBUTriggerJumpRequestComponent\@\@$$CBUActorRotationComponent\@\@$$CBUAttributesComponent\@\@$$CBUMobEffectsComponent\@\@$$CBUMobTravelComponent\@\@UJumpPendingScaleComponent\@\@UStateVectorComponent\@\@\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createApplyJumpModifierSystem(); + MCAPI static void _tickApplyJumpModifierSystem(class ViewT, class FlagComponent>, struct Exclude>, struct TriggerJumpRequestComponent const, struct ActorRotationComponent const, struct AttributesComponent const, struct MobEffectsComponent const, struct MobTravelComponent const, struct JumpPendingScaleComponent, struct StateVectorComponent>); /** - * @symbol ?doPowerJump\@ApplyJumpModifierSystem\@\@SAXAEBUJumpPreventionResult\@\@AEBVBaseAttributeMap\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@MMAEAVVec3\@\@AEAM\@Z + * @symbol ?createApplyJumpModifierSystem\@ApplyJumpModifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void doPowerJump(struct JumpPreventionResult const &, class BaseAttributeMap const &, std::vector const &, float, float, class Vec3 &, float &); + MCAPI static struct TickingSystemWithInfo createApplyJumpModifierSystem(); /** * @symbol ?tickApplyJumpModifierSystem\@ApplyJumpModifierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUTriggerJumpRequestComponent\@\@AEBUActorRotationComponent\@\@AEBUAttributesComponent\@\@AEBUMobEffectsComponent\@\@AEBUMobTravelComponent\@\@AEAUJumpPendingScaleComponent\@\@AEAUStateVectorComponent\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp index 80bca727d6..c9e512b68b 100644 --- a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp +++ b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp @@ -41,125 +41,125 @@ class AreaEffectCloud : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@AreaEffectCloud\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@AreaEffectCloud\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 117 + * @vftbl 106 * @symbol ?setOwner\@AreaEffectCloud\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@AreaEffectCloud\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@AreaEffectCloud\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0AreaEffectCloud\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ArmorItem.hpp b/LiteLoader/include/llapi/mc/ArmorItem.hpp index 867ec97aac..88a3c54f6f 100644 --- a/LiteLoader/include/llapi/mc/ArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItem.hpp @@ -69,10 +69,10 @@ class ArmorMaterial { */ virtual bool isDyeable() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -224,7 +224,7 @@ class ArmorMaterial { */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getArmorKnockbackResistance\@ArmorItem\@\@UEBAMXZ */ virtual float getArmorKnockbackResistance() const; diff --git a/LiteLoader/include/llapi/mc/ArmorStand.hpp b/LiteLoader/include/llapi/mc/ArmorStand.hpp index 9d788db3b5..df74419898 100644 --- a/LiteLoader/include/llapi/mc/ArmorStand.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStand.hpp @@ -43,180 +43,180 @@ struct Pose { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@ArmorStand\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@ArmorStand\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@ArmorStand\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@ArmorStand\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 222 + * @vftbl 209 * @symbol ?getInteraction\@ArmorStand\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 236 + * @vftbl 223 * @symbol ?kill\@ArmorStand\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@ArmorStand\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@ArmorStand\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@ArmorStand\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@ArmorStand\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@ArmorStand\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 282 + * @vftbl 266 * @symbol ?pushActors\@ArmorStand\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ARMORSTAND /** * @symbol ?interactPreventDefault\@ArmorStand\@\@UEAA_NXZ @@ -234,9 +234,9 @@ struct Pose { */ MCAPI void _causeDamage(float); /** - * @symbol ?_destroyWithEffects\@ArmorStand\@\@AEAAXAEBVVec3\@\@\@Z + * @symbol ?_destroyWithEffects\@ArmorStand\@\@AEAAXPEAVActor\@\@\@Z */ - MCAPI void _destroyWithEffects(class Vec3 const &); + MCAPI void _destroyWithEffects(class Actor *); /** * @symbol ?_dropHeldItems\@ArmorStand\@\@AEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp index 742d2f684a..6e6be32a39 100644 --- a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp @@ -52,10 +52,10 @@ class ArmorStandItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,7 @@ class ArmorStandItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@ArmorStandItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/Arrow.hpp b/LiteLoader/include/llapi/mc/Arrow.hpp index 5465800c67..8978ee679b 100644 --- a/LiteLoader/include/llapi/mc/Arrow.hpp +++ b/LiteLoader/include/llapi/mc/Arrow.hpp @@ -42,147 +42,147 @@ class Arrow : public AbstractArrow { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Arrow\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 87 + * @vftbl 78 * @symbol ?playerTouch\@Arrow\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 224 + * @vftbl 211 * @symbol ?setAuxValue\@Arrow\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Arrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Arrow\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?shoot\@Arrow\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?_getPickupItem\@Arrow\@\@MEBA?AVItemStack\@\@XZ */ virtual class ItemStack _getPickupItem() const; /** - * @vftbl 271 + * @vftbl 257 * @symbol ?applyParticleColor\@Arrow\@\@MEAAXPEAVParticle\@\@\@Z */ virtual void applyParticleColor(class Particle *); /** - * @vftbl 272 + * @vftbl 258 * @symbol ?getEffectColor\@Arrow\@\@MEAA?AVColor\@mce\@\@XZ */ virtual class mce::Color getEffectColor(); diff --git a/LiteLoader/include/llapi/mc/ArrowItem.hpp b/LiteLoader/include/llapi/mc/ArrowItem.hpp index 492a37cf53..946da57c9e 100644 --- a/LiteLoader/include/llapi/mc/ArrowItem.hpp +++ b/LiteLoader/include/llapi/mc/ArrowItem.hpp @@ -52,10 +52,10 @@ class ArrowItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/AttributeBuff.hpp b/LiteLoader/include/llapi/mc/AttributeBuff.hpp index 35b39f9748..6f2ad4e2a1 100644 --- a/LiteLoader/include/llapi/mc/AttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/AttributeBuff.hpp @@ -101,14 +101,14 @@ class AttributeBuff { MCAPI static enum class ActorDamageCause buffTypeToDamageCause(enum class AttributeBuffType); //protected: - /** - * @symbol ??0AttributeBuff\@\@IEAA\@MHAEBVActorDamageSource\@\@W4AttributeBuffType\@\@\@Z - */ - MCAPI AttributeBuff(float, int, class ActorDamageSource const &, enum class AttributeBuffType); /** * @symbol ??0AttributeBuff\@\@IEAA\@MHW4AttributeBuffType\@\@\@Z */ MCAPI AttributeBuff(float, int, enum class AttributeBuffType); + /** + * @symbol ??0AttributeBuff\@\@IEAA\@MHAEBVActorDamageSource\@\@W4AttributeBuffType\@\@\@Z + */ + MCAPI AttributeBuff(float, int, class ActorDamageSource const &, enum class AttributeBuffType); protected: diff --git a/LiteLoader/include/llapi/mc/AttributeInstance.hpp b/LiteLoader/include/llapi/mc/AttributeInstance.hpp index 0f35478718..c766d5e1b4 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstance.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstance.hpp @@ -104,14 +104,14 @@ class AttributeInstance { * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVAttributeModifier\@\@\@Z */ MCAPI bool hasModifier(class AttributeModifier const &) const; - /** - * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z - */ - MCAPI bool hasModifier(class std::shared_ptr) const; /** * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVUUID\@mce\@\@\@Z */ MCAPI bool hasModifier(class mce::UUID const &) const; + /** + * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z + */ + MCAPI bool hasModifier(class std::shared_ptr) const; /** * @symbol ?hasModifiers\@AttributeInstance\@\@QEBA_NXZ */ @@ -120,18 +120,10 @@ class AttributeInstance { * @symbol ?hasTemporalBuffs\@AttributeInstance\@\@QEBA_NXZ */ MCAPI bool hasTemporalBuffs() const; - /** - * @symbol ?inheritFrom\@AttributeInstance\@\@QEAAXAEBV1\@PEAVBaseAttributeMap\@\@\@Z - */ - MCAPI void inheritFrom(class AttributeInstance const &, class BaseAttributeMap *); /** * @symbol ?isValid\@AttributeInstance\@\@QEBA_NXZ */ MCAPI bool isValid() const; - /** - * @symbol ??8AttributeInstance\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class AttributeInstance const &) const; /** * @symbol ?recalculateModifiers\@AttributeInstance\@\@QEAAXXZ */ @@ -152,6 +144,10 @@ class AttributeInstance { * @symbol ?removeBuffs\@AttributeInstance\@\@QEAAXXZ */ MCAPI void removeBuffs(); + /** + * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z + */ + MCAPI void removeModifier(class std::shared_ptr); /** * @symbol ?removeModifier\@AttributeInstance\@\@QEAA_NAEBVUUID\@mce\@\@\@Z */ @@ -160,10 +156,6 @@ class AttributeInstance { * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z */ MCAPI void removeModifier(class AttributeModifier const &); - /** - * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z - */ - MCAPI void removeModifier(class std::shared_ptr); /** * @symbol ?removeModifiers\@AttributeInstance\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/AttributeModifier.hpp b/LiteLoader/include/llapi/mc/AttributeModifier.hpp index b3cec94e81..046ff2bd74 100644 --- a/LiteLoader/include/llapi/mc/AttributeModifier.hpp +++ b/LiteLoader/include/llapi/mc/AttributeModifier.hpp @@ -43,11 +43,6 @@ class AttributeModifier { bool mSerialize; #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ATTRIBUTEMODIFIER -public: - AttributeModifier(class AttributeModifier const &) = delete; -#endif - public: /** * @vftbl 0 @@ -65,6 +60,14 @@ class AttributeModifier { */ MCVAPI ~AttributeModifier(); #endif + /** + * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MW4AttributeModifierOperation\@\@W4AttributeOperands\@\@_N\@Z + */ + MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool); + /** + * @symbol ??0AttributeModifier\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI AttributeModifier(class AttributeModifier const &); /** * @symbol ??0AttributeModifier\@\@QEAA\@XZ */ @@ -73,10 +76,6 @@ class AttributeModifier { * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MHH_N\@Z */ MCAPI AttributeModifier(class mce::UUID, std::string const &, float, int, int, bool); - /** - * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MW4AttributeModifierOperation\@\@W4AttributeOperands\@\@_N\@Z - */ - MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool); /** * @symbol ?getAmount\@AttributeModifier\@\@QEBAMXZ */ diff --git a/LiteLoader/include/llapi/mc/AutoStepFilterSystemImpl.hpp b/LiteLoader/include/llapi/mc/AutoStepFilterSystemImpl.hpp new file mode 100644 index 0000000000..a82aa85ff3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AutoStepFilterSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file AutoStepFilterSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AutoStepFilterSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doAutoStepFilterSystem\@AutoStepFilterSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUMaxAutoStepComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUAbilitiesComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@\@\@\@Z + */ + MCAPI void doAutoStepFilterSystem(class StrictEntityContext &, struct MoveRequestComponent const &, struct MaxAutoStepComponent const &, class Optional const>, class Optional, class EntityModifierT>); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AutoStepSystem.hpp b/LiteLoader/include/llapi/mc/AutoStepSystem.hpp new file mode 100644 index 0000000000..6a6eb0adc5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AutoStepSystem.hpp @@ -0,0 +1,62 @@ +/** + * @file AutoStepSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AutoStepSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AUTOSTEPSYSTEM +public: + class AutoStepSystem& operator=(class AutoStepSystem const &) = delete; + AutoStepSystem(class AutoStepSystem const &) = delete; + AutoStepSystem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol __unk_vfn_1 + */ + virtual void __unk_vfn_1(); + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?tick\@AutoStepSystem\@\@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\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct SynchedActorDataComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct DimensionTypeComponent, struct MaxAutoStepComponent>, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + /** + * @vftbl 5 + * @symbol ?singleTick\@AutoStepSystem\@\@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\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@\@\@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 SynchedActorDataComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct DimensionTypeComponent, struct MaxAutoStepComponent>, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class StrictEntityContext &); + /** + * @symbol ?createSystem\@AutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp b/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp index 37f9268386..4b870b7ed8 100644 --- a/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp +++ b/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp @@ -5,17 +5,15 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "JsonUtil.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC namespace AutomaticFeatureRules. - * - */ -namespace AutomaticFeatureRules { + +class AutomaticFeatureRules { #define AFTER_EXTRA // Add Member There @@ -26,13 +24,29 @@ struct AutomaticFeatureRule { }; #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AUTOMATICFEATURERULES +public: + class AutomaticFeatureRules& operator=(class AutomaticFeatureRules const &) = delete; + AutomaticFeatureRules(class AutomaticFeatureRules const &) = delete; + AutomaticFeatureRules() = delete; +#endif + +public: /** - * @symbol ?attachAutomaticFeatures\@AutomaticFeatureRules\@\@YAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@\@Z + * @symbol ?attachAutomaticFeatures\@AutomaticFeatureRules\@\@QEBAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@\@Z */ - MCAPI void attachAutomaticFeatures(class ResourcePackManager &, class IWorldRegistriesProvider &, class Experiments const &); + MCAPI void attachAutomaticFeatures(class ResourcePackManager &, class IWorldRegistriesProvider &, class Experiments const &) const; /** - * @symbol ?parseAutomaticFeatures\@AutomaticFeatureRules\@\@YAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@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?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?parseAutomaticFeatures\@AutomaticFeatureRules\@\@QEBA?AV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@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?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@2\@\@std\@\@\@2\@\@std\@\@AEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@\@Z */ - MCAPI void parseAutomaticFeatures(class ResourcePackManager &, class IWorldRegistriesProvider &, class Experiments const &, class std::unordered_map, struct std::equal_to, class std::allocator>>, struct std::hash, struct std::equal_to, class std::allocator, struct std::equal_to, class std::allocator>>>>> &); + MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>>, struct std::hash, struct std::equal_to, class std::allocator, struct std::equal_to, class std::allocator>>>>> parseAutomaticFeatures(class ResourcePackManager &, class IWorldRegistriesProvider &, class Experiments const &) const; -}; \ No newline at end of file +//private: + /** + * @symbol ?_parseAndInsertUnsorted\@AutomaticFeatureRules\@\@AEBAXAEBV?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@V?$tuple\@V?$reference_wrapper\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@V?$reference_wrapper\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@2\@V?$reference_wrapper\@VIWorldRegistriesProvider\@\@\@2\@\@std\@\@\@JsonUtil\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBVSemVersion\@\@AEAVIWorldRegistriesProvider\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@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?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@2\@\@std\@\@\@2\@\@5\@\@Z + */ + MCAPI void _parseAndInsertUnsorted(class JsonUtil::JsonSchemaObjectNode, class std::reference_wrapper, class std::reference_wrapper>> const &, std::string const &, std::string const &, class SemVersion const &, class IWorldRegistriesProvider &, class std::unordered_map, struct std::equal_to, class std::allocator>>, struct std::hash, struct std::equal_to, class std::allocator, struct std::equal_to, class std::allocator>>>>> &) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/AutomationBehaviorTreeGroup.hpp b/LiteLoader/include/llapi/mc/AutomationBehaviorTreeGroup.hpp new file mode 100644 index 0000000000..d869ec9093 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AutomationBehaviorTreeGroup.hpp @@ -0,0 +1,52 @@ +/** + * @file AutomationBehaviorTreeGroup.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AutomationBehaviorTreeGroup { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AUTOMATIONBEHAVIORTREEGROUP +public: + class AutomationBehaviorTreeGroup& operator=(class AutomationBehaviorTreeGroup const &) = delete; + AutomationBehaviorTreeGroup(class AutomationBehaviorTreeGroup const &) = delete; + AutomationBehaviorTreeGroup() = delete; +#endif + +public: + /** + * @symbol ??0AutomationBehaviorTreeGroup\@\@QEAA\@AEAVResourcePackManager\@\@AEAVBehaviorFactory\@\@\@Z + */ + MCAPI AutomationBehaviorTreeGroup(class ResourcePackManager &, class BehaviorFactory &); + /** + * @symbol ?tryGetDefinition\@AutomationBehaviorTreeGroup\@\@QEAA?AVBehaviorTreeDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class BehaviorTreeDefinitionPtr tryGetDefinition(std::string const &); + /** + * @symbol ??1AutomationBehaviorTreeGroup\@\@QEAA\@XZ + */ + MCAPI ~AutomationBehaviorTreeGroup(); + +//private: + /** + * @symbol ?_addRef\@AutomationBehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z + */ + MCAPI void _addRef(class BehaviorTreeDefinitionPtr &); + /** + * @symbol ?_removeRef\@AutomationBehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z + */ + MCAPI void _removeRef(class BehaviorTreeDefinitionPtr &); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp index 791737396b..59bdf15283 100644 --- a/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class AutomationClientConnectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AutomationClientConnectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AutomationClientConnectPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AUTOMATIONCLIENTCONNECTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~AutomationClientConnectPacket(); #endif - /** - * @symbol ??0AutomationClientConnectPacket\@\@QEAA\@XZ - */ - MCAPI AutomationClientConnectPacket(); /** * @symbol ??0AutomationClientConnectPacket\@\@QEAA\@UWebSocketPacketData\@\@\@Z */ MCAPI AutomationClientConnectPacket(struct WebSocketPacketData); + /** + * @symbol ??0AutomationClientConnectPacket\@\@QEAA\@XZ + */ + MCAPI AutomationClientConnectPacket(); }; diff --git a/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp index 6426c80b4a..5ec2dbe109 100644 --- a/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp @@ -46,26 +46,11 @@ class AutomationPlayerCommandOrigin : public PlayerCommandOrigin { * @symbol ?getName\@AutomationPlayerCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; - /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@AutomationPlayerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ - */ - virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** * @vftbl 10 * @symbol ?clone\@AutomationPlayerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; - /** - * @vftbl 13 - * @symbol ?hasChatPerms\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ - */ - virtual bool hasChatPerms() const; - /** - * @vftbl 14 - * @symbol ?hasTellPerms\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ - */ - virtual bool hasTellPerms() const; /** * @vftbl 19 * @symbol ?getSourceId\@AutomationPlayerCommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ @@ -92,12 +77,12 @@ class AutomationPlayerCommandOrigin : public PlayerCommandOrigin { */ virtual bool isValid() const; /** - * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPlayer\@\@\@Z + * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVNetworkIdentifier\@\@\@Z */ - MCAPI AutomationPlayerCommandOrigin(std::string const &, class Player &); + MCAPI AutomationPlayerCommandOrigin(struct ActorUniqueID, class Level &, std::string const &, class NetworkIdentifier const &); /** - * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CommandPermissionLevel\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPlayer\@\@\@Z */ - MCAPI AutomationPlayerCommandOrigin(struct ActorUniqueID, class Level &, std::string const &, enum class CommandPermissionLevel, class NetworkIdentifier const &); + MCAPI AutomationPlayerCommandOrigin(std::string const &, class Player &); }; diff --git a/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp b/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp index fe5c2a5c93..1525941bee 100644 --- a/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp +++ b/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp @@ -37,10 +37,6 @@ class AutonomousActorManager { * @symbol ?addAutonomousActorEntity\@AutonomousActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI class Actor * addAutonomousActorEntity(class IAddActorEntityProxy &, class OwnerPtrT); - /** - * @symbol ?addOwnedInactiveAutonomousActorEntity\@AutonomousActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z - */ - MCAPI void addOwnedInactiveAutonomousActorEntity(class OwnerPtrT); /** * @symbol ?hasOwnedInactiveAutonomousActorWithUniqueID\@AutonomousActorManager\@\@QEBA_NUActorUniqueID\@\@\@Z */ @@ -49,6 +45,10 @@ class AutonomousActorManager { * @symbol ?initializeWithActorManager\@AutonomousActorManager\@\@QEAAXV?$not_null\@V?$NonOwnerPointer\@VActorManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI void initializeWithActorManager(class gsl::not_null>); + /** + * @symbol ?loadAutonomousActorsFromDisk\@AutonomousActorManager\@\@QEAAXAEAVLevelStorage\@\@AEAVActorFactory\@\@\@Z + */ + MCAPI void loadAutonomousActorsFromDisk(class LevelStorage &, class ActorFactory &); /** * @symbol ?onChunkDiscarded\@AutonomousActorManager\@\@QEAAXAEAVLevelChunk\@\@\@Z */ @@ -87,6 +87,10 @@ class AutonomousActorManager { * @symbol ?_saveAllAutonomousActors\@AutonomousActorManager\@\@AEAAXAEAVLevelStorage\@\@\@Z */ MCAPI void _saveAllAutonomousActors(class LevelStorage &); + /** + * @symbol ?_deduplicateDuplicateActorsFromList\@AutonomousActorManager\@\@CAXAEAVListTag\@\@\@Z + */ + MCAPI static void _deduplicateDuplicateActorsFromList(class ListTag &); private: diff --git a/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp index 19ddc8af3d..e654dd6826 100644 --- a/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp @@ -52,10 +52,10 @@ class AuxDataBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@AuxDataBlockItem\@\@UEBAHH\@Z diff --git a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp index 884e3ae383..7bd8073c0a 100644 --- a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,27 +52,27 @@ class AvailableActorIdentifiersPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?read\@AvailableActorIdentifiersPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@AvailableActorIdentifiersPacket\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@AvailableActorIdentifiersPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AvailableActorIdentifiersPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AVAILABLEACTORIDENTIFIERSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~AvailableActorIdentifiersPacket(); #endif - /** - * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@XZ - */ - MCAPI AvailableActorIdentifiersPacket(); /** * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@AEBV?$vector\@UActorInfo\@\@V?$allocator\@UActorInfo\@\@\@std\@\@\@std\@\@\@Z */ MCAPI AvailableActorIdentifiersPacket(std::vector const &); + /** + * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@XZ + */ + MCAPI AvailableActorIdentifiersPacket(); }; diff --git a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp index 03f7b45031..4be1ac637f 100644 --- a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -44,37 +45,51 @@ class AvailableCommandsPacket : public Packet { struct OverloadData { std::vector datas; + bool chained; }; struct CommandData { - std::string name; //0 - std::string description; //32 - CommandFlag flag; //64 - CommandPermissionLevel perm; //66 - std::vector overloads; //72 - signed int aliasIndex; //96 - };//104 + std::string name; // 0 + std::string description; // 32 + CommandFlag flag; // 64 + CommandPermissionLevel perm; // 66 + std::vector overloads; // 72 + std::vector chainedOffsets; // 96 + signed int aliasIndex; // 120 + }; // 128 struct SoftEnumData { std::string name; std::vector values; - };//56 + }; + struct ChainedSubcommandDataValue + { + unsigned int index; + unsigned int value; + }; + struct ChainedSubcommandData + { + std::string name; + std::vector valueIndices; + }; -std::vector mAllEnums;//48 -std::vector mAllSuffix;//72 -std::vector mEnumDatas;//96 -std::vector mCommandDatas;//120 -std::vector mSoftEnums;//144 -std::vector mConstrainedValueDatas; //168 -inline void test() -{ - static_assert(sizeof(AvailableCommandsPacket) == 192); + std::vector mAllEnums; // 48 + std::vector mAllSuffix; // 48+24=72 + std::vector mEnumDatas; // 48+24*2=96 + std::vector mChainedSubcommandValues; // 48+24*3=120 + std::vector mChainedSubcommands; // 48+24*4=144 + std::vector mCommandDatas; // 48+24*5=168 + std::vector mSoftEnums; // 48+24*6=192 + std::vector mConstrainedValueDatas; // 48+24*7=216 + +inline void test() { + static_assert(sizeof(AvailableCommandsPacket) == 240); static_assert(sizeof(EnumData) == 56); - static_assert(sizeof(CommandData) == 104); + static_assert(sizeof(CommandData) == 128); static_assert(offsetof(CommandData, perm) == 66); static_assert(offsetof(AvailableCommandsPacket, mAllEnums) == 48); static_assert(offsetof(AvailableCommandsPacket, mAllSuffix) == 72); - static_assert(offsetof(AvailableCommandsPacket, mConstrainedValueDatas) == 168); + static_assert(offsetof(AvailableCommandsPacket, mConstrainedValueDatas) == 216); } public: @@ -151,22 +166,22 @@ inline std::vector getSoftEnumValues(std::string const& name) virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@AvailableCommandsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@AvailableCommandsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AVAILABLECOMMANDSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~AvailableCommandsPacket(); #endif - /** - * @symbol ??0AvailableCommandsPacket\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@0$$QEAV?$vector\@UEnumData\@AvailableCommandsPacket\@\@V?$allocator\@UEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UConstrainedValueData\@AvailableCommandsPacket\@\@V?$allocator\@UConstrainedValueData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UCommandData\@AvailableCommandsPacket\@\@V?$allocator\@UCommandData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@USoftEnumData\@AvailableCommandsPacket\@\@V?$allocator\@USoftEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@\@Z - */ - MCAPI AvailableCommandsPacket(std::vector const &, std::vector const &, std::vector &&, std::vector &&, std::vector &&, std::vector &&); /** * @symbol ??0AvailableCommandsPacket\@\@QEAA\@XZ */ MCAPI AvailableCommandsPacket(); + /** + * @symbol ??0AvailableCommandsPacket\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@00$$QEAV?$vector\@UEnumData\@AvailableCommandsPacket\@\@V?$allocator\@UEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UChainedSubcommandData\@AvailableCommandsPacket\@\@V?$allocator\@UChainedSubcommandData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UConstrainedValueData\@AvailableCommandsPacket\@\@V?$allocator\@UConstrainedValueData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UCommandData\@AvailableCommandsPacket\@\@V?$allocator\@UCommandData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@USoftEnumData\@AvailableCommandsPacket\@\@V?$allocator\@USoftEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@\@Z + */ + MCAPI AvailableCommandsPacket(std::vector const &, std::vector const &, std::vector const &, std::vector &&, std::vector &&, std::vector &&, std::vector &&, std::vector &&); }; diff --git a/LiteLoader/include/llapi/mc/Axolotl.hpp b/LiteLoader/include/llapi/mc/Axolotl.hpp index 9b57dbc422..f832deb50b 100644 --- a/LiteLoader/include/llapi/mc/Axolotl.hpp +++ b/LiteLoader/include/llapi/mc/Axolotl.hpp @@ -42,127 +42,127 @@ class Axolotl : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Axolotl\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 344 + * @vftbl 324 * @symbol ?_getAdjustedAABBForSpawnCheck\@Axolotl\@\@UEBA?AVAABB\@\@AEBV2\@AEBVVec3\@\@\@Z */ virtual class AABB _getAdjustedAABBForSpawnCheck(class AABB const &, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/AzaleaBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaBlock.hpp index 1e52a6451e..5858a53ea7 100644 --- a/LiteLoader/include/llapi/mc/AzaleaBlock.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaBlock.hpp @@ -36,30 +36,20 @@ class AzaleaBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@AzaleaBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 24 + * @vftbl 27 * @symbol ?canProvideMultifaceSupport\@AzaleaBlock\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideMultifaceSupport(class Block const &, unsigned char) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +60,11 @@ class AzaleaBlock : public BushBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@AzaleaBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +77,9 @@ class AzaleaBlock : public BushBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@AzaleaBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class AzaleaBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class AzaleaBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,55 +131,65 @@ class AzaleaBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@AzaleaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@AzaleaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@AzaleaBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,55 +201,60 @@ class AzaleaBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0AzaleaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/AzaleaLeavesBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaLeavesBlock.hpp index a26bcad11b..95ebd8bcdb 100644 --- a/LiteLoader/include/llapi/mc/AzaleaLeavesBlock.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaLeavesBlock.hpp @@ -31,20 +31,10 @@ class AzaleaLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class AzaleaLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class AzaleaLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class AzaleaLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class AzaleaLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,40 +111,50 @@ class AzaleaLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -171,87 +166,92 @@ class AzaleaLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@AzaleaLeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@AzaleaLeavesBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@AzaleaLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@AzaleaLeavesBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@AzaleaLeavesBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@AzaleaLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@AzaleaLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/Balloon.hpp b/LiteLoader/include/llapi/mc/Balloon.hpp index c7150d2124..0830c66f88 100644 --- a/LiteLoader/include/llapi/mc/Balloon.hpp +++ b/LiteLoader/include/llapi/mc/Balloon.hpp @@ -47,113 +47,117 @@ class Balloon : public PredictableProjectile { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Balloon\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Balloon\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0Balloon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Balloon(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + /** + * @symbol ?remove\@Balloon\@\@QEAAX_N\@Z + */ + MCAPI void remove(bool); }; diff --git a/LiteLoader/include/llapi/mc/BalloonItem.hpp b/LiteLoader/include/llapi/mc/BalloonItem.hpp index 4588cc0ee9..8e64030362 100644 --- a/LiteLoader/include/llapi/mc/BalloonItem.hpp +++ b/LiteLoader/include/llapi/mc/BalloonItem.hpp @@ -57,10 +57,10 @@ class BalloonItem : public Item { */ virtual bool isDyeable() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -127,7 +127,7 @@ class BalloonItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BalloonItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/BambooItem.hpp b/LiteLoader/include/llapi/mc/BambooItem.hpp index 39cecfbc3e..772805f8c6 100644 --- a/LiteLoader/include/llapi/mc/BambooItem.hpp +++ b/LiteLoader/include/llapi/mc/BambooItem.hpp @@ -47,10 +47,10 @@ class BambooItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@BambooItem\@\@UEBAHH\@Z @@ -112,7 +112,7 @@ class BambooItem : public BlockItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BambooItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp b/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp index 98cc56629d..02a2424a10 100644 --- a/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp @@ -31,25 +31,15 @@ class BambooSaplingBlock : public SaplingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 8 + * @vftbl 17 * @symbol ?randomlyModifyPosition\@BambooSaplingBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BambooSaplingBlock : public SaplingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BambooSaplingBlock : public SaplingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BambooSaplingBlock : public SaplingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BambooSaplingBlock : public SaplingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,75 +116,85 @@ class BambooSaplingBlock : public SaplingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@BambooSaplingBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@BambooSaplingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,87 +206,92 @@ class BambooSaplingBlock : public SaplingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@BambooSaplingBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BambooSaplingBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@BambooSaplingBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp b/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp index 2d8d54f580..59b123d804 100644 --- a/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp @@ -32,29 +32,24 @@ class BambooStalkBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@BambooStalkBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@BambooStalkBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +60,11 @@ class BambooStalkBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@BambooStalkBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +77,9 @@ class BambooStalkBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@BambooStalkBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class BambooStalkBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class BambooStalkBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,80 +131,90 @@ class BambooStalkBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@BambooStalkBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@BambooStalkBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@BambooStalkBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,82 +226,82 @@ class BambooStalkBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@BambooStalkBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/BannerBlock.hpp b/LiteLoader/include/llapi/mc/BannerBlock.hpp index 1bd659e2ee..6af21b1e1d 100644 --- a/LiteLoader/include/llapi/mc/BannerBlock.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlock.hpp @@ -36,25 +36,20 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class BannerBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class BannerBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class BannerBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +126,70 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@BannerBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@BannerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@BannerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,82 +201,82 @@ class BannerBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BannerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BannerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getEntityResourceItem\@BannerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BannerBlockActor.hpp b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp index fdf15d3b31..332454474e 100644 --- a/LiteLoader/include/llapi/mc/BannerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp @@ -65,6 +65,11 @@ class BannerBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -91,17 +96,22 @@ class BannerBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@BannerBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@BannerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/BannerItem.hpp b/LiteLoader/include/llapi/mc/BannerItem.hpp index c166a6fd2b..543a1912f3 100644 --- a/LiteLoader/include/llapi/mc/BannerItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerItem.hpp @@ -52,10 +52,10 @@ class BannerItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -132,7 +132,7 @@ class BannerItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BannerItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/BannerPatternItem.hpp b/LiteLoader/include/llapi/mc/BannerPatternItem.hpp index adb0dbafba..b879da5474 100644 --- a/LiteLoader/include/llapi/mc/BannerPatternItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerPatternItem.hpp @@ -52,10 +52,10 @@ class BannerPatternItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/BarrelBlock.hpp b/LiteLoader/include/llapi/mc/BarrelBlock.hpp index 52f3f08453..72dd10fff1 100644 --- a/LiteLoader/include/llapi/mc/BarrelBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlock.hpp @@ -36,20 +36,10 @@ class BarrelBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BarrelBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BarrelBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BarrelBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BarrelBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,46 +115,56 @@ class BarrelBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@BarrelBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@BarrelBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -182,79 +177,84 @@ class BarrelBlock : public FaceDirectionalBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@BarrelBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BarrelBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getFaceFlip\@BarrelBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@BarrelBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@BarrelBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BARRELBLOCK /** * @symbol ?hasComparatorSignal\@BarrelBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BarrierBlock.hpp b/LiteLoader/include/llapi/mc/BarrierBlock.hpp index 194e0e1398..450e41ad08 100644 --- a/LiteLoader/include/llapi/mc/BarrierBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrierBlock.hpp @@ -36,25 +36,15 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@BarrierBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class BarrierBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class BarrierBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class BarrierBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +121,55 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 - * @symbol ?canContainLiquid\@BarrierBlock\@\@UEBA_NXZ + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canContainLiquid() const; + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 64 + * @symbol ?canContainLiquid\@BarrierBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,60 +181,65 @@ class BarrierBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 140 + * @vftbl 141 * @symbol ?getShadeBrightness\@BarrierBlock\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getShadeBrightness(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0BarrierBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp index 53389f88c3..234522dc31 100644 --- a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp +++ b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp @@ -64,14 +64,14 @@ class BaseAttributeMap { * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@I\@Z */ MCAPI class AttributeInstance const & getInstance(unsigned int) const; - /** - * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@I\@Z - */ - MCAPI class AttributeInstance * getMutableInstance(unsigned int); /** * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ MCAPI class AttributeInstance * getMutableInstance(class Attribute const &); + /** + * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@I\@Z + */ + MCAPI class AttributeInstance * getMutableInstance(unsigned int); /** * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVHashedString\@\@\@Z */ @@ -120,10 +120,6 @@ class BaseAttributeMap { * @symbol ?DIFF_NO_ATTRIBUTES\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_NO_ATTRIBUTES; - /** - * @symbol ?getDiff\@BaseAttributeMap\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z - */ - MCAPI static class std::optional getDiff(class BaseAttributeMap const &, class BaseAttributeMap const &); //private: diff --git a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp index e58a39bd96..40c0626079 100644 --- a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp +++ b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp @@ -27,6 +27,10 @@ class BaseGameVersion { * @symbol ??0BaseGameVersion\@\@QEAA\@AEBV0\@\@Z */ MCAPI BaseGameVersion(class BaseGameVersion const &); + /** + * @symbol ??0BaseGameVersion\@\@QEAA\@AEBVSemVersion\@\@\@Z + */ + MCAPI BaseGameVersion(class SemVersion const &); /** * @symbol ??0BaseGameVersion\@\@QEAA\@XZ */ @@ -35,10 +39,6 @@ class BaseGameVersion { * @symbol ??0BaseGameVersion\@\@QEAA\@GII\@Z */ MCAPI BaseGameVersion(unsigned short, unsigned int, unsigned int); - /** - * @symbol ??0BaseGameVersion\@\@QEAA\@AEBVSemVersion\@\@\@Z - */ - MCAPI BaseGameVersion(class SemVersion const &); /** * @symbol ?asSemVersion\@BaseGameVersion\@\@QEBAAEBVSemVersion\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp index 11b9637b38..9774a98576 100644 --- a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp +++ b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp @@ -66,7 +66,7 @@ class BaseMoveToGoal { virtual void tick(); /** * @vftbl 7 - * @symbol ?appendDebugInfo\@StrollTowardsVillageGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?appendDebugInfo\@RaidGardenGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const = 0; /** @@ -86,7 +86,7 @@ class BaseMoveToGoal { virtual bool hasReachedTarget() const; /** * @vftbl 11 - * @symbol ?isValidTarget\@OcelotSitOnBlockGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isValidTarget\@RaidGardenGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &) = 0; /** diff --git a/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp index 0ff379a11a..234b57bcfe 100644 --- a/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp @@ -36,25 +36,20 @@ class BasePressurePlateBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class BasePressurePlateBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class BasePressurePlateBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class BasePressurePlateBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class BasePressurePlateBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,86 +125,91 @@ class BasePressurePlateBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@BasePressurePlateBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@BasePressurePlateBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@BasePressurePlateBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 107 + * @vftbl 110 * @symbol ?isAttachedTo\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 111 + * @vftbl 113 * @symbol ?shouldTriggerEntityInside\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 112 - * @symbol ?entityInside\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,112 +221,117 @@ class BasePressurePlateBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BasePressurePlateBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@BasePressurePlateBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BasePressurePlateBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@BasePressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 188 + * @symbol ?entityInside\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + /** + * @vftbl 192 * @symbol ?getTickDelay\@BasePressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const = 0; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const = 0; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const = 0; /** - * @vftbl 198 + * @vftbl 196 * @symbol ?getSensitiveAABB\@BasePressurePlateBlock\@\@MEBA?BVAABB\@\@AEBVBlockPos\@\@\@Z */ virtual class AABB const getSensitiveAABB(class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/BaseRailBlock.hpp b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp index ced9caf232..8b520a79c1 100644 --- a/LiteLoader/include/llapi/mc/BaseRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp @@ -36,25 +36,20 @@ class BaseRailBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +60,11 @@ class BaseRailBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@BaseRailBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +77,9 @@ class BaseRailBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@BaseRailBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class BaseRailBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class BaseRailBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,65 +131,75 @@ class BaseRailBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@BaseRailBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@BaseRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,90 +211,90 @@ class BaseRailBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 139 - * @symbol ?onGraphicsModeChanged\@BaseRailBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); + virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@BaseRailBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@BaseRailBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BaseRailBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@BaseRailBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASERAILBLOCK /** * @symbol ?isRailBlock\@BaseRailBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BasicLoader.hpp b/LiteLoader/include/llapi/mc/BasicLoader.hpp deleted file mode 100644 index 671eff3d05..0000000000 --- a/LiteLoader/include/llapi/mc/BasicLoader.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file BasicLoader.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BasicLoader. - * - */ -class BasicLoader { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BASICLOADER -public: - class BasicLoader& operator=(class BasicLoader const &) = delete; - BasicLoader(class BasicLoader const &) = delete; - BasicLoader() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASICLOADER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~BasicLoader(); -#endif - /** - * @symbol ?getErrors\@BasicLoader\@\@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 - */ - MCAPI std::vector getErrors() const; - -}; diff --git a/LiteLoader/include/llapi/mc/BasicSaver.hpp b/LiteLoader/include/llapi/mc/BasicSaver.hpp deleted file mode 100644 index 58eb162545..0000000000 --- a/LiteLoader/include/llapi/mc/BasicSaver.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/** - * @file BasicSaver.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BasicSaver. - * - */ -class BasicSaver { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BASICSAVER -public: - class BasicSaver& operator=(class BasicSaver const &) = delete; - BasicSaver(class BasicSaver const &) = delete; - BasicSaver() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASICSAVER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~BasicSaver(); -#endif - -//private: - /** - * @symbol ?saveImpl\@BasicSaver\@\@AEAA_NAEAUSchemaWriter\@reflection\@\@Umeta_handle\@entt\@\@AEBVBasicSchema\@internal\@3\@\@Z - */ - MCAPI bool saveImpl(struct reflection::SchemaWriter &, struct entt::meta_handle, class reflection::internal::BasicSchema const &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/Bat.hpp b/LiteLoader/include/llapi/mc/Bat.hpp index 36b8b6f97a..8cfdac207d 100644 --- a/LiteLoader/include/llapi/mc/Bat.hpp +++ b/LiteLoader/include/llapi/mc/Bat.hpp @@ -37,150 +37,150 @@ class Bat : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 179 + * @vftbl 167 * @symbol ?checkFallDamage\@Bat\@\@MEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Bat\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Bat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Bat\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 282 + * @vftbl 266 * @symbol ?pushActors\@Bat\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 338 + * @vftbl 318 * @symbol ?newServerAiStep\@Bat\@\@MEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Bat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BeaconBlock.hpp b/LiteLoader/include/llapi/mc/BeaconBlock.hpp index 8b6d6ffabd..797ee5371e 100644 --- a/LiteLoader/include/llapi/mc/BeaconBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeaconBlock.hpp @@ -36,20 +36,10 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BeaconBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BeaconBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BeaconBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 - * @symbol ?canContainLiquid\@BeaconBlock\@\@UEBA_NXZ + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canContainLiquid() const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 64 + * @symbol ?canContainLiquid\@BeaconBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,60 +176,65 @@ class BeaconBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 176 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?use\@BeaconBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEACONBLOCK /** * @symbol ?isInteractiveBlock\@BeaconBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BedBlock.hpp b/LiteLoader/include/llapi/mc/BedBlock.hpp index aa0f85f69d..af5c661bd1 100644 --- a/LiteLoader/include/llapi/mc/BedBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedBlock.hpp @@ -41,20 +41,10 @@ class BedBlock : public BlockLegacy { */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class BedBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class BedBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class BedBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class BedBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,90 +121,100 @@ class BedBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 55 + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 58 * @symbol ?canFillAtPos\@BedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 56 + * @vftbl 59 * @symbol ?sanitizeFillBlock\@BedBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 57 + * @vftbl 60 * @symbol ?onFillBlock\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@BedBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 80 + * @vftbl 83 * @symbol ?updateEntityAfterFallOn\@BedBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@BedBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,95 +226,100 @@ class BedBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** * @vftbl 128 + * @symbol __unk_vfn_128 + */ + virtual void __unk_vfn_128(); + /** + * @vftbl 129 * @symbol ?canSpawnAt\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 144 + * @vftbl 142 * @symbol ?telemetryVariant\@BedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@BedBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@BedBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEDBLOCK /** * @symbol ?canBeSilkTouched\@BedBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BedBlockActor.hpp b/LiteLoader/include/llapi/mc/BedBlockActor.hpp index 94c6143646..992ef72600 100644 --- a/LiteLoader/include/llapi/mc/BedBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BedBlockActor.hpp @@ -85,6 +85,11 @@ class BedBlockActor : public BlockActor { * @symbol ?getName\@BedBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -111,17 +116,22 @@ class BedBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@BedBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@BedBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/BedHelper.hpp b/LiteLoader/include/llapi/mc/BedHelper.hpp index 2c4b48c4c6..aaece20596 100644 --- a/LiteLoader/include/llapi/mc/BedHelper.hpp +++ b/LiteLoader/include/llapi/mc/BedHelper.hpp @@ -29,14 +29,6 @@ class BedHelper { #endif public: - /** - * @symbol ??0BedHelper\@\@QEAA\@HHHHMMMM\@Z - */ - MCAPI BedHelper(int, int, int, int, float, float, float, float); - /** - * @symbol ??0BedHelper\@\@QEAA\@HHHHMMMMMM\@Z - */ - MCAPI BedHelper(int, int, int, int, float, float, float, float, float, float); /** * @symbol ?getBedRotation\@BedHelper\@\@QEBAMH\@Z */ diff --git a/LiteLoader/include/llapi/mc/BedItem.hpp b/LiteLoader/include/llapi/mc/BedItem.hpp index 4318f67741..83488d4905 100644 --- a/LiteLoader/include/llapi/mc/BedItem.hpp +++ b/LiteLoader/include/llapi/mc/BedItem.hpp @@ -52,10 +52,10 @@ class BedItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -132,7 +132,7 @@ class BedItem : public Item { */ virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BedItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/Bedrock.hpp b/LiteLoader/include/llapi/mc/Bedrock.hpp index 3c4a769a8f..ff0c6ae0cc 100644 --- a/LiteLoader/include/llapi/mc/Bedrock.hpp +++ b/LiteLoader/include/llapi/mc/Bedrock.hpp @@ -9,7 +9,9 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here #include "llapi/mc/Json.hpp" +#include "llapi/mc/Enchant.hpp" #include +#include class CommandRegistry; enum class ActorDamageCause : int; @@ -25,6 +27,9 @@ class CommandIntegerRange; struct ActorDefinitionIdentifier; class CommandItem; class CommandBlockName; +class CommandWildcardInt; +enum class ObjectiveSortOrder : char; +enum class BlockSlot : int; #undef BEFORE_EXTRA @@ -60,8 +65,8 @@ class NonOwnerPointer { NonOwnerPointer(T0& a1) { mPtr = std::make_shared(a1); } - }; + struct StorageMigration { enum class StorageMigrationType; StorageMigration() = delete; @@ -69,8 +74,101 @@ struct StorageMigration { StorageMigration(StorageMigration const&&) = delete; }; +struct CallStack { + struct FrameWithContext{ + char filler[80]; + }; +private: + std::vector vector; +}; + +template +struct ErrorInfo { +public: + ErrorInfo() = default; + + E& getError() { + return error; + } + +private: + E error; + char filler[0x30]{}; +}; +static_assert(sizeof(ErrorInfo) == 0x40); + +template +class Result { +public: + explicit Result(T&& value) : mValue(std::move(value)), mHasValue(true) {} + + Result(Result&& other) noexcept { + mHasValue = other.mHasValue; + if (mHasValue) { + mValue = std::move(other.mValue); + } else { + mError = std::move(other.mError); + } + } + + [[nodiscard]] bool has_value() const { + return mHasValue; + } + + T& value() { + if (!mHasValue) { + std::rethrow_exception(std::make_exception_ptr(mError.getError())); + } + return mValue; + } + + Err& error() { + if (mHasValue) + throw std::logic_error("Bad error result access."); + return mError; + } + +private: + union{ + T mValue; + ErrorInfo mError; + }; + bool mHasValue; +}; + +template +class Result { +public: + explicit Result() : mHasValue(true) {} + + Result(Result&& other) noexcept { + mHasValue = other.mHasValue; + if (!mHasValue) { + mError = std::move(other.mError); + } + } + [[nodiscard]] bool has_value() const { + return mHasValue; + } + void value() { + if (!mHasValue) { + std::rethrow_exception(std::make_exception_ptr(mError.getError())); + } + // No value to return as T is void + } + + Err& error() { + if (mHasValue) + throw std::logic_error("Bad error result access."); + return mError; + } + +private: + ErrorInfo mError; + bool mHasValue; +}; namespace PubSub { class Subscription { @@ -148,12 +246,12 @@ class typeid_t { public: unsigned short value; - inline static std::atomic& _getCounter(){ - std::atomic& id = *(std::atomic*)dlsym_real( + inline static std::atomic& _getCounter() { + std::atomic& id = *(std::atomic*)dlsym_real( "?storage@?1??_getCounter@?$typeid_t@VCommandRegistry@@@Bedrock@@CAAEAU?$atomic@G@std@@XZ@4U45@A"); return id; } - + typeid_t(typeid_t const& id) : value(id.value){}; typeid_t(unsigned short value) : value(value){}; }; @@ -162,9 +260,9 @@ template <> MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id>(); -template<> +template <> MCAPI typeid_t type_id(); -template<> +template <> MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); @@ -174,20 +272,20 @@ template <> MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); -//template <> -//MCAPI typeid_t type_id>(); +// template <> +// MCAPI typeid_t type_id>(); template <> MCAPI typeid_t type_id>(); -template <> -MCAPI typeid_t type_id(); +// template <> +// MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); -template <> -MCAPI typeid_t type_id(); +// template <> +// MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); template <> @@ -198,27 +296,49 @@ template <> MCAPI typeid_t type_id>(); template <> MCAPI typeid_t type_id>(); -template<> +template <> MCAPI typeid_t type_id(); +// template <> +// MCAPI typeid_t type_id(); template <> -MCAPI typeid_t type_id(); -template<> MCAPI typeid_t type_id(); template <> MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); +template <> +MCAPI typeid_t type_id(); + +template <> +inline typeid_t type_id() { + auto id = (unsigned short*)dlsym_real( + "?id@?1???$type_id@VCommandRegistry@@W4Mirror@@@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@1@XZ@4V21@A"); + return typeid_t(*id); +} + +template <> +inline typeid_t type_id() { + auto id = (unsigned short*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@VCommandIntegerRange@@@Bedrock@@YA?AV?$" + "typeid_t@VCommandRegistry@@@1@XZ@4V21@A"); + return typeid_t(*id); +} + +template <> +inline typeid_t type_id() { + auto id = (unsigned short*)dlsym_real("?id@?1???$type_id@VCommandRegistry@@W4EquipmentSlot@@@Bedrock@@YA?AV?$" + "typeid_t@VCommandRegistry@@@1@XZ@4V21@A"); + return typeid_t(*id); +} + +template <> +inline typeid_t type_id() { + auto id = (unsigned short*)dlsym_real( + "?id@?1???$type_id@VCommandRegistry@@W4Type@Enchant@@@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@1@XZ@4V21@A"); + return typeid_t(*id); +} -//template <> -//inline typeid_t type_id() { -// static typeid_t id = -// *(typeid_t*)dlsym_real("??$type_id@VCommandRegistry@@PEBUActorDefinitionIdentifier@@@Bedrock@@YA?AV?$typeid_t@VCommandRegistry@@@0@XZ"); -//// static typeid_t id = ([]() -> typeid_t { -//// CommandParameterData data = -//// SymCall("??$mandatory@VRideCommand@@PEBUActorDefinitionIdentifier@@@commands@@YA?AVCommandParameterData@@PEQRideCommand@@PEBUActorDefinitionIdentifier@@PEBDPEQ2@_N@Z", -//// CommandParameterData, void*, char const*, uintptr_t)(nullptr, "entityType", 0); -//// return data.tid; -//// })(); -// return id; -//}; #undef AFTER_EXTRA diff --git a/LiteLoader/include/llapi/mc/BedrockBlock.hpp b/LiteLoader/include/llapi/mc/BedrockBlock.hpp index 4279353e4d..dc669c41ec 100644 --- a/LiteLoader/include/llapi/mc/BedrockBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlock.hpp @@ -36,20 +36,10 @@ class BedrockBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BedrockBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BedrockBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BedrockBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BedrockBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,46 +115,56 @@ class BedrockBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 - * @symbol ?canBeOriginalSurface\@BedrockBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_51 */ - virtual bool canBeOriginalSurface() const; + virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 54 + * @symbol ?canBeOriginalSurface\@BedrockBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool canBeOriginalSurface() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,62 +176,67 @@ class BedrockBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@BedrockBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@BedrockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/Bee.hpp b/LiteLoader/include/llapi/mc/Bee.hpp index 4eceb0df1c..bd7519dbe1 100644 --- a/LiteLoader/include/llapi/mc/Bee.hpp +++ b/LiteLoader/include/llapi/mc/Bee.hpp @@ -42,125 +42,125 @@ class Bee : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Bee\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEE /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/BeehiveBlock.hpp b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp index dc3f825a37..301ec14cae 100644 --- a/LiteLoader/include/llapi/mc/BeehiveBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp @@ -41,20 +41,10 @@ class BeehiveBlock : public ActorBlock { */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class BeehiveBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class BeehiveBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class BeehiveBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class BeehiveBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,50 +121,60 @@ class BeehiveBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@BeehiveBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 117 + * @vftbl 118 * @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 &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -192,81 +187,86 @@ class BeehiveBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@BeehiveBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BeehiveBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@BeehiveBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@BeehiveBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@BeehiveBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BeehiveBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp index d94d2fb444..fe8fc73484 100644 --- a/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp @@ -66,6 +66,11 @@ struct Occupant { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -92,10 +97,15 @@ struct Occupant { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ?disableBeeSpawn\@BeehiveBlockActor\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BeetrootBlock.hpp b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp index 8efba93238..636798bd90 100644 --- a/LiteLoader/include/llapi/mc/BeetrootBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp @@ -36,25 +36,15 @@ class BeetrootBlock : public CropBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BeetrootBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class BeetrootBlock : public CropBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class BeetrootBlock : public CropBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class BeetrootBlock : public CropBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class BeetrootBlock : public CropBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,40 +121,50 @@ class BeetrootBlock : public CropBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,72 +176,77 @@ class BeetrootBlock : public CropBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BeetrootBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getBaseSeed\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getBaseCrop\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?getCropNum\@BeetrootBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/BehaviorComponent.hpp b/LiteLoader/include/llapi/mc/BehaviorComponent.hpp index b9780292ca..8714280c8d 100644 --- a/LiteLoader/include/llapi/mc/BehaviorComponent.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorComponent.hpp @@ -28,14 +28,14 @@ class BehaviorComponent { #endif public: - /** - * @symbol ??0BehaviorComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI BehaviorComponent(class BehaviorComponent &&); /** * @symbol ??0BehaviorComponent\@\@QEAA\@XZ */ MCAPI BehaviorComponent(); + /** + * @symbol ??0BehaviorComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI BehaviorComponent(class BehaviorComponent &&); /** * @symbol ??4BehaviorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp index 878904c773..4c9d1aeeb2 100644 --- a/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp @@ -23,7 +23,7 @@ class BehaviorTreeDefinitionPtr { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BEHAVIORTREEDEFINITIONPTR public: - BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr const &) = delete; + class BehaviorTreeDefinitionPtr& operator=(class BehaviorTreeDefinitionPtr const &) = delete; #endif public: @@ -31,6 +31,14 @@ class BehaviorTreeDefinitionPtr { * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr &&); + /** + * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEAVAutomationBehaviorTreeGroup\@\@AEAVBehaviorTreeDefinition\@\@\@Z + */ + MCAPI BehaviorTreeDefinitionPtr(class AutomationBehaviorTreeGroup &, class BehaviorTreeDefinition &); + /** + * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr const &); /** * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@XZ */ @@ -39,10 +47,6 @@ class BehaviorTreeDefinitionPtr { * @symbol ??4BehaviorTreeDefinitionPtr\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BehaviorTreeDefinitionPtr & operator=(class BehaviorTreeDefinitionPtr &&); - /** - * @symbol ??4BehaviorTreeDefinitionPtr\@\@QEAAAEAV0\@AEBV0\@\@Z - */ - MCAPI class BehaviorTreeDefinitionPtr & operator=(class BehaviorTreeDefinitionPtr const &); /** * @symbol ??1BehaviorTreeDefinitionPtr\@\@QEAA\@XZ */ @@ -52,12 +56,4 @@ class BehaviorTreeDefinitionPtr { */ MCAPI static class BehaviorTreeDefinitionPtr const NONE; -//protected: - /** - * @symbol ?_move\@BehaviorTreeDefinitionPtr\@\@IEAAAEAV1\@$$QEAV1\@\@Z - */ - MCAPI class BehaviorTreeDefinitionPtr & _move(class BehaviorTreeDefinitionPtr &&); - -protected: - }; diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp deleted file mode 100644 index 46ac2b6acb..0000000000 --- a/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp +++ /dev/null @@ -1,53 +0,0 @@ -/** - * @file BehaviorTreeGroup.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BehaviorTreeGroup. - * - */ -class BehaviorTreeGroup { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BEHAVIORTREEGROUP -public: - class BehaviorTreeGroup& operator=(class BehaviorTreeGroup const &) = delete; - BehaviorTreeGroup(class BehaviorTreeGroup const &) = delete; - BehaviorTreeGroup() = delete; -#endif - -public: - /** - * @symbol ??0BehaviorTreeGroup\@\@QEAA\@AEAVResourcePackManager\@\@AEAVBehaviorFactory\@\@\@Z - */ - MCAPI BehaviorTreeGroup(class ResourcePackManager &, class BehaviorFactory &); - /** - * @symbol ?tryGetDefinition\@BehaviorTreeGroup\@\@QEAA?AVBehaviorTreeDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI class BehaviorTreeDefinitionPtr tryGetDefinition(std::string const &); - /** - * @symbol ??1BehaviorTreeGroup\@\@QEAA\@XZ - */ - MCAPI ~BehaviorTreeGroup(); - -//private: - /** - * @symbol ?_removeRef\@BehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z - */ - MCAPI void _removeRef(class BehaviorTreeDefinitionPtr &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/BellBlock.hpp b/LiteLoader/include/llapi/mc/BellBlock.hpp index e89de484d3..a7e21db03d 100644 --- a/LiteLoader/include/llapi/mc/BellBlock.hpp +++ b/LiteLoader/include/llapi/mc/BellBlock.hpp @@ -36,35 +36,30 @@ class BellBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 15 + * @vftbl 12 + * @symbol ?getVisualShape\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + */ + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; + /** + * @vftbl 18 * @symbol ?onProjectileHit\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@BellBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +71,10 @@ class BellBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +85,6 @@ class BellBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class BellBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class BellBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,75 +136,80 @@ class BellBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@BellBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@BellBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 75 + * @vftbl 78 * @symbol ?movedByPiston\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@BellBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 112 - * @symbol ?entityInside\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,85 +221,90 @@ class BellBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@BellBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BellBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@BellBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 188 + * @symbol ?entityInside\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BELLBLOCK /** * @symbol ?isInteractiveBlock\@BellBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BellBlockActor.hpp b/LiteLoader/include/llapi/mc/BellBlockActor.hpp index 99db7aa3e9..95235a6041 100644 --- a/LiteLoader/include/llapi/mc/BellBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockActor.hpp @@ -61,6 +61,11 @@ class BellBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -87,17 +92,22 @@ class BellBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@BellBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@BellBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/BellBlockItem.hpp b/LiteLoader/include/llapi/mc/BellBlockItem.hpp index 681e1877bb..ac77d449b5 100644 --- a/LiteLoader/include/llapi/mc/BellBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockItem.hpp @@ -6,7 +6,6 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "Potion.hpp" #include "BlockItem.hpp" #define BEFORE_EXTRA @@ -53,10 +52,10 @@ class BellBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -113,535 +112,10 @@ class BellBlockItem : public BlockItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BellBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; - /** - * @vftbl 135 - * @symbol __unk_vfn_135 - */ - virtual void __unk_vfn_135(); - /** - * @vftbl 136 - * @symbol __unk_vfn_136 - */ - virtual void __unk_vfn_136(); - /** - * @vftbl 137 - * @symbol __unk_vfn_137 - */ - virtual void __unk_vfn_137(); - /** - * @vftbl 138 - * @symbol __unk_vfn_138 - */ - virtual void __unk_vfn_138(); - /** - * @vftbl 139 - * @symbol __unk_vfn_139 - */ - virtual void __unk_vfn_139(); - /** - * @vftbl 140 - * @symbol __unk_vfn_140 - */ - virtual void __unk_vfn_140(); - /** - * @vftbl 141 - * @symbol __unk_vfn_141 - */ - virtual void __unk_vfn_141(); - /** - * @vftbl 142 - * @symbol __unk_vfn_142 - */ - virtual void __unk_vfn_142(); - /** - * @vftbl 143 - * @symbol __unk_vfn_143 - */ - virtual void __unk_vfn_143(); - /** - * @vftbl 144 - * @symbol __unk_vfn_144 - */ - virtual void __unk_vfn_144(); - /** - * @vftbl 145 - * @symbol __unk_vfn_145 - */ - virtual void __unk_vfn_145(); - /** - * @vftbl 146 - * @symbol __unk_vfn_146 - */ - virtual void __unk_vfn_146(); - /** - * @vftbl 147 - * @symbol __unk_vfn_147 - */ - virtual void __unk_vfn_147(); - /** - * @vftbl 148 - * @symbol __unk_vfn_148 - */ - virtual void __unk_vfn_148(); - /** - * @vftbl 149 - * @symbol __unk_vfn_149 - */ - virtual void __unk_vfn_149(); - /** - * @vftbl 150 - * @symbol __unk_vfn_150 - */ - virtual void __unk_vfn_150(); - /** - * @vftbl 151 - * @symbol __unk_vfn_151 - */ - virtual void __unk_vfn_151(); - /** - * @vftbl 152 - * @symbol __unk_vfn_152 - */ - virtual void __unk_vfn_152(); - /** - * @vftbl 153 - * @symbol __unk_vfn_153 - */ - virtual void __unk_vfn_153(); - /** - * @vftbl 154 - * @symbol __unk_vfn_154 - */ - virtual void __unk_vfn_154(); - /** - * @vftbl 155 - * @symbol __unk_vfn_155 - */ - virtual void __unk_vfn_155(); - /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 157 - * @symbol __unk_vfn_157 - */ - virtual void __unk_vfn_157(); - /** - * @vftbl 158 - * @symbol __unk_vfn_158 - */ - virtual void __unk_vfn_158(); - /** - * @vftbl 159 - * @symbol __unk_vfn_159 - */ - virtual void __unk_vfn_159(); - /** - * @vftbl 160 - * @symbol __unk_vfn_160 - */ - virtual void __unk_vfn_160(); - /** - * @vftbl 161 - * @symbol __unk_vfn_161 - */ - virtual void __unk_vfn_161(); - /** - * @vftbl 162 - * @symbol __unk_vfn_162 - */ - virtual void __unk_vfn_162(); - /** - * @vftbl 163 - * @symbol __unk_vfn_163 - */ - virtual void __unk_vfn_163(); - /** - * @vftbl 164 - * @symbol __unk_vfn_164 - */ - virtual void __unk_vfn_164(); - /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 - */ - virtual void __unk_vfn_166(); - /** - * @vftbl 167 - * @symbol __unk_vfn_167 - */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @symbol __unk_vfn_168 - */ - virtual void __unk_vfn_168(); - /** - * @vftbl 169 - * @symbol __unk_vfn_169 - */ - virtual void __unk_vfn_169(); - /** - * @vftbl 170 - * @symbol __unk_vfn_170 - */ - virtual void __unk_vfn_170(); - /** - * @vftbl 171 - * @symbol __unk_vfn_171 - */ - virtual void __unk_vfn_171(); - /** - * @vftbl 172 - * @symbol __unk_vfn_172 - */ - virtual void __unk_vfn_172(); - /** - * @vftbl 173 - * @symbol __unk_vfn_173 - */ - virtual void __unk_vfn_173(); - /** - * @vftbl 174 - * @symbol __unk_vfn_174 - */ - virtual void __unk_vfn_174(); - /** - * @vftbl 175 - * @symbol __unk_vfn_175 - */ - virtual void __unk_vfn_175(); - /** - * @vftbl 176 - * @symbol __unk_vfn_176 - */ - virtual void __unk_vfn_176(); - /** - * @vftbl 177 - * @symbol __unk_vfn_177 - */ - virtual void __unk_vfn_177(); - /** - * @vftbl 178 - * @symbol __unk_vfn_178 - */ - virtual void __unk_vfn_178(); - /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 180 - * @symbol __unk_vfn_180 - */ - virtual void __unk_vfn_180(); - /** - * @vftbl 181 - * @symbol __unk_vfn_181 - */ - virtual void __unk_vfn_181(); - /** - * @vftbl 182 - * @symbol __unk_vfn_182 - */ - virtual void __unk_vfn_182(); - /** - * @vftbl 183 - * @symbol __unk_vfn_183 - */ - virtual void __unk_vfn_183(); - /** - * @vftbl 184 - * @symbol __unk_vfn_184 - */ - virtual void __unk_vfn_184(); - /** - * @vftbl 185 - * @symbol __unk_vfn_185 - */ - virtual void __unk_vfn_185(); - /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 187 - * @symbol __unk_vfn_187 - */ - virtual void __unk_vfn_187(); - /** - * @vftbl 188 - * @symbol __unk_vfn_188 - */ - virtual void __unk_vfn_188(); - /** - * @vftbl 189 - * @symbol __unk_vfn_189 - */ - virtual void __unk_vfn_189(); - /** - * @vftbl 190 - * @symbol __unk_vfn_190 - */ - virtual void __unk_vfn_190(); - /** - * @vftbl 191 - * @symbol __unk_vfn_191 - */ - virtual void __unk_vfn_191(); - /** - * @vftbl 192 - * @symbol __unk_vfn_192 - */ - virtual void __unk_vfn_192(); - /** - * @vftbl 193 - * @symbol __unk_vfn_193 - */ - virtual void __unk_vfn_193(); - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); - /** - * @vftbl 200 - * @symbol __unk_vfn_200 - */ - virtual void __unk_vfn_200(); - /** - * @vftbl 201 - * @symbol __unk_vfn_201 - */ - virtual void __unk_vfn_201(); - /** - * @vftbl 202 - * @symbol __unk_vfn_202 - */ - virtual void __unk_vfn_202(); - /** - * @vftbl 203 - * @symbol __unk_vfn_203 - */ - virtual void __unk_vfn_203(); - /** - * @vftbl 204 - * @symbol __unk_vfn_204 - */ - virtual void __unk_vfn_204(); - /** - * @vftbl 205 - * @symbol __unk_vfn_205 - */ - virtual void __unk_vfn_205(); - /** - * @vftbl 206 - * @symbol __unk_vfn_206 - */ - virtual void __unk_vfn_206(); - /** - * @vftbl 207 - * @symbol __unk_vfn_207 - */ - virtual void __unk_vfn_207(); - /** - * @vftbl 208 - * @symbol __unk_vfn_208 - */ - virtual void __unk_vfn_208(); - /** - * @vftbl 209 - * @symbol __unk_vfn_209 - */ - virtual void __unk_vfn_209(); - /** - * @vftbl 210 - * @symbol __unk_vfn_210 - */ - virtual void __unk_vfn_210(); - /** - * @vftbl 211 - * @symbol __unk_vfn_211 - */ - virtual void __unk_vfn_211(); - /** - * @vftbl 212 - * @symbol __unk_vfn_212 - */ - virtual void __unk_vfn_212(); - /** - * @vftbl 213 - * @symbol __unk_vfn_213 - */ - virtual void __unk_vfn_213(); - /** - * @vftbl 214 - * @symbol __unk_vfn_214 - */ - virtual void __unk_vfn_214(); - /** - * @vftbl 215 - * @symbol __unk_vfn_215 - */ - virtual void __unk_vfn_215(); - /** - * @vftbl 216 - * @symbol __unk_vfn_216 - */ - virtual void __unk_vfn_216(); - /** - * @vftbl 217 - * @symbol __unk_vfn_217 - */ - virtual void __unk_vfn_217(); - /** - * @vftbl 218 - * @symbol __unk_vfn_218 - */ - virtual void __unk_vfn_218(); - /** - * @vftbl 219 - * @symbol __unk_vfn_219 - */ - virtual void __unk_vfn_219(); - /** - * @vftbl 220 - * @symbol __unk_vfn_220 - */ - virtual void __unk_vfn_220(); - /** - * @vftbl 221 - * @symbol __unk_vfn_221 - */ - virtual void __unk_vfn_221(); - /** - * @vftbl 222 - * @symbol __unk_vfn_222 - */ - virtual void __unk_vfn_222(); - /** - * @vftbl 223 - * @symbol __unk_vfn_223 - */ - virtual void __unk_vfn_223(); - /** - * @vftbl 224 - * @symbol __unk_vfn_224 - */ - virtual void __unk_vfn_224(); - /** - * @vftbl 225 - * @symbol __unk_vfn_225 - */ - virtual void __unk_vfn_225(); - /** - * @vftbl 226 - * @symbol __unk_vfn_226 - */ - virtual void __unk_vfn_226(); - /** - * @vftbl 227 - * @symbol __unk_vfn_227 - */ - virtual void __unk_vfn_227(); - /** - * @vftbl 228 - * @symbol __unk_vfn_228 - */ - virtual void __unk_vfn_228(); - /** - * @vftbl 229 - * @symbol __unk_vfn_229 - */ - virtual void __unk_vfn_229(); - /** - * @vftbl 230 - * @symbol __unk_vfn_230 - */ - virtual void __unk_vfn_230(); - /** - * @vftbl 231 - * @symbol __unk_vfn_231 - */ - virtual void __unk_vfn_231(); - /** - * @vftbl 232 - * @symbol __unk_vfn_232 - */ - virtual void __unk_vfn_232(); - /** - * @vftbl 233 - * @symbol ?getPotionType\@SplashPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ - */ - virtual enum class Potion::PotionType getPotionType() const; - /** - * @vftbl 234 - * @symbol __unk_vfn_234 - */ - virtual void __unk_vfn_234(); - /** - * @vftbl 235 - * @symbol __unk_vfn_235 - */ - virtual void __unk_vfn_235(); - /** - * @vftbl 236 - * @symbol __unk_vfn_236 - */ - virtual void __unk_vfn_236(); - /** - * @vftbl 237 - * @symbol __unk_vfn_237 - */ - virtual void __unk_vfn_237(); - /** - * @vftbl 238 - * @symbol __unk_vfn_238 - */ - virtual void __unk_vfn_238(); - /** - * @vftbl 239 - * @symbol ?getVariant\@ComponentItem\@\@UEBAHHH_N\@Z - */ - virtual int getVariant(int, int, bool) const; /** * @symbol ??0BellBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp index d6f02e8acd..1da5ec6449 100644 --- a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp @@ -36,35 +36,30 @@ class BigDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@BigDripleafBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 15 - * @symbol ?onProjectileHit\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z - */ - virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; - /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 18 + * @symbol ?onProjectileHit\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -75,16 +70,11 @@ class BigDripleafBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@BigDripleafBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -97,9 +87,9 @@ class BigDripleafBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@BigDripleafBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -120,6 +110,11 @@ class BigDripleafBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -130,11 +125,6 @@ class BigDripleafBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -151,90 +141,95 @@ class BigDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@BigDripleafBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@BigDripleafBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@BigDripleafBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 112 - * @symbol ?entityInside\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -246,80 +241,85 @@ class BigDripleafBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@BigDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIGDRIPLEAFBLOCK /** * @symbol ?canBeSilkTouched\@BigDripleafBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BinaryStream.hpp b/LiteLoader/include/llapi/mc/BinaryStream.hpp index 5e69e8d095..fe7f3cd9a9 100644 --- a/LiteLoader/include/llapi/mc/BinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/BinaryStream.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ReadOnlyBinaryStream.hpp" #define BEFORE_EXTRA @@ -78,14 +79,14 @@ class BinaryStream : public ReadOnlyBinaryStream { */ MCVAPI ~BinaryStream(); #endif - /** - * @symbol ??0BinaryStream\@\@QEAA\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCAPI BinaryStream(std::string &, bool); /** * @symbol ??0BinaryStream\@\@QEAA\@XZ */ MCAPI BinaryStream(); + /** + * @symbol ??0BinaryStream\@\@QEAA\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCAPI BinaryStream(std::string &, bool); /** * @symbol ?getAndReleaseData\@BinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp b/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp index ab2d73c058..52c7f1d491 100644 --- a/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp @@ -26,14 +26,14 @@ struct BiomeDecorationFeature { #endif public: - /** - * @symbol ??0BiomeDecorationFeature\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI BiomeDecorationFeature(struct BiomeDecorationFeature const &); /** * @symbol ??0BiomeDecorationFeature\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI BiomeDecorationFeature(struct BiomeDecorationFeature &&); + /** + * @symbol ??0BiomeDecorationFeature\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI BiomeDecorationFeature(struct BiomeDecorationFeature const &); /** * @symbol ??1BiomeDecorationFeature\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp index 91a1f97320..c546f0fa7b 100644 --- a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp @@ -5,10 +5,12 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "CompoundTag.hpp" #undef BEFORE_EXTRA @@ -20,6 +22,7 @@ class BiomeDefinitionListPacket : public Packet { #define AFTER_EXTRA // Add Member There +CompoundTag mBiomeData; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BIOMEDEFINITIONLISTPACKET @@ -51,14 +54,14 @@ class BiomeDefinitionListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?read\@BiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@BiomeDefinitionListPacket\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@BiomeDefinitionListPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BiomeDefinitionListPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIOMEDEFINITIONLISTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/BiomeManager.hpp b/LiteLoader/include/llapi/mc/BiomeManager.hpp new file mode 100644 index 0000000000..f50503f744 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BiomeManager.hpp @@ -0,0 +1,69 @@ +/** + * @file BiomeManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BiomeComponentFactory.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BiomeManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BIOMEMANAGER +public: + class BiomeManager& operator=(class BiomeManager const &) = delete; + BiomeManager(class BiomeManager const &) = delete; + BiomeManager() = delete; +#endif + +public: + /** + * @symbol ??0BiomeManager\@\@QEAA\@V?$unique_ptr\@VBiomeRegistry\@\@U?$default_delete\@VBiomeRegistry\@\@\@std\@\@\@std\@\@W4FactoryScope\@BiomeComponentFactory\@\@_NV?$unique_ptr\@VAutomaticFeatureRules\@\@U?$default_delete\@VAutomaticFeatureRules\@\@\@std\@\@\@2\@\@Z + */ + MCAPI BiomeManager(std::unique_ptr, enum class BiomeComponentFactory::FactoryScope, bool, std::unique_ptr); + /** + * @symbol ?getBiomeComponentFactory\@BiomeManager\@\@QEAAAEAVBiomeComponentFactory\@\@XZ + */ + MCAPI class BiomeComponentFactory & getBiomeComponentFactory(); + /** + * @symbol ?getBiomeRegistry\@BiomeManager\@\@QEAAAEAVBiomeRegistry\@\@XZ + */ + MCAPI class BiomeRegistry & getBiomeRegistry(); + /** + * @symbol ?getSurfaceBuilderRegistry\@BiomeManager\@\@QEAAAEAVSurfaceBuilderRegistry\@\@XZ + */ + MCAPI class SurfaceBuilderRegistry & getSurfaceBuilderRegistry(); + /** + * @symbol ?initializeBiomeRegistryAndAutomaticFeatureRulesOnServer\@BiomeManager\@\@QEAAXAEBVExperiments\@\@AEAVIWorldRegistriesProvider\@\@AEAVResourcePackManager\@\@VLevelSeed64\@\@\@Z + */ + MCAPI void initializeBiomeRegistryAndAutomaticFeatureRulesOnServer(class Experiments const &, class IWorldRegistriesProvider &, class ResourcePackManager &, class LevelSeed64); + /** + * @symbol ?initializeWithLevelStorageManager\@BiomeManager\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void initializeWithLevelStorageManager(class LevelStorageManager &); + /** + * @symbol ?loadBiomeData\@BiomeManager\@\@QEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void loadBiomeData(class LevelStorage &); + /** + * @symbol ?sendLevelBiomesRegistered\@BiomeManager\@\@QEAAXXZ + */ + MCAPI void sendLevelBiomesRegistered(); + /** + * @symbol ??1BiomeManager\@\@QEAA\@XZ + */ + MCAPI ~BiomeManager(); + /** + * @symbol ?use3DBiomeMaps\@BiomeManager\@\@SA_NAEBVBaseGameVersion\@\@\@Z + */ + MCAPI static bool use3DBiomeMaps(class BaseGameVersion const &); + +}; diff --git a/LiteLoader/include/llapi/mc/BiomeRegistry.hpp b/LiteLoader/include/llapi/mc/BiomeRegistry.hpp index 81d871de9a..234559a0c8 100644 --- a/LiteLoader/include/llapi/mc/BiomeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BiomeRegistry.hpp @@ -69,6 +69,10 @@ struct BiomeParent { * @symbol ?initServerFromPacks\@BiomeRegistry\@\@QEAAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@\@Z */ MCAPI void initServerFromPacks(class ResourcePackManager &, class IWorldRegistriesProvider &); + /** + * @symbol ?initializeWithLevelStorageManager\@BiomeRegistry\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void initializeWithLevelStorageManager(class LevelStorageManager &); /** * @symbol ?isRegistrationFinished\@BiomeRegistry\@\@QEBA_NXZ */ @@ -115,6 +119,10 @@ struct BiomeParent { * @symbol ?_mergeDataInheritance\@BiomeRegistry\@\@AEAAXAEAVValue\@Json\@\@AEAVSemVersion\@\@AEAV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEBUBiomeParent\@1\@\@Z */ MCAPI void _mergeDataInheritance(class Json::Value &, class SemVersion &, class InheritanceTree &, struct BiomeRegistry::BiomeParent const &); + /** + * @symbol ?_save\@BiomeRegistry\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _save(class LevelStorage &); private: diff --git a/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp b/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp index baab213d42..c6d85a3f1e 100644 --- a/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp +++ b/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp @@ -25,6 +25,10 @@ namespace BiomeSourceUtil { * @symbol ?determineDestinationHeight\@BiomeSourceUtil\@\@YAFAEBVDimension\@\@VBlockPos\@\@\@Z */ MCAPI short determineDestinationHeight(class Dimension const &, class BlockPos); + /** + * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBlockPos\@\@VBoundingBox\@\@I\@Z + */ + MCAPI class std::optional locateBiome(class std::function const &, class BiomeSource const &, class BlockPos const &, class BoundingBox, unsigned int); /** * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBoundingBox\@\@I\@Z */ @@ -33,9 +37,5 @@ namespace BiomeSourceUtil { * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBlockPos\@\@2I\@Z */ MCAPI class std::optional locateBiome(class std::function const &, class BiomeSource const &, class BlockPos const &, class BlockPos const &, unsigned int); - /** - * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBlockPos\@\@VBoundingBox\@\@I\@Z - */ - MCAPI class std::optional locateBiome(class std::function const &, class BiomeSource const &, class BlockPos const &, class BoundingBox, unsigned int); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp index f1a1dadc4a..944c8878b2 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp @@ -36,20 +36,10 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BlastFurnaceBlock : public FurnaceBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BlastFurnaceBlock : public FurnaceBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BlastFurnaceBlock : public FurnaceBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,67 +176,72 @@ class BlastFurnaceBlock : public FurnaceBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 176 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?use\@BlastFurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/Blaze.hpp b/LiteLoader/include/llapi/mc/Blaze.hpp index c3adf6c4c5..3ca35ba8db 100644 --- a/LiteLoader/include/llapi/mc/Blaze.hpp +++ b/LiteLoader/include/llapi/mc/Blaze.hpp @@ -42,147 +42,142 @@ class Blaze : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Blaze\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 85 + * @vftbl 76 * @symbol ?getBrightness\@Blaze\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 102 + * @vftbl 91 * @symbol ?isOnFire\@Blaze\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_93(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_95(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_96(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_98(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_164(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_178(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_202(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_203(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_219(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_222(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_239(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_247(); /** - * @vftbl 278 - * @symbol ?travel\@Blaze\@\@UEAAXMMM_N\@Z + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void travel(float, float, float, bool); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Blaze\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@Blaze\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp b/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp index 772c33eb14..e149142205 100644 --- a/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp @@ -34,10 +34,6 @@ class BlazePreTravelSystem { * @symbol ?_doBlazePreTravelSystem\@BlazePreTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doBlazePreTravelSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - /** - * @symbol ?_tickBlazePreTravelSystem\@BlazePreTravelSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UBlazeFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickBlazePreTravelSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/Block.hpp b/LiteLoader/include/llapi/mc/Block.hpp index 7072929a09..0f3f00afc2 100644 --- a/LiteLoader/include/llapi/mc/Block.hpp +++ b/LiteLoader/include/llapi/mc/Block.hpp @@ -25,28 +25,23 @@ class Block { LIAPI static Block* create(const std::string& str, unsigned short tileData); LIAPI static Block* create(CompoundTag* nbt); - [[deprecated("Use MCAPI getName() instead.")]] LIAPI std::string getTypeName() const; LIAPI int getId() const; - inline unsigned short getTileData(){ + inline unsigned short getTileData() const { return static_cast(getVariant()); } /** * @brief Obtain a copy of the NBT associated with this block. To obtain a reference to the original instance, use block->getSerializationId(). */ - LIAPI std::unique_ptr getNbt(); + LIAPI std::unique_ptr getNbt() const; + [[deprecated("DO NOT USE THIS")]] LIAPI bool setNbt(CompoundTag* nbt); inline unsigned short getData() const { return dAccess(this); } - [[deprecated("Use MCAPI getLegacyBlock() instead.")]] - inline class BlockLegacy const* getLegacyBlockPtr() const { - return reinterpret_cast(&this->getLegacyBlock()); - } - inline bool operator==(class Block const& block) const { class BlockLegacy const* p1 = &this->getLegacyBlock(); class BlockLegacy const* p2 = &block.getLegacyBlock(); @@ -141,14 +136,14 @@ class Block { * @symbol ?canBeBrokenFromFalling\@Block\@\@QEBA_NXZ */ MCAPI bool canBeBrokenFromFalling() const; - /** - * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; + /** + * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** * @symbol ?canBeFertilized\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@\@Z */ @@ -213,14 +208,14 @@ class Block { * @symbol ?checkIsPathable\@Block\@\@QEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ MCAPI bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; - /** - * @symbol ?clip\@Block\@\@QEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_NAEBVAABB\@\@\@Z - */ - MCAPI class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool, class AABB const &) const; /** * @symbol ?clip\@Block\@\@QEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ MCAPI class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + /** + * @symbol ?clip\@Block\@\@QEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_NAEBVAABB\@\@\@Z + */ + MCAPI class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool, class AABB const &) const; /** * @symbol ?computeRawSerializationIdHashForNetwork\@Block\@\@QEBAIXZ */ @@ -237,10 +232,6 @@ class Block { * @symbol ?destroy\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI void destroy(class BlockSource &, class BlockPos const &, class Actor *) const; - /** - * @symbol ?entityInside\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - MCAPI void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** * @symbol ?executeEvent\@Block\@\@QEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ @@ -273,14 +264,14 @@ class Block { * @symbol ?getCollisionShape\@Block\@\@QEBA_NAEAVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ MCAPI bool getCollisionShape(class AABB &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; - /** - * @symbol ?getColor\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI int getColor(class BlockSource &, class BlockPos const &) const; /** * @symbol ?getColor\@Block\@\@QEBAHXZ */ MCAPI int getColor() const; + /** + * @symbol ?getColor\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI int getColor(class BlockSource &, class BlockPos const &) const; /** * @symbol ?getComparatorSignal\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ @@ -289,10 +280,6 @@ class Block { * @symbol ?getConnectedDirections\@Block\@\@QEBA?AUHorizontalDirectionBits\@BlockLegacy\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI struct BlockLegacy::HorizontalDirectionBits getConnectedDirections(class BlockPos const &, class BlockSource &) const; - /** - * @symbol ?getCreativeCategory\@Block\@\@QEBA?AW4CreativeItemCategory\@\@XZ - */ - MCAPI enum class CreativeItemCategory getCreativeCategory() const; /** * @symbol ?getDebugText\@Block\@\@QEBAXAEAV?$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\@\@AEBVBlockPos\@\@\@Z */ @@ -390,13 +377,13 @@ class Block { */ MCAPI int getVariant() const; /** - * @symbol ?getVisualShape\@Block\@\@QEBAAEBVAABB\@\@AEAV2\@_N\@Z + * @symbol ?getVisualShape\@Block\@\@QEBAAEBVAABB\@\@AEAV2\@\@Z */ - MCAPI class AABB const & getVisualShape(class AABB &, bool) const; + MCAPI class AABB const & getVisualShape(class AABB &) const; /** - * @symbol ?getVisualShapeInWorld\@Block\@\@QEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @symbol ?getVisualShapeInWorld\@Block\@\@QEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - MCAPI class AABB const & getVisualShapeInWorld(class BlockSource &, class BlockPos const &, class AABB &, bool) const; + MCAPI class AABB const & getVisualShapeInWorld(class BlockSource &, class BlockPos const &, class AABB &) const; /** * @symbol ?hasBlockEntity\@Block\@\@QEBA_NXZ */ @@ -577,22 +564,22 @@ class Block { * @symbol ?mayConsumeFertilizer\@Block\@\@QEBA_NAEAVBlockSource\@\@\@Z */ MCAPI bool mayConsumeFertilizer(class BlockSource &) const; - /** - * @symbol ?mayPick\@Block\@\@QEBA_NAEBVBlockSource\@\@_N\@Z - */ - MCAPI bool mayPick(class BlockSource const &, bool) const; /** * @symbol ?mayPick\@Block\@\@QEBA_NXZ */ MCAPI bool mayPick() const; /** - * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?mayPick\@Block\@\@QEBA_NAEBVBlockSource\@\@_N\@Z */ - MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; + MCAPI bool mayPick(class BlockSource const &, bool) const; /** * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const; + /** + * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + */ + MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** * @symbol ?mayPlaceOn\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ @@ -790,9 +777,9 @@ class Block { */ MCAPI enum class BlockOcclusionType _getBlockOcclusionType() const; /** - * @symbol ?_getLight\@Block\@\@AEBA?AUBrightness\@\@XZ + * @symbol ?_isSolid\@Block\@\@AEBA_NXZ */ - MCAPI struct Brightness _getLight() const; + MCAPI bool _isSolid() const; /** * @symbol ?_lockRegistryForRead\@Block\@\@AEBA?AVBlockTypeRegistryReadLock\@\@XZ */ @@ -805,6 +792,10 @@ class Block { * @symbol ?_tryInitEntityIfNotInitialized\@Block\@\@AEAAXXZ */ MCAPI void _tryInitEntityIfNotInitialized(); + /** + * @symbol ?entityInside\@Block\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + MCAPI void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** * @symbol ?getEntity\@Block\@\@AEBAAEBVEntityContext\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockAABBComponentData.hpp b/LiteLoader/include/llapi/mc/BlockAABBComponentData.hpp new file mode 100644 index 0000000000..555de1cda7 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockAABBComponentData.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockAABBComponentData.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockAABBComponentData { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKAABBCOMPONENTDATA +public: + class BlockAABBComponentData& operator=(class BlockAABBComponentData const &) = delete; + BlockAABBComponentData(class BlockAABBComponentData const &) = delete; + BlockAABBComponentData() = delete; +#endif + +public: + +}; diff --git a/LiteLoader/include/llapi/mc/BlockActor.hpp b/LiteLoader/include/llapi/mc/BlockActor.hpp index 4e67f4e93e..6e7c3eb77e 100644 --- a/LiteLoader/include/llapi/mc/BlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlockActor.hpp @@ -194,9 +194,9 @@ class BlockActor { virtual int getRepairCost() const; /** * @vftbl 30 - * @symbol ?getOwningPiston\@BlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + * @symbol __unk_vfn_30 */ - virtual class PistonBlockActor * getOwningPiston(class BlockSource &); + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -224,31 +224,36 @@ class BlockActor { virtual void __unk_vfn_35(); /** * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 * @symbol ?getUgcStrings\@BlockActor\@\@UEBA?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\@\@AEBVCompoundTag\@\@\@Z */ virtual std::vector getUgcStrings(class CompoundTag const &) const; /** - * @vftbl 37 + * @vftbl 38 * @symbol ?setUgcStrings\@BlockActor\@\@UEBAXAEAVCompoundTag\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void setUgcStrings(class CompoundTag &, std::vector const &) const; /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** - * @vftbl 39 + * @vftbl 40 * @symbol ?_getUpdatePacket\@BlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@BlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 41 + * @vftbl 42 * @symbol ?_playerCanUpdate\@BlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; @@ -269,6 +274,14 @@ class BlockActor { * @symbol ?getContainer\@BlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; + /** + * @symbol ?getOwningPiston\@BlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI class PistonBlockActor * getOwningPiston(class BlockSource &); + /** + * @symbol ?getOwningPiston\@BlockActor\@\@UEBAPEBVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI class PistonBlockActor const * getOwningPiston(class BlockSource &) const; /** * @symbol ?onChunkLoaded\@BlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp index 3c22ff9409..cfe59ea09e 100644 --- a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -53,16 +54,16 @@ class BlockActorDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BlockActorDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BlockActorDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0BlockActorDataPacket\@\@QEAA\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z - */ - MCAPI BlockActorDataPacket(class BlockPos const &, class CompoundTag); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0BlockActorDataPacket\@\@QEAA\@XZ */ MCAPI BlockActorDataPacket(); + /** + * @symbol ??0BlockActorDataPacket\@\@QEAA\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z + */ + MCAPI BlockActorDataPacket(class BlockPos const &, class CompoundTag); }; diff --git a/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp b/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp index 8d8c561321..6e99c20dc7 100644 --- a/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp @@ -24,11 +24,14 @@ struct BlockBakedMaterialDataComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKBAKEDMATERIALDATACOMPONENT public: struct BlockBakedMaterialDataComponent& operator=(struct BlockBakedMaterialDataComponent const &) = delete; - BlockBakedMaterialDataComponent(struct BlockBakedMaterialDataComponent const &) = delete; BlockBakedMaterialDataComponent() = delete; #endif public: + /** + * @symbol ??0BlockBakedMaterialDataComponent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI BlockBakedMaterialDataComponent(struct BlockBakedMaterialDataComponent const &); /** * @symbol ?isSolidOpaque\@BlockBakedMaterialDataComponent\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp index 1091cb951e..23ef342374 100644 --- a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp @@ -53,16 +53,21 @@ struct BlockBreathabilityDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockBreathabilityDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockBreathabilityDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockBreathabilityDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockCollisionBoxComponent.hpp b/LiteLoader/include/llapi/mc/BlockCollisionBoxComponent.hpp new file mode 100644 index 0000000000..97440e6e87 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockCollisionBoxComponent.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockCollisionBoxComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockCollisionBoxComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOLLISIONBOXCOMPONENT +public: + struct BlockCollisionBoxComponent& operator=(struct BlockCollisionBoxComponent const &) = delete; + BlockCollisionBoxComponent(struct BlockCollisionBoxComponent const &) = delete; + BlockCollisionBoxComponent() = delete; +#endif + +public: + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp index 22907376a2..350bb59e00 100644 --- a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp @@ -36,31 +36,36 @@ struct BlockCollisionBoxDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockCollisionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 + * @vftbl 4 * @symbol ?initializeComponentFromCode\@BlockCollisionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponentFromCode(class EntityContext &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 5 + * @symbol __unk_vfn_5 */ - virtual void __unk_vfn_4(); + virtual void __unk_vfn_5(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockCollisionBoxDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockCollisionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockCollisionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp index df6404c41c..c3ba687ea1 100644 --- a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp @@ -127,14 +127,14 @@ class BlockCommandOrigin : public CommandOrigin { */ MCVAPI ~BlockCommandOrigin(); #endif - /** - * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI BlockCommandOrigin(class BlockSource &, class BlockPos const &); /** * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI BlockCommandOrigin(class Level &, class AutomaticID, std::string const &, class BlockPos const &); + /** + * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI BlockCommandOrigin(class BlockSource &, class BlockPos const &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/BlockComponentBase.hpp b/LiteLoader/include/llapi/mc/BlockComponentBase.hpp new file mode 100644 index 0000000000..9d0b6573b6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockComponentBase.hpp @@ -0,0 +1,34 @@ +/** + * @file BlockComponentBase.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockComponentBase { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOMPONENTBASE +public: + struct BlockComponentBase& operator=(struct BlockComponentBase const &) = delete; + BlockComponentBase(struct BlockComponentBase const &) = delete; + BlockComponentBase() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKCOMPONENTBASE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockComponentBase(); +#endif + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp index ff7325c9bc..2d4c60cd51 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp @@ -56,11 +56,16 @@ struct BlockComponentDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockComponentDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockComponentDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; @@ -77,6 +82,10 @@ struct BlockComponentDescription { * @symbol ?initializeComponent\@BlockComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ MCVAPI void initializeComponent(class EntityContext &) const; + /** + * @symbol ?initializeComponent\@BlockComponentDescription\@\@UEBAXAEAVBlockComponentStorage\@\@\@Z + */ + MCVAPI void initializeComponent(class BlockComponentStorage &) const; /** * @symbol ?initializeComponentFromCode\@BlockComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockComponentDirectData.hpp b/LiteLoader/include/llapi/mc/BlockComponentDirectData.hpp new file mode 100644 index 0000000000..3d3b428f01 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockComponentDirectData.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockComponentDirectData.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockComponentDirectData { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOMPONENTDIRECTDATA +public: + class BlockComponentDirectData& operator=(class BlockComponentDirectData const &) = delete; + BlockComponentDirectData(class BlockComponentDirectData const &) = delete; + BlockComponentDirectData() = delete; +#endif + +public: + /** + * @symbol ?finalize\@BlockComponentDirectData\@\@QEAAXAEBVBlock\@\@\@Z + */ + MCAPI void finalize(class Block const &); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp b/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp index db2caf1eea..360554bb7a 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp @@ -39,10 +39,6 @@ struct Constructor { * @symbol ??0BlockComponentFactory\@\@QEAA\@AEBVExperiments\@\@\@Z */ MCAPI BlockComponentFactory(class Experiments const &); - /** - * @symbol ?createDescription\@BlockComponentFactory\@\@QEBA?AV?$unique_ptr\@UBlockComponentDescription\@\@U?$default_delete\@UBlockComponentDescription\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z - */ - MCAPI std::unique_ptr createDescription(std::string const &) const; /** * @symbol ?initializeFactory\@BlockComponentFactory\@\@QEAAXAEBVExperiments\@\@\@Z */ @@ -52,13 +48,17 @@ struct Constructor { */ MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader &); /** - * @symbol ?bindAllComponentSchemas\@BlockComponentFactory\@\@SAXAEAVSchemaFactory\@reflection\@\@AEBVSemVersion\@\@\@Z + * @symbol ?bindAllComponentSchemas\@BlockComponentFactory\@\@SAXAEAVSchemaFactory\@cereal\@\@AEBVSemVersion\@\@\@Z */ - MCAPI static void bindAllComponentSchemas(class reflection::SchemaFactory &, class SemVersion const &); + MCAPI static void bindAllComponentSchemas(class cereal::SchemaFactory &, class SemVersion const &); /** * @symbol ?mRegisteredCerealComponents\@BlockComponentFactory\@\@2V?$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\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mRegisteredCerealComponents; + /** + * @symbol ?mRegisteredDeprecatedCerealComponents\@BlockComponentFactory\@\@2V?$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\@\@std\@\@A + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mRegisteredDeprecatedCerealComponents; /** * @symbol ?registerAllCerealDescriptions\@BlockComponentFactory\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp b/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp index 0e55a1c5c9..900a81ff02 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp @@ -21,16 +21,7 @@ struct BlockComponentGroupDescription { // Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOMPONENTGROUPDESCRIPTION public: - struct BlockComponentGroupDescription& operator=(struct BlockComponentGroupDescription const &) = delete; -#endif - -public: - /** - * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI BlockComponentGroupDescription(struct BlockComponentGroupDescription const &); /** * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@XZ */ @@ -39,6 +30,10 @@ struct BlockComponentGroupDescription { * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI BlockComponentGroupDescription(struct BlockComponentGroupDescription &&); + /** + * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI BlockComponentGroupDescription(struct BlockComponentGroupDescription const &); /** * @symbol ?foreachDescription\@BlockComponentGroupDescription\@\@QEBAXV?$function\@$$A6AXAEBUBlockComponentDescription\@\@\@Z\@std\@\@\@Z */ @@ -47,6 +42,10 @@ struct BlockComponentGroupDescription { * @symbol ?getComponentDescription\@BlockComponentGroupDescription\@\@QEBAPEAUBlockComponentDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct BlockComponentDescription * getComponentDescription(std::string const &) const; + /** + * @symbol ??4BlockComponentGroupDescription\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct BlockComponentGroupDescription & operator=(struct BlockComponentGroupDescription const &); /** * @symbol ??4BlockComponentGroupDescription\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockComponentStorage.hpp b/LiteLoader/include/llapi/mc/BlockComponentStorage.hpp index 81877fa7c3..aad1c2e00b 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentStorage.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentStorage.hpp @@ -24,9 +24,19 @@ class BlockComponentStorage { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKCOMPONENTSTORAGE /** - * @symbol ??1BlockComponentStorage\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~BlockComponentStorage(); + MCVAPI ~BlockComponentStorage(); +#endif + /** + * @symbol ?allowComponentReplacement\@BlockComponentStorage\@\@QEAAXXZ + */ + MCAPI void allowComponentReplacement(); + /** + * @symbol ?finalizeComponents\@BlockComponentStorage\@\@QEAAXXZ + */ + MCAPI void finalizeComponents(); }; diff --git a/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp b/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp index 19848ef2c8..5405239f22 100644 --- a/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp @@ -27,13 +27,15 @@ struct BlockCraftingTableComponent { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKCRAFTINGTABLECOMPONENT /** - * @symbol ??4BlockCraftingTableComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI struct BlockCraftingTableComponent & operator=(struct BlockCraftingTableComponent &&); + MCVAPI ~BlockCraftingTableComponent(); +#endif /** - * @symbol ??1BlockCraftingTableComponent\@\@QEAA\@XZ + * @symbol ??4BlockCraftingTableComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ - MCAPI ~BlockCraftingTableComponent(); + MCAPI struct BlockCraftingTableComponent & operator=(struct BlockCraftingTableComponent &&); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp index 67ac3121fd..ebb55845b8 100644 --- a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp @@ -36,14 +36,14 @@ struct BlockCraftingTableDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockCraftingTableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@BlockCraftingTableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -51,16 +51,21 @@ struct BlockCraftingTableDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockCraftingTableDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockCraftingTableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockCraftingTableDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockDefinition.hpp b/LiteLoader/include/llapi/mc/BlockDefinition.hpp index e9db63ce32..8f2bcd546e 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinition.hpp @@ -22,7 +22,6 @@ struct BlockDefinition { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDEFINITION public: struct BlockDefinition& operator=(struct BlockDefinition const &) = delete; - BlockDefinition() = delete; #endif public: @@ -30,18 +29,26 @@ struct BlockDefinition { * @symbol ??0BlockDefinition\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI BlockDefinition(struct BlockDefinition &&); + /** + * @symbol ??0BlockDefinition\@\@QEAA\@XZ + */ + MCAPI BlockDefinition(); /** * @symbol ??0BlockDefinition\@\@QEAA\@AEBU0\@\@Z */ MCAPI BlockDefinition(struct BlockDefinition const &); + /** + * @symbol ??4BlockDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct BlockDefinition & operator=(struct BlockDefinition &&); /** * @symbol ??1BlockDefinition\@\@QEAA\@XZ */ MCAPI ~BlockDefinition(); /** - * @symbol ?createBlockAbstractCerealSchema\@BlockDefinition\@\@SA?AUSchema\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createBlockAbstractCerealSchema\@BlockDefinition\@\@SA?AUSchema\@cereal\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI static struct reflection::Schema createBlockAbstractCerealSchema(std::string const &); + MCAPI static struct cereal::Schema createBlockAbstractCerealSchema(std::string const &); /** * @symbol ?registerBlockDefinitionTypes\@BlockDefinition\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp index b199e7c3f7..83c59e27d6 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Core.hpp" #include "JsonUtil.hpp" #include "Json.hpp" @@ -44,10 +45,6 @@ struct BlockResource { * @symbol ?buildBlockSchema\@BlockDefinitionGroup\@\@QEAAXAEBVBlockComponentFactory\@\@\@Z */ MCAPI void buildBlockSchema(class BlockComponentFactory const &); - /** - * @symbol ?digestServerBlockProperties\@BlockDefinitionGroup\@\@QEAAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z - */ - MCAPI void digestServerBlockProperties(std::vector> const &, class BlockComponentFactory const &); /** * @symbol ?generateBlockDefinition\@BlockDefinitionGroup\@\@QEAA?AV?$unique_ptr\@UBlockDefinition\@\@U?$default_delete\@UBlockDefinition\@\@\@std\@\@\@std\@\@AEBUBlockResource\@1\@AEBVExperiments\@\@\@Z */ @@ -69,9 +66,13 @@ struct BlockResource { */ MCAPI void initializeBlocks(class EntityRegistry &, class Level &); /** - * @symbol ?loadResources\@BlockDefinitionGroup\@\@QEAAXAEAVResourcePackManager\@\@AEBVBlockComponentFactory\@\@AEBVExperiments\@\@\@Z + * @symbol ?loadResource\@BlockDefinitionGroup\@\@QEAA?AV?$unique_ptr\@UBlockDefinition\@\@U?$default_delete\@UBlockDefinition\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV43\@AEBVSemVersion\@\@AEBVExperiments\@\@\@Z + */ + MCAPI std::unique_ptr loadResource(std::string, class Core::PathBuffer const &, std::string const &, class SemVersion const &, class Experiments const &); + /** + * @symbol ?loadResources\@BlockDefinitionGroup\@\@QEAAXAEBVResourcePackManager\@\@AEBVBlockComponentFactory\@\@AEBVExperiments\@\@\@Z */ - MCAPI void loadResources(class ResourcePackManager &, class BlockComponentFactory const &, class Experiments const &); + MCAPI void loadResources(class ResourcePackManager const &, class BlockComponentFactory const &, class Experiments const &); /** * @symbol ?postProcessComponents\@BlockDefinitionGroup\@\@QEAAXAEAVBlockLegacy\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockDefinitionLoader.hpp b/LiteLoader/include/llapi/mc/BlockDefinitionLoader.hpp new file mode 100644 index 0000000000..975d712cb1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockDefinitionLoader.hpp @@ -0,0 +1,42 @@ +/** + * @file BlockDefinitionLoader.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Core.hpp" +#include "Puv.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BlockDefinitionLoader { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDEFINITIONLOADER +public: + class BlockDefinitionLoader& operator=(class BlockDefinitionLoader const &) = delete; + BlockDefinitionLoader(class BlockDefinitionLoader const &) = delete; + BlockDefinitionLoader() = delete; +#endif + +public: + /** + * @symbol ??0BlockDefinitionLoader\@\@QEAA\@PEAVBlockDefinitionGroup\@\@PEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSemVersion\@\@PEBVExperiments\@\@\@Z + */ + MCAPI BlockDefinitionLoader(class BlockDefinitionGroup *, class Core::PathBuffer const *, std::string, class SemVersion, class Experiments const *); + /** + * @symbol ?load\@BlockDefinitionLoader\@\@QEBA?AV?$LoadResult\@UBlockDefinition\@\@\@Puv\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class Puv::LoadResult load(std::string const &) const; + /** + * @symbol ??1BlockDefinitionLoader\@\@QEAA\@XZ + */ + MCAPI ~BlockDefinitionLoader(); + +}; diff --git a/LiteLoader/include/llapi/mc/BlockDescription.hpp b/LiteLoader/include/llapi/mc/BlockDescription.hpp index e7a7b50495..5ca7772339 100644 --- a/LiteLoader/include/llapi/mc/BlockDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescription.hpp @@ -24,18 +24,22 @@ struct BlockDescription { * @symbol ??0BlockDescription\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI BlockDescription(struct BlockDescription &&); - /** - * @symbol ??0BlockDescription\@\@QEAA\@XZ - */ - MCAPI BlockDescription(); /** * @symbol ??0BlockDescription\@\@QEAA\@AEBU0\@\@Z */ MCAPI BlockDescription(struct BlockDescription const &); + /** + * @symbol ??0BlockDescription\@\@QEAA\@XZ + */ + MCAPI BlockDescription(); /** * @symbol ??4BlockDescription\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct BlockDescription & operator=(struct BlockDescription const &); + /** + * @symbol ??4BlockDescription\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct BlockDescription & operator=(struct BlockDescription &&); /** * @symbol ??1BlockDescription\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp index b6621e31dd..55edd4f0b8 100644 --- a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp @@ -31,6 +31,10 @@ class BlockDescriptor { * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV0\@\@Z */ MCAPI BlockDescriptor(class BlockDescriptor const &); + /** + * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEBV?$vector\@VState\@BlockDescriptor\@\@V?$allocator\@VState\@BlockDescriptor\@\@\@std\@\@\@2\@\@Z + */ + MCAPI BlockDescriptor(std::string const &, std::vector const &&); /** * @symbol ??0BlockDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ @@ -43,10 +47,6 @@ class BlockDescriptor { * @symbol ??0BlockDescriptor\@\@QEAA\@AEBVHashedString\@\@\@Z */ MCAPI BlockDescriptor(class HashedString const &); - /** - * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEBV?$vector\@VState\@BlockDescriptor\@\@V?$allocator\@VState\@BlockDescriptor\@\@\@std\@\@\@2\@\@Z - */ - MCAPI BlockDescriptor(std::string const &, std::vector const &&); /** * @symbol ?getBlockOrUnknownBlock\@BlockDescriptor\@\@QEBAAEBVBlock\@\@XZ */ @@ -119,14 +119,14 @@ class BlockDescriptor { * @symbol ?JSON_TAGS_FIELD\@BlockDescriptor\@\@2QBDB */ MCAPI static char const JSON_TAGS_FIELD[]; - /** - * @symbol ?anyMatch\@BlockDescriptor\@\@SA_NAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEBVBlock\@\@\@Z - */ - MCAPI static bool anyMatch(std::vector const &, class Block const &); /** * @symbol ?anyMatch\@BlockDescriptor\@\@SA_NAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEBV1\@\@Z */ MCAPI static bool anyMatch(std::vector const &, class BlockDescriptor const &); + /** + * @symbol ?anyMatch\@BlockDescriptor\@\@SA_NAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEBVBlock\@\@\@Z + */ + MCAPI static bool anyMatch(std::vector const &, class Block const &); /** * @symbol ?bindType\@BlockDescriptor\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionComponent.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionComponent.hpp new file mode 100644 index 0000000000..37384701f8 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionComponent.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockDestructibleByExplosionComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockDestructibleByExplosionComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESTRUCTIBLEBYEXPLOSIONCOMPONENT +public: + struct BlockDestructibleByExplosionComponent& operator=(struct BlockDestructibleByExplosionComponent const &) = delete; + BlockDestructibleByExplosionComponent(struct BlockDestructibleByExplosionComponent const &) = delete; + BlockDestructibleByExplosionComponent() = delete; +#endif + +public: + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp index 3eee57d18e..1ee206b820 100644 --- a/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp @@ -36,6 +36,11 @@ struct BlockDestructibleByExplosionDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockDestructibleByExplosionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningComponent.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningComponent.hpp new file mode 100644 index 0000000000..f16ad20b71 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningComponent.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockDestructibleByMiningComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockDestructibleByMiningComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESTRUCTIBLEBYMININGCOMPONENT +public: + struct BlockDestructibleByMiningComponent& operator=(struct BlockDestructibleByMiningComponent const &) = delete; + BlockDestructibleByMiningComponent(struct BlockDestructibleByMiningComponent const &) = delete; + BlockDestructibleByMiningComponent() = delete; +#endif + +public: + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp index 7b88e03b7c..05646cbcb1 100644 --- a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp @@ -36,14 +36,14 @@ struct BlockDestructibleByMiningDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockDestructibleByMiningDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@BlockDestructibleByMiningDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -51,16 +51,21 @@ struct BlockDestructibleByMiningDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockDestructibleByMiningDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockDestructibleByMiningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockDestructibleByMiningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp b/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp new file mode 100644 index 0000000000..9fea0638fc --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp @@ -0,0 +1,34 @@ +/** + * @file BlockDisplayNameComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockDisplayNameComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDISPLAYNAMECOMPONENT +public: + struct BlockDisplayNameComponent& operator=(struct BlockDisplayNameComponent const &) = delete; + BlockDisplayNameComponent(struct BlockDisplayNameComponent const &) = delete; + BlockDisplayNameComponent() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKDISPLAYNAMECOMPONENT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockDisplayNameComponent(); +#endif + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp index 2d12ae95b9..0fe227f5ba 100644 --- a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp @@ -38,14 +38,14 @@ struct BlockDisplayNameDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockDisplayNameDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@BlockDisplayNameDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -53,16 +53,21 @@ struct BlockDisplayNameDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockDisplayNameDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockDisplayNameDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockDisplayNameDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp b/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp index 54611fe998..76b2637b4e 100644 --- a/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp @@ -42,9 +42,9 @@ class BlockEventCoordinator { */ MCAPI void sendBlockDestroyedByPlayer(class Player &, class Block const &, class BlockPos const &); /** - * @symbol ?sendBlockDestructionStarted\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?sendBlockDestructionStarted\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ - MCAPI void sendBlockDestructionStarted(class Player &, class BlockPos const &); + MCAPI void sendBlockDestructionStarted(class Player &, class BlockPos const &, unsigned char); /** * @symbol ?sendBlockDestructionStopped\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@H\@Z */ @@ -69,10 +69,6 @@ class BlockEventCoordinator { * @symbol ?sendBlockPlacedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void sendBlockPlacedByPlayer(class Player &, class Block const &, class BlockPos const &, bool); - /** - * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z - */ - MCAPI enum class CoordinatorResult sendEvent(class EventRef>); /** * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$BlockGameplayEvent\@X\@\@\@\@\@Z */ @@ -81,6 +77,10 @@ class BlockEventCoordinator { * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); + /** + * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + */ + MCAPI enum class CoordinatorResult sendEvent(class EventRef>); /** * @symbol ?sendUnknownBlockReceived\@BlockEventCoordinator\@\@QEAAXAEAVLevel\@\@AEBUNewBlockID\@\@G\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp index 318e9d426e..ebc58c47ad 100644 --- a/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp @@ -21,7 +21,7 @@ class BlockEventDispatcher { #define AFTER_EXTRA // Add Member There public: -std::unordered_map> listeners; + std::unordered_map> listeners; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKEVENTDISPATCHER diff --git a/LiteLoader/include/llapi/mc/BlockEventListener.hpp b/LiteLoader/include/llapi/mc/BlockEventListener.hpp index e28ae6128e..757534ddec 100644 --- a/LiteLoader/include/llapi/mc/BlockEventListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventListener.hpp @@ -35,9 +35,9 @@ class BlockEventListener { */ MCVAPI enum class EventResult onBlockDestroyedByPlayer(class Player &, class Block const &, class BlockPos const &); /** - * @symbol ?onBlockDestructionStarted\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onBlockDestructionStarted\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ - MCVAPI enum class EventResult onBlockDestructionStarted(class Player &, class BlockPos const &); + MCVAPI enum class EventResult onBlockDestructionStarted(class Player &, class BlockPos const &, unsigned char); /** * @symbol ?onBlockDestructionStopped\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp index b1b4a78121..f9e9edb627 100644 --- a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class BlockEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BlockEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BlockEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKEVENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/BlockFlammableComponent.hpp b/LiteLoader/include/llapi/mc/BlockFlammableComponent.hpp new file mode 100644 index 0000000000..4c39a056fa --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockFlammableComponent.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockFlammableComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockFlammableComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKFLAMMABLECOMPONENT +public: + struct BlockFlammableComponent& operator=(struct BlockFlammableComponent const &) = delete; + BlockFlammableComponent(struct BlockFlammableComponent const &) = delete; + BlockFlammableComponent() = delete; +#endif + +public: + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp index e1204a4900..027278cece 100644 --- a/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp @@ -38,6 +38,11 @@ struct BlockFlammableDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockFlammableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; diff --git a/LiteLoader/include/llapi/mc/BlockFrictionComponent.hpp b/LiteLoader/include/llapi/mc/BlockFrictionComponent.hpp new file mode 100644 index 0000000000..c019b9c6a1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockFrictionComponent.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockFrictionComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockFrictionComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKFRICTIONCOMPONENT +public: + struct BlockFrictionComponent& operator=(struct BlockFrictionComponent const &) = delete; + BlockFrictionComponent(struct BlockFrictionComponent const &) = delete; + BlockFrictionComponent() = delete; +#endif + +public: + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp index 9ddf78a575..5cbc2f6c61 100644 --- a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp @@ -38,14 +38,14 @@ struct BlockFrictionDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockFrictionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@BlockFrictionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -53,16 +53,21 @@ struct BlockFrictionDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockFrictionDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockFrictionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockFrictionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp b/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp index e87679462d..a337d2224e 100644 --- a/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp @@ -29,6 +29,12 @@ struct BlockGeometryComponent { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKGEOMETRYCOMPONENT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockGeometryComponent(); +#endif /** * @symbol ??0BlockGeometryComponent\@\@QEAA\@$$QEAU0\@\@Z */ @@ -37,9 +43,5 @@ struct BlockGeometryComponent { * @symbol ??4BlockGeometryComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockGeometryComponent & operator=(struct BlockGeometryComponent &&); - /** - * @symbol ??1BlockGeometryComponent\@\@QEAA\@XZ - */ - MCAPI ~BlockGeometryComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp index a7ac8508f2..e02793d64c 100644 --- a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp @@ -37,36 +37,41 @@ struct BlockGeometryDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockGeometryDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 + * @vftbl 4 * @symbol ?initializeComponentFromCode\@BlockGeometryDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponentFromCode(class EntityContext &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 5 + * @symbol __unk_vfn_5 */ - virtual void __unk_vfn_4(); + virtual void __unk_vfn_5(); /** - * @vftbl 5 - * @symbol ?isNetworkComponent\@BlockGeometryDescription\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isNetworkComponent\@?$NetworkedBlockComponentDescription\@UBlockGeometryDescription\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 - * @symbol ?buildNetworkTag\@BlockGeometryDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 7 + * @symbol ?buildNetworkTag\@?$NetworkedBlockComponentDescription\@UBlockGeometryDescription\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 - * @symbol ?initializeFromNetwork\@BlockGeometryDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 8 + * @symbol ?initializeFromNetwork\@?$NetworkedBlockComponentDescription\@UBlockGeometryDescription\@\@\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @vftbl 8 + * @vftbl 9 * @symbol ?handleVersionBasedInitialization\@BlockGeometryDescription\@\@UEAAXAEBVSemVersion\@\@\@Z */ virtual void handleVersionBasedInitialization(class SemVersion const &); diff --git a/LiteLoader/include/llapi/mc/BlockItem.hpp b/LiteLoader/include/llapi/mc/BlockItem.hpp index 21c9535047..c61d3163bf 100644 --- a/LiteLoader/include/llapi/mc/BlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockItem.hpp @@ -52,10 +52,10 @@ class BlockItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -147,7 +147,7 @@ class BlockItem : public Item { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BlockItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/BlockLegacy.hpp b/LiteLoader/include/llapi/mc/BlockLegacy.hpp index aab04c4673..7a999167ee 100644 --- a/LiteLoader/include/llapi/mc/BlockLegacy.hpp +++ b/LiteLoader/include/llapi/mc/BlockLegacy.hpp @@ -66,24 +66,24 @@ class BlockLegacy { virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** * @vftbl 5 - * @symbol ?getCollisionShape\@BlockLegacy\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?clip\@BlockLegacy\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** * @vftbl 6 - * @symbol ?isObstructingChests\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?getCollisionShape\@BlockLegacy\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ - virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** * @vftbl 7 - * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z + * @symbol ?addCollisionShapes\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; + virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getAABB\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** * @vftbl 9 * @symbol ?addAABBs\@BlockLegacy\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z @@ -91,24 +91,24 @@ class BlockLegacy { virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** * @vftbl 10 - * @symbol ?getAABB\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @symbol ?getOutline\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + virtual class AABB const & getOutline(class BlockSource &, class BlockPos const &, class AABB &) const; /** * @vftbl 11 - * @symbol ?addCollisionShapes\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?getVisualShapeInWorld\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** * @vftbl 12 - * @symbol ?updateTallestCollisionShape\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV5\@AEBVVec3\@\@AEAM\@Z + * @symbol ?getVisualShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual bool updateTallestCollisionShape(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const &, class optional_ref, class AABB &, class Vec3 const &, float &) const; + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 13 - * @symbol ?getOutline\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z + * @symbol ?getUIShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual class AABB const & getOutline(class BlockSource &, class BlockPos const &, class AABB &) const; + virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** * @vftbl 14 * @symbol ?getLiquidClipVolume\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z @@ -116,84 +116,84 @@ class BlockLegacy { virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** * @vftbl 15 + * @symbol ?isObstructingChests\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 16 + * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z + */ + virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; + /** + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + */ + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; + /** + * @vftbl 18 * @symbol ?onProjectileHit\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 16 + * @vftbl 19 * @symbol ?onLightningHit\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 17 + * @vftbl 20 * @symbol ?liquidCanFlowIntoFromDirection\@BlockLegacy\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 18 + * @vftbl 21 * @symbol ?isSolid\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isSolid() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 20 + * @vftbl 23 * @symbol ?isStrippable\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isStrippable(class Block const &) const; /** - * @vftbl 21 + * @vftbl 24 * @symbol ?getStrippedBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getStrippedBlock(class Block const &) const; /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 23 + * @vftbl 26 * @symbol ?canProvideFullSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideFullSupport(class Block const &, unsigned char) const; /** - * @vftbl 24 + * @vftbl 27 * @symbol ?canProvideMultifaceSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideMultifaceSupport(class Block const &, unsigned char) const; /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 26 + * @vftbl 29 * @symbol ?isAir\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isAir() const; /** - * @vftbl 27 + * @vftbl 30 * @symbol ?tryGetCopperBehavior\@BlockLegacy\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol ?isClimbable\@BlockLegacy\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z - */ - virtual bool isClimbable(struct IActorMovementProxy const &) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -206,14 +206,14 @@ class BlockLegacy { virtual void __unk_vfn_32(); /** * @vftbl 33 - * @symbol __unk_vfn_33 + * @symbol ?isClimbable\@BlockLegacy\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z */ - virtual void __unk_vfn_33(); + virtual bool isClimbable(struct IActorMovementProxy const &) const; /** * @vftbl 34 - * @symbol ?isWaterBlocking\@BlockLegacy\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -226,9 +226,9 @@ class BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@BlockLegacy\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -251,9 +251,9 @@ class BlockLegacy { virtual void __unk_vfn_41(); /** * @vftbl 42 - * @symbol ?isDoubleSlabBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol __unk_vfn_42 */ - virtual bool isDoubleSlabBlock() const; + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -266,9 +266,9 @@ class BlockLegacy { virtual void __unk_vfn_44(); /** * @vftbl 45 - * @symbol __unk_vfn_45 + * @symbol ?isDoubleSlabBlock\@BlockLegacy\@\@UEBA_NXZ */ - virtual void __unk_vfn_45(); + virtual bool isDoubleSlabBlock() const; /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -286,374 +286,374 @@ class BlockLegacy { virtual void __unk_vfn_48(); /** * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 52 * @symbol ?canHurtAndBreakItem\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canHurtAndBreakItem() const; /** - * @vftbl 50 + * @vftbl 53 * @symbol ?isSignalSource\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 51 + * @vftbl 54 * @symbol ?canBeOriginalSurface\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 52 + * @vftbl 55 * @symbol ?canBeAscendedByJumping\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@BlockLegacy\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 55 + * @vftbl 58 * @symbol ?canFillAtPos\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 56 + * @vftbl 59 * @symbol ?sanitizeFillBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 57 + * @vftbl 60 * @symbol ?onFillBlock\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 58 + * @vftbl 61 * @symbol ?getDirectSignal\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 62 + * @vftbl 65 * @symbol ?getRequiredMedium\@BlockLegacy\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ */ virtual class std::optional getRequiredMedium() const; /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 64 + * @vftbl 67 * @symbol ?handlePrecipitation\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z */ virtual void handlePrecipitation(class BlockSource &, class BlockPos const &, float, float) const; /** - * @vftbl 65 + * @vftbl 68 * @symbol ?canBeUsedInCommands\@BlockLegacy\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 66 + * @vftbl 69 * @symbol ?getThickness\@BlockLegacy\@\@UEBAMXZ */ virtual float getThickness() const; /** - * @vftbl 67 + * @vftbl 70 * @symbol ?getFlexibility\@BlockLegacy\@\@UEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual float getFlexibility(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 69 + * @vftbl 72 * @symbol ?shouldDispense\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z */ virtual bool shouldDispense(class BlockSource &, class Container &) const; /** - * @vftbl 70 + * @vftbl 73 * @symbol ?dispense\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 71 + * @vftbl 74 * @symbol ?transformOnFall\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ virtual void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 73 + * @vftbl 76 * @symbol ?onMove\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void onMove(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 75 + * @vftbl 78 * @symbol ?movedByPiston\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 76 + * @vftbl 79 * @symbol ?onStructureBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 77 + * @vftbl 80 * @symbol ?onStructureNeighborBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureNeighborBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 79 + * @vftbl 82 * @symbol ?getRedstoneProperty\@BlockLegacy\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 80 + * @vftbl 83 * @symbol ?updateEntityAfterFallOn\@BlockLegacy\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 82 + * @vftbl 85 * @symbol ?isFilteredOut\@BlockLegacy\@\@UEBA_NW4BlockRenderLayer\@\@\@Z */ virtual bool isFilteredOut(enum class BlockRenderLayer) const; /** - * @vftbl 83 + * @vftbl 86 * @symbol ?isPreservingMediumWhenPlaced\@BlockLegacy\@\@UEBA_NPEBV1\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 84 + * @vftbl 87 * @symbol ?ignoreEntitiesOnPistonMove\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool ignoreEntitiesOnPistonMove(class Block const &) const; /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 88 + * @vftbl 91 * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 89 + * @vftbl 92 * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 96 * @symbol ?tryToPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z */ virtual bool tryToPlace(class BlockSource &, class BlockPos const &, class Block const &, struct ActorBlockSyncMessage const *) const; /** - * @vftbl 94 + * @vftbl 97 * @symbol ?tryToTill\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 96 + * @vftbl 99 * @symbol ?destroy\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 97 + * @vftbl 100 * @symbol ?getIgnoresDestroyPermissions\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool getIgnoresDestroyPermissions(class Actor &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@BlockLegacy\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@BlockLegacy\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 + * @vftbl 106 * @symbol ?trySpawnResourcesOnExplosion\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@M\@Z */ virtual void trySpawnResourcesOnExplosion(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, float) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 106 + * @vftbl 109 * @symbol ?calcVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z */ virtual int calcVariant(class BlockSource &, class BlockPos const &, class mce::Color const &) const; /** - * @vftbl 107 + * @vftbl 110 * @symbol ?isAttachedTo\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@BlockLegacy\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 109 - * @symbol ?handleEntityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z - */ - virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; - /** - * @vftbl 110 + * @vftbl 112 * @symbol ?shouldTriggerOnStandOn\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldTriggerOnStandOn(class Actor &, class BlockPos const &) const; /** - * @vftbl 111 + * @vftbl 113 * @symbol ?shouldTriggerEntityInside\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 112 - * @symbol ?entityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 113 + * @vftbl 114 * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** - * @vftbl 114 + * @vftbl 115 * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 115 + * @vftbl 116 * @symbol ?triggerEvent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; /** - * @vftbl 116 + * @vftbl 117 * @symbol ?executeEvent\@BlockLegacy\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(std::string const &, class RenderParams &) const; /** - * @vftbl 117 + * @vftbl 118 * @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 &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; /** - * @vftbl 118 + * @vftbl 119 * @symbol ?executeTrigger\@BlockLegacy\@\@UEBA_NAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ virtual bool executeTrigger(class DefinitionTrigger const &, class RenderParams &) const; /** - * @vftbl 119 + * @vftbl 120 * @symbol ?forceExecuteTrigger\@BlockLegacy\@\@UEBAXAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ virtual void forceExecuteTrigger(class DefinitionTrigger const &, class RenderParams &) const; /** - * @vftbl 120 + * @vftbl 121 * @symbol ?getMobToSpawn\@BlockLegacy\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ virtual class MobSpawnerData const * getMobToSpawn(class SpawnConditions const &, class BlockSource &) const; /** - * @vftbl 121 + * @vftbl 122 * @symbol ?shouldStopFalling\@BlockLegacy\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool shouldStopFalling(class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -666,346 +666,336 @@ class BlockLegacy { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 126 + * @vftbl 127 * @symbol ?canSlide\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 128 + * @vftbl 129 * @symbol ?canSpawnAt\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 129 + * @vftbl 130 * @symbol ?notifySpawnedAt\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 131 + * @vftbl 132 * @symbol ?getIconYOffset\@BlockLegacy\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColorAtPos\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 137 + * @vftbl 138 * @symbol ?getColorForParticle\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 + * @vftbl 139 * @symbol ?isSeasonTinted\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@BlockLegacy\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 140 + * @vftbl 141 * @symbol ?getShadeBrightness\@BlockLegacy\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getShadeBrightness(class Block const &) const; - /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** * @vftbl 142 - * @symbol ?getVisualShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; - /** - * @vftbl 143 - * @symbol ?getUIShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z - */ - virtual class AABB const & getUIShape(class Block const &, class AABB &) const; - /** - * @vftbl 144 * @symbol ?telemetryVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@BlockLegacy\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 147 + * @vftbl 145 * @symbol ?getRenderBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@BlockLegacy\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getFaceFlip\@BlockLegacy\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@BlockLegacy\@\@UEAAAEAV1\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 153 + * @vftbl 151 * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVBlockState\@\@\@Z */ virtual class BlockLegacy & addState(class BlockState const &); /** - * @vftbl 154 + * @vftbl 152 * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVBlockState\@\@_K\@Z */ virtual class BlockLegacy & addState(class BlockState const &, unsigned __int64); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 156 + * @vftbl 154 * @symbol ?tryLegacyUpgrade\@BlockLegacy\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; /** - * @vftbl 157 + * @vftbl 155 * @symbol ?dealsContactDamage\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 158 + * @vftbl 156 * @symbol ?tryGetInfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 159 + * @vftbl 157 * @symbol ?tryGetUninfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@BlockLegacy\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 162 + * @vftbl 160 * @symbol ?onExploded\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onStandOn\@BlockLegacy\@\@MEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 + * @vftbl 170 * @symbol ?shouldRandomTick\@BlockLegacy\@\@MEBA_NXZ */ virtual bool shouldRandomTick() const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 - */ - virtual void __unk_vfn_173(); - /** - * @vftbl 174 - * @symbol ?clip\@BlockLegacy\@\@MEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + virtual void __unk_vfn_171(); /** - * @vftbl 175 + * @vftbl 172 * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char, class std::optional) const; /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BlockLegacy\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 + * @vftbl 178 * @symbol ?getExtraRenderLayers\@BlockLegacy\@\@MEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 182 + * @vftbl 179 * @symbol ?getExplosionResistance\@BlockLegacy\@\@MEBAMXZ */ virtual float getExplosionResistance() const; /** - * @vftbl 183 + * @vftbl 180 * @symbol ?getLight\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLight(class Block const &) const; /** - * @vftbl 184 + * @vftbl 181 * @symbol ?getEmissiveBrightness\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@BlockLegacy\@\@MEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@BlockLegacy\@\@MEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@BlockLegacy\@\@MEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 191 + * @vftbl 188 + * @symbol ?entityInside\@BlockLegacy\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + /** + * @vftbl 189 * @symbol ?_executeEvent\@BlockLegacy\@\@EEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@\@2\@\@3\@AEAVRenderParams\@\@\@Z */ virtual void _executeEvent(std::string const &, std::vector> &, class RenderParams &) const; /** - * @vftbl 192 + * @vftbl 190 * @symbol ?_executeTrigger\@BlockLegacy\@\@EEBA_NAEBVDefinitionTrigger\@\@AEAV?$vector\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual bool _executeTrigger(class DefinitionTrigger const &, std::vector> &, class RenderParams &) const; /** - * @vftbl 193 + * @vftbl 191 * @symbol ?_forceExecuteTrigger\@BlockLegacy\@\@EEBAXAEBVDefinitionTrigger\@\@AEAV?$vector\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV12\@\@std\@\@\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void _forceExecuteTrigger(class DefinitionTrigger const &, std::vector> &, class RenderParams &) const; @@ -1199,14 +1189,18 @@ class BlockLegacy { * @symbol ?addTrait\@BlockLegacy\@\@QEAAAEAV1\@AEBVITrait\@BlockTrait\@\@\@Z */ MCAPI class BlockLegacy & addTrait(class BlockTrait::ITrait const &); + /** + * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NAEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI bool anyOf(std::vector> const &) const; /** * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z */ MCAPI bool anyOf(class std::initializer_list) const; /** - * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NAEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?clip\@BlockLegacy\@\@QEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_NAEBVAABB\@\@\@Z */ - MCAPI bool anyOf(std::vector> const &) const; + MCAPI class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool, class AABB const &) const; /** * @symbol ?createBlockPermutations\@BlockLegacy\@\@QEAAXI\@Z */ @@ -1215,6 +1209,10 @@ class BlockLegacy { * @symbol ?createWeakPtr\@BlockLegacy\@\@QEBA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ */ MCAPI class WeakPtr createWeakPtr() const; + /** + * @symbol ?finalizeBlockComponentStorage\@BlockLegacy\@\@QEAAXXZ + */ + MCAPI void finalizeBlockComponentStorage(); /** * @symbol ?forEachBlockPermutation\@BlockLegacy\@\@QEBAXV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ @@ -1384,9 +1382,9 @@ class BlockLegacy { */ MCAPI class BlockLegacy & setExperienceDrop(struct IntRange); /** - * @symbol ?setExplodeable\@BlockLegacy\@\@QEAAAEAV1\@M\@Z + * @symbol ?setExplosionResistance\@BlockLegacy\@\@QEAAAEAV1\@M\@Z */ - MCAPI class BlockLegacy & setExplodeable(float); + MCAPI class BlockLegacy & setExplosionResistance(float); /** * @symbol ?setFlammable\@BlockLegacy\@\@QEAAAEAV1\@W4FlameOdds\@\@W4BurnOdds\@\@W4LavaFlammable\@\@\@Z */ @@ -1455,18 +1453,22 @@ class BlockLegacy { * @symbol ?setSolid\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setSolid(bool); - /** - * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVVec3\@\@0\@Z - */ - MCAPI void setVisualShape(class Vec3 const &, class Vec3 const &); /** * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVAABB\@\@\@Z */ MCAPI void setVisualShape(class AABB const &); + /** + * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVVec3\@\@0\@Z + */ + MCAPI void setVisualShape(class Vec3 const &, class Vec3 const &); /** * @symbol ?tryGetStateFromLegacyData\@BlockLegacy\@\@QEBAPEBVBlock\@\@G_N\@Z */ MCAPI class Block const * tryGetStateFromLegacyData(unsigned short, bool) const; + /** + * @symbol ?updateTallestCollisionShape\@BlockLegacy\@\@QEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV5\@AEBVVec3\@\@AEAM\@Z + */ + MCAPI bool updateTallestCollisionShape(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const &, class optional_ref, class AABB &, class Vec3 const &, float &) const; /** * @symbol ?BLOCK_DESCRIPTION_PREFIX\@BlockLegacy\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ @@ -1495,28 +1497,20 @@ class BlockLegacy { * @symbol ?getPlacementFacingAllExceptAxisY\@BlockLegacy\@\@SAEAEBVActor\@\@AEBVBlockPos\@\@M\@Z */ MCAPI static unsigned char getPlacementFacingAllExceptAxisY(class Actor const &, class BlockPos const &, float); - /** - * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemInstance\@\@\@Z - */ - MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemInstance const &); /** * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemStack\@\@\@Z */ MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemStack const &); /** - * @symbol ?spawnResources\@BlockLegacy\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandomize\@\@M\@Z + * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemInstance\@\@\@Z */ - MCAPI static void spawnResources(class BlockSource &, class BlockPos const &, class Randomize &, float); + MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemInstance const &); //protected: /** * @symbol ?_getBlockShape\@BlockLegacy\@\@IEBA?AW4BlockShape\@\@XZ */ MCAPI enum class BlockShape _getBlockShape() const; - /** - * @symbol ?clip\@BlockLegacy\@\@IEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_NAEBVAABB\@\@\@Z - */ - MCAPI class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool, class AABB const &) const; /** * @symbol ?forEachBlockPermutationMutable\@BlockLegacy\@\@IEAA_NV?$function\@$$A6A_NAEAVBlock\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockLightDampeningComponent.hpp b/LiteLoader/include/llapi/mc/BlockLightDampeningComponent.hpp new file mode 100644 index 0000000000..7ee8edd384 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockLightDampeningComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockLightDampeningComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockLightDampeningComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLIGHTDAMPENINGCOMPONENT +public: + struct BlockLightDampeningComponent& operator=(struct BlockLightDampeningComponent const &) = delete; + BlockLightDampeningComponent(struct BlockLightDampeningComponent const &) = delete; + BlockLightDampeningComponent() = delete; +#endif + +public: + /** + * @symbol ?usesNewComponentStorage\@BlockLightDampeningComponent\@\@SA_NXZ + */ + MCAPI static bool usesNewComponentStorage(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp index 69b9da9b64..b9f154d879 100644 --- a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp @@ -36,9 +36,9 @@ struct BlockLightDampeningDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockLightDampeningDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeComponent\@BlockLightDampeningDescription\@\@UEBAXAEAVBlockComponentStorage\@\@\@Z */ - virtual void initializeComponent(class EntityContext &) const; + virtual void initializeComponent(class BlockComponentStorage &) const; /** * @vftbl 3 * @symbol __unk_vfn_3 @@ -51,16 +51,21 @@ struct BlockLightDampeningDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockLightDampeningDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockLightDampeningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockLightDampeningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockLightEmissionComponent.hpp b/LiteLoader/include/llapi/mc/BlockLightEmissionComponent.hpp new file mode 100644 index 0000000000..317837fca0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockLightEmissionComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockLightEmissionComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockLightEmissionComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLIGHTEMISSIONCOMPONENT +public: + struct BlockLightEmissionComponent& operator=(struct BlockLightEmissionComponent const &) = delete; + BlockLightEmissionComponent(struct BlockLightEmissionComponent const &) = delete; + BlockLightEmissionComponent() = delete; +#endif + +public: + /** + * @symbol ?usesNewComponentStorage\@BlockLightEmissionComponent\@\@SA_NXZ + */ + MCAPI static bool usesNewComponentStorage(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp index 586de958f1..10bf6a4bb7 100644 --- a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp @@ -38,9 +38,9 @@ struct BlockLightEmissionDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockLightEmissionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeComponent\@BlockLightEmissionDescription\@\@UEBAXAEAVBlockComponentStorage\@\@\@Z */ - virtual void initializeComponent(class EntityContext &) const; + virtual void initializeComponent(class BlockComponentStorage &) const; /** * @vftbl 3 * @symbol __unk_vfn_3 @@ -53,16 +53,21 @@ struct BlockLightEmissionDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockLightEmissionDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockLightEmissionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockLightEmissionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockLootComponent.hpp b/LiteLoader/include/llapi/mc/BlockLootComponent.hpp index c0e0843749..3cab6d766c 100644 --- a/LiteLoader/include/llapi/mc/BlockLootComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockLootComponent.hpp @@ -23,6 +23,12 @@ struct BlockLootComponent { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKLOOTCOMPONENT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockLootComponent(); +#endif /** * @symbol ??0BlockLootComponent\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp index 13dfdce59b..f9af517e65 100644 --- a/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp @@ -36,6 +36,11 @@ struct BlockLootComponentDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockLootComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; diff --git a/LiteLoader/include/llapi/mc/BlockMapColorComponent.hpp b/LiteLoader/include/llapi/mc/BlockMapColorComponent.hpp new file mode 100644 index 0000000000..c5a8254de5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockMapColorComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockMapColorComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockMapColorComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMAPCOLORCOMPONENT +public: + struct BlockMapColorComponent& operator=(struct BlockMapColorComponent const &) = delete; + BlockMapColorComponent(struct BlockMapColorComponent const &) = delete; + BlockMapColorComponent() = delete; +#endif + +public: + /** + * @symbol ?usesNewComponentStorage\@BlockMapColorComponent\@\@SA_NXZ + */ + MCAPI static bool usesNewComponentStorage(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp index 81b005f28e..79f9a1b001 100644 --- a/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp @@ -38,9 +38,9 @@ struct BlockMapColorDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockMapColorDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeComponent\@BlockMapColorDescription\@\@UEBAXAEAVBlockComponentStorage\@\@\@Z */ - virtual void initializeComponent(class EntityContext &) const; + virtual void initializeComponent(class BlockComponentStorage &) const; /** * @symbol ?NameID\@BlockMapColorDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp index 4d587fd890..ab01a4751a 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp @@ -26,14 +26,14 @@ struct BlockMaterialInstance { #endif public: - /** - * @symbol ??4BlockMaterialInstance\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct BlockMaterialInstance & operator=(struct BlockMaterialInstance const &); /** * @symbol ??4BlockMaterialInstance\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockMaterialInstance & operator=(struct BlockMaterialInstance &&); + /** + * @symbol ??4BlockMaterialInstance\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct BlockMaterialInstance & operator=(struct BlockMaterialInstance const &); /** * @symbol ??1BlockMaterialInstance\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp index 4c0d778fcf..1c50b4c57d 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp @@ -38,31 +38,36 @@ struct BlockMaterialInstancesDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockMaterialInstancesDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 + * @vftbl 4 * @symbol ?initializeComponentFromCode\@BlockMaterialInstancesDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponentFromCode(class EntityContext &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 5 + * @symbol __unk_vfn_5 */ - virtual void __unk_vfn_4(); + virtual void __unk_vfn_5(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockMaterialInstancesDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockMaterialInstancesDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockMaterialInstancesDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierComponent.hpp b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierComponent.hpp deleted file mode 100644 index 3f55f1f0ee..0000000000 --- a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierComponent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file BlockMovementSlowdownMultiplierComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct BlockMovementSlowdownMultiplierComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMOVEMENTSLOWDOWNMULTIPLIERCOMPONENT -public: - struct BlockMovementSlowdownMultiplierComponent& operator=(struct BlockMovementSlowdownMultiplierComponent const &) = delete; - BlockMovementSlowdownMultiplierComponent(struct BlockMovementSlowdownMultiplierComponent const &) = delete; - BlockMovementSlowdownMultiplierComponent() = delete; -#endif - -public: - /** - * @symbol ?setMultiplier\@BlockMovementSlowdownMultiplierComponent\@\@QEAAXAEBVVec3\@\@\@Z - */ - MCAPI void setMultiplier(class Vec3 const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp index f353f5e9fd..f21aae2e09 100644 --- a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp @@ -10,78 +10,51 @@ #undef BEFORE_EXTRA -/** - * @brief MC class BlockMovementSlowdownMultiplierSystem. - * - */ -class BlockMovementSlowdownMultiplierSystem { + +namespace BlockMovementSlowdownMultiplierSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMOVEMENTSLOWDOWNMULTIPLIERSYSTEM -public: - class BlockMovementSlowdownMultiplierSystem& operator=(class BlockMovementSlowdownMultiplierSystem const &) = delete; - BlockMovementSlowdownMultiplierSystem(class BlockMovementSlowdownMultiplierSystem const &) = delete; - BlockMovementSlowdownMultiplierSystem() = delete; -#endif - -public: - /** - * @symbol ?_adjustFallDistance\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUBlockMovementSlowdownAppliedComponent\@\@AEAUFallDistanceComponent\@\@\@Z - */ - MCAPI static void _adjustFallDistance(class StrictEntityContext const &, struct BlockMovementSlowdownAppliedComponent const &, struct FallDistanceComponent &); - /** - * @symbol ?_adjustFallDistanceWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUBlockMovementSlowdownAppliedComponent\@\@UFallDistanceComponent\@\@\@\@\@Z - */ - MCAPI static void _adjustFallDistanceWrapper(class ViewT); - /** - * @symbol ?_applySlowdownOnMove\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@\@Z - */ - MCAPI static void _applySlowdownOnMove(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, struct MoveRequestComponent &, struct StateVectorComponent &); - /** - * @symbol ?_applySlowdownOnMoveWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@UMoveRequestComponent\@\@UStateVectorComponent\@\@\@\@\@Z - */ - MCAPI static void _applySlowdownOnMoveWrapper(class ViewT); /** - * @symbol ?_immunePlayer\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEBUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + * @symbol ?createAdjustFallDistanceSystem\@BlockMovementSlowdownMultiplierSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void _immunePlayer(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, struct AbilitiesComponent const &, class EntityModifierT); + MCAPI struct TickingSystemWithInfo createAdjustFallDistanceSystem(); /** - * @symbol ?_immunePlayerWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@U?$Include\@UBlockMovementSlowdownAppliedComponent\@\@\@\@$$CBUAbilitiesComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + * @symbol ?createApplySlowdownOnMoveSystem\@BlockMovementSlowdownMultiplierSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void _immunePlayerWrapper(class ViewT, struct AbilitiesComponent const>, class EntityModifierT); + MCAPI struct TickingSystemWithInfo createApplySlowdownOnMoveSystem(); /** - * @symbol ?_immuneSlowdown\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + * @symbol ?createCleanupSystem\@BlockMovementSlowdownMultiplierSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void _immuneSlowdown(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, class EntityModifierT); + MCAPI struct TickingSystemWithInfo createCleanupSystem(); /** - * @symbol ?_immuneWitherBossWrapper\@BlockMovementSlowdownMultiplierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@U?$Include\@V?$FlagComponent\@UWitherBossFlag\@\@\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + * @symbol ?createImmunePlayerSystem\@BlockMovementSlowdownMultiplierSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void _immuneWitherBossWrapper(class ViewT, struct BlockMovementSlowdownAppliedComponent>>, class EntityModifierT); + MCAPI struct TickingSystemWithInfo createImmunePlayerSystem(); /** - * @symbol ?createAdjustFallDistanceSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createImmuneSpiderSystem\@BlockMovementSlowdownMultiplierSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createAdjustFallDistanceSystem(); + MCAPI struct TickingSystemWithInfo createImmuneSpiderSystem(); /** - * @symbol ?createApplySlowdownOnMoveSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createImmuneWitherBossSystem\@BlockMovementSlowdownMultiplierSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createApplySlowdownOnMoveSystem(); + MCAPI struct TickingSystemWithInfo createImmuneWitherBossSystem(); /** - * @symbol ?createCleanupSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tickAdjustFallDistance\@BlockMovementSlowdownMultiplierSystem\@\@YAXAEBUBlockMovementSlowdownAppliedComponent\@\@AEAUFallDistanceComponent\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createCleanupSystem(); + MCAPI void tickAdjustFallDistance(struct BlockMovementSlowdownAppliedComponent const &, struct FallDistanceComponent &); /** - * @symbol ?createImmunePlayerSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tickApplySlowdownOnMove\@BlockMovementSlowdownMultiplierSystem\@\@YAXAEAUBlockMovementSlowdownMultiplierComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createImmunePlayerSystem(); + MCAPI void tickApplySlowdownOnMove(struct BlockMovementSlowdownMultiplierComponent &, struct MoveRequestComponent &, struct StateVectorComponent &); /** - * @symbol ?createImmuneSpiderSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tickImmunePlayer\@BlockMovementSlowdownMultiplierSystem\@\@YAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEBUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createImmuneSpiderSystem(); + MCAPI void tickImmunePlayer(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, struct AbilitiesComponent const &, class EntityModifierT); /** - * @symbol ?createImmuneWitherBossSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tickImmuneSlowdown\@BlockMovementSlowdownMultiplierSystem\@\@YAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createImmuneWitherBossSystem(); + MCAPI void tickImmuneSlowdown(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, class EntityModifierT); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockPalette.hpp b/LiteLoader/include/llapi/mc/BlockPalette.hpp index a1c1a43fbd..ddb12d290e 100644 --- a/LiteLoader/include/llapi/mc/BlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/BlockPalette.hpp @@ -65,14 +65,14 @@ class BlockPalette { */ MCVAPI ~BlockPalette(); #endif - /** - * @symbol ??0BlockPalette\@\@QEAA\@UConstructorToken\@0\@\@Z - */ - MCAPI BlockPalette(struct BlockPalette::ConstructorToken); /** * @symbol ??0BlockPalette\@\@QEAA\@AEAVLevel\@\@\@Z */ MCAPI BlockPalette(class Level &); + /** + * @symbol ??0BlockPalette\@\@QEAA\@UConstructorToken\@0\@\@Z + */ + MCAPI BlockPalette(struct BlockPalette::ConstructorToken); /** * @symbol ?cacheBlockComponentData\@BlockPalette\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp index 04d5f0015a..e4b90f25e0 100644 --- a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp +++ b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp @@ -37,14 +37,14 @@ class BlockPatternBuilder { * @symbol ?build\@BlockPatternBuilder\@\@QEAAAEAV1\@XZ */ MCAPI class BlockPatternBuilder & build(); - /** - * @symbol ?define\@BlockPatternBuilder\@\@QEAAAEAV1\@DV?$function\@$$A6A_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z\@std\@\@\@Z - */ - MCAPI class BlockPatternBuilder & define(char, class std::function); /** * @symbol ?define\@BlockPatternBuilder\@\@QEAAAEAV1\@DAEBVBlock\@\@\@Z */ MCAPI class BlockPatternBuilder & define(char, class Block const &); + /** + * @symbol ?define\@BlockPatternBuilder\@\@QEAAAEAV1\@DV?$function\@$$A6A_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z\@std\@\@\@Z + */ + MCAPI class BlockPatternBuilder & define(char, class std::function); /** * @symbol ?isReadyForMatch\@BlockPatternBuilder\@\@QEAA_NXZ */ @@ -53,14 +53,14 @@ class BlockPatternBuilder { * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@\@Z */ MCAPI struct BuildMatch match(class BlockPos const &); - /** - * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HHEE\@Z - */ - MCAPI struct BuildMatch match(class BlockPos const &, int, int, unsigned char, unsigned char); /** * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI struct BuildMatch match(class BlockPos const &, int, int); + /** + * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HHEE\@Z + */ + MCAPI struct BuildMatch match(class BlockPos const &, int, int, unsigned char, unsigned char); /** * @symbol ?replaceBlocks\@BlockPatternBuilder\@\@QEAAXDUBuildMatch\@\@AEBVBlock\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp index 283ebdec06..ba8a054278 100644 --- a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class BlockPickRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BlockPickRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BlockPickRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0BlockPickRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp index d986ad491d..1390c3267d 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp @@ -38,14 +38,14 @@ struct BlockPlacementFilterDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockPlacementFilterDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@BlockPlacementFilterDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -53,16 +53,21 @@ struct BlockPlacementFilterDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockPlacementFilterDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockPlacementFilterDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockPlacementFilterDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp index f498c7dcd8..e685106472 100644 --- a/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp @@ -57,10 +57,10 @@ class BlockPlanterItem : public ComponentItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/BlockPropertyToStateConverter.hpp b/LiteLoader/include/llapi/mc/BlockPropertyToStateConverter.hpp new file mode 100644 index 0000000000..f63977b2f4 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockPropertyToStateConverter.hpp @@ -0,0 +1,33 @@ +/** + * @file BlockPropertyToStateConverter.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Json.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace BlockPropertyToStateConverter { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_convertPropertyToStateInDescription\@BlockPropertyToStateConverter\@\@YAXAEAVValue\@Json\@\@\@Z + */ + MCAPI void _convertPropertyToStateInDescription(class Json::Value &); + /** + * @symbol ?_copyMembers\@BlockPropertyToStateConverter\@\@YAXAEAVValue\@Json\@\@0\@Z + */ + MCAPI void _copyMembers(class Json::Value &, class Json::Value &); + /** + * @symbol ?checkAndConvert\@BlockPropertyToStateConverter\@\@YAXAEBVSemVersion\@\@AEAVValue\@Json\@\@\@Z + */ + MCAPI void checkAndConvert(class SemVersion const &, class Json::Value &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp b/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp index 82578e7e7d..757bc277bd 100644 --- a/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp @@ -29,13 +29,15 @@ struct BlockQueuedTickingComponent { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKQUEUEDTICKINGCOMPONENT /** - * @symbol ??0BlockQueuedTickingComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI BlockQueuedTickingComponent(struct BlockQueuedTickingComponent &&); + MCVAPI ~BlockQueuedTickingComponent(); +#endif /** - * @symbol ??1BlockQueuedTickingComponent\@\@QEAA\@XZ + * @symbol ??0BlockQueuedTickingComponent\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI ~BlockQueuedTickingComponent(); + MCAPI BlockQueuedTickingComponent(struct BlockQueuedTickingComponent &&); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp index 836cacfdb1..95a4f8d1b6 100644 --- a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp @@ -37,6 +37,11 @@ struct BlockQueuedTickingDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockQueuedTickingDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; diff --git a/LiteLoader/include/llapi/mc/BlockRandomTickEvent.hpp b/LiteLoader/include/llapi/mc/BlockRandomTickEvent.hpp new file mode 100644 index 0000000000..df69939a88 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockRandomTickEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file BlockRandomTickEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockRandomTickEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKRANDOMTICKEVENT +public: + struct BlockRandomTickEvent& operator=(struct BlockRandomTickEvent const &) = delete; + BlockRandomTickEvent(struct BlockRandomTickEvent const &) = delete; + BlockRandomTickEvent() = delete; +#endif + +public: + /** + * @symbol ??1BlockRandomTickEvent\@\@QEAA\@XZ + */ + MCAPI ~BlockRandomTickEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp b/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp index 10d5ccc47c..b53cc17393 100644 --- a/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp @@ -27,9 +27,15 @@ struct BlockRandomTickingComponent { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKRANDOMTICKINGCOMPONENT /** - * @symbol ??1BlockRandomTickingComponent\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~BlockRandomTickingComponent(); + MCVAPI ~BlockRandomTickingComponent(); +#endif + /** + * @symbol ??0BlockRandomTickingComponent\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI BlockRandomTickingComponent(struct BlockRandomTickingComponent &&); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp b/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp index 0a4fe35ee7..234b423275 100644 --- a/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp @@ -38,6 +38,11 @@ struct BlockRandomTickingDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockRandomTickingDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxComponent.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxComponent.hpp new file mode 100644 index 0000000000..5b4bb5ced4 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxComponent.hpp @@ -0,0 +1,28 @@ +/** + * @file BlockSelectionBoxComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct BlockSelectionBoxComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSELECTIONBOXCOMPONENT +public: + struct BlockSelectionBoxComponent& operator=(struct BlockSelectionBoxComponent const &) = delete; + BlockSelectionBoxComponent(struct BlockSelectionBoxComponent const &) = delete; + BlockSelectionBoxComponent() = delete; +#endif + +public: + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp index 82fbc8da65..188fb7be0d 100644 --- a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp @@ -36,31 +36,36 @@ struct BlockSelectionBoxDescription { virtual std::string const & getName() const; /** * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 * @symbol ?initializeComponent\@BlockSelectionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 + * @vftbl 4 * @symbol ?initializeComponentFromCode\@BlockSelectionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponentFromCode(class EntityContext &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 5 + * @symbol __unk_vfn_5 */ - virtual void __unk_vfn_4(); + virtual void __unk_vfn_5(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockSelectionBoxDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockSelectionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockSelectionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockSource.hpp b/LiteLoader/include/llapi/mc/BlockSource.hpp index e440bde7a8..3dfa1da3cb 100644 --- a/LiteLoader/include/llapi/mc/BlockSource.hpp +++ b/LiteLoader/include/llapi/mc/BlockSource.hpp @@ -353,14 +353,14 @@ struct ClipParameters * @symbol ?checkValidity\@BlockSource\@\@QEBAXXZ */ MCAPI void checkValidity() const; - /** - * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBVVec3\@\@0_N1H11PEAVPlayer\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z - */ - MCAPI class HitResult clip(class Vec3 const &, class Vec3 const &, bool, bool, int, bool, bool, class Player *, class std::function const &) const; /** * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBUClipParameters\@\@\@Z */ MCAPI class HitResult clip(struct ClipParameters const &) const; + /** + * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBVVec3\@\@0_N1H11PEAVPlayer\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z + */ + MCAPI class HitResult clip(class Vec3 const &, class Vec3 const &, bool, bool, int, bool, bool, class Player *, class std::function const &) const; /** * @symbol ?containsAnyBlockInBox\@BlockSource\@\@QEAA_NAEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ @@ -393,14 +393,14 @@ struct ClipParameters * @symbol ?fetchBlockEntities\@BlockSource\@\@QEBA?AV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@W4BlockActorType\@\@AEBVAABB\@\@\@Z */ MCAPI std::vector fetchBlockEntities(enum class BlockActorType, class AABB const &) const; - /** - * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAAEBV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z - */ - MCAPI std::vector const & fetchBlockEntities(class AABB const &); /** * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAXAEBVAABB\@\@AEAV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI void fetchBlockEntities(class AABB const &, std::vector &, bool); + /** + * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAAEBV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z + */ + MCAPI std::vector const & fetchBlockEntities(class AABB const &); /** * @symbol ?fetchBlocks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z */ @@ -465,10 +465,6 @@ struct ClipParameters * @symbol ?fireEntityChanged\@BlockSource\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void fireEntityChanged(class Actor &); - /** - * @symbol ?getAABBFetchResultCache\@BlockSource\@\@QEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector & getAABBFetchResultCache(); /** * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFHH_N0\@Z */ @@ -497,14 +493,14 @@ struct ClipParameters * @symbol ?getBrightnessPair\@BlockSource\@\@QEBA?AUBrightnessPair\@\@AEBVBlockPos\@\@\@Z */ MCAPI struct BrightnessPair getBrightnessPair(class BlockPos const &) const; - /** - * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@HH\@Z - */ - MCAPI class LevelChunk * getChunk(int, int) const; /** * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z */ MCAPI class LevelChunk * getChunk(class ChunkPos const &) const; + /** + * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@HH\@Z + */ + MCAPI class LevelChunk * getChunk(int, int) const; /** * @symbol ?getConstBiome\@BlockSource\@\@QEBAAEBVBiome\@\@AEBVBlockPos\@\@\@Z */ @@ -517,26 +513,26 @@ struct ClipParameters * @symbol ?getGrassColor\@BlockSource\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getGrassColor(class BlockPos const &) const; - /** - * @symbol ?getHeightmap\@BlockSource\@\@QEBAFAEBVBlockPos\@\@\@Z - */ - MCAPI short getHeightmap(class BlockPos const &) const; /** * @symbol ?getHeightmap\@BlockSource\@\@QEAAFHH\@Z */ MCAPI short getHeightmap(int, int); /** - * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z + * @symbol ?getHeightmap\@BlockSource\@\@QEBAFAEBVBlockPos\@\@\@Z */ - MCAPI class BlockPos getHeightmapPos(class BlockPos const &) const; + MCAPI short getHeightmap(class BlockPos const &) const; /** - * @symbol ?getLevel\@BlockSource\@\@QEAAAEAVLevel\@\@XZ + * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z */ - MCAPI class Level & getLevel(); + MCAPI class BlockPos getHeightmapPos(class BlockPos const &) const; /** * @symbol ?getLevel\@BlockSource\@\@QEBAAEAVLevel\@\@XZ */ MCAPI class Level & getLevel() const; + /** + * @symbol ?getLevel\@BlockSource\@\@QEAAAEAVLevel\@\@XZ + */ + MCAPI class Level & getLevel(); /** * @symbol ?getLevelConst\@BlockSource\@\@QEBAAEBVLevel\@\@XZ */ @@ -581,38 +577,38 @@ struct ClipParameters * @symbol ?hasSubChunksAt\@BlockSource\@\@QEBA?AU?$pair\@_NV?$optional\@VSubChunkPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0\@Z */ MCAPI struct std::pair> hasSubChunksAt(class BlockPos const &, class BlockPos const &) const; - /** - * @symbol ?hasTickInCurrentTick\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z - */ - MCAPI bool hasTickInCurrentTick(class BlockPos const &, enum class TickingQueueType) const; /** * @symbol ?hasTickInCurrentTick\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool hasTickInCurrentTick(class BlockPos const &) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInCurrentTick\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const; + MCAPI bool hasTickInCurrentTick(class BlockPos const &, enum class TickingQueueType) const; /** * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z */ MCAPI bool hasTickInPendingTicks(class BlockPos const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &) const; + /** + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + */ + MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; /** * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z */ MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &, enum class TickingQueueType) const; /** * @symbol ?hasUntickedNeighborChunk\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@H\@Z */ @@ -657,14 +653,14 @@ struct ClipParameters * @symbol ?isUnderWater\@BlockSource\@\@QEBA_NAEBVVec3\@\@AEBVBlock\@\@\@Z */ MCAPI bool isUnderWater(class Vec3 const &, class Block const &) const; - /** - * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z - */ - MCAPI bool isUnobstructedByEntities(class AABB const &, class gsl::span, -1>); /** * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@PEBVActor\@\@\@Z */ MCAPI bool isUnobstructedByEntities(class AABB const &, class Actor const *); + /** + * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z + */ + MCAPI bool isUnobstructedByEntities(class AABB const &, class gsl::span, -1>); /** * @symbol ?isWithinHeightLimits\@BlockSource\@\@QEBA_NH\@Z */ @@ -677,22 +673,22 @@ struct ClipParameters * @symbol ?neighborChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0\@Z */ MCAPI void neighborChanged(class BlockPos const &, class BlockPos const &); - /** - * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVVec3\@\@PEBVBlock\@\@\@Z - */ - MCAPI void postGameEvent(class Actor *, class GameEvent const &, class Vec3 const &, class Block const *); /** * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z */ MCAPI void postGameEvent(class Actor *, class GameEvent const &, class BlockPos const &, class Block const *); /** - * @symbol ?removeBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVVec3\@\@PEBVBlock\@\@\@Z */ - MCAPI bool removeBlock(class BlockPos const &); + MCAPI void postGameEvent(class Actor *, class GameEvent const &, class Vec3 const &, class Block const *); /** * @symbol ?removeBlock\@BlockSource\@\@QEAA_NHHH\@Z */ MCAPI bool removeBlock(int, int, int); + /** + * @symbol ?removeBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z + */ + MCAPI bool removeBlock(class BlockPos const &); /** * @symbol ?removeBlockEntity\@BlockSource\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ @@ -777,10 +773,6 @@ struct ClipParameters * @symbol ?updateNeighborsAtExceptFromFacing\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0H\@Z */ MCAPI void updateNeighborsAtExceptFromFacing(class BlockPos const &, class BlockPos const &, int); - /** - * @symbol ?containsAnyLiquid\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@\@Z - */ - MCAPI static bool containsAnyLiquid(class IConstBlockSource const &, class AABB const &); /** * @symbol ?containsMaterial\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@W4MaterialType\@\@\@Z */ @@ -789,10 +781,6 @@ struct ClipParameters * @symbol ?doesIntersect\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBVGetCollisionShapeInterface\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI static bool doesIntersect(class IConstBlockSource const &, class AABB const &, class GetCollisionShapeInterface const &, std::vector &, bool); - /** - * @symbol ?getLiquidBlock\@BlockSource\@\@SAAEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI static class Block const & getLiquidBlock(class IConstBlockSource const &, class BlockPos const &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/BlockState.hpp b/LiteLoader/include/llapi/mc/BlockState.hpp index 0c5272beca..b66f9ddece 100644 --- a/LiteLoader/include/llapi/mc/BlockState.hpp +++ b/LiteLoader/include/llapi/mc/BlockState.hpp @@ -8,12 +8,27 @@ #define BEFORE_EXTRA +#include "HashedString.hpp" + #undef BEFORE_EXTRA class BlockState { #define AFTER_EXTRA +public: + class StateListNode { + public: + BlockState::StateListNode* mNext; + BlockState::StateListNode* mPrev; + BlockState* mState; + }; + + int (**_vptr_BlockState)(void); + const size_t mID; + const size_t mVariationCount; + const class HashedString mName; + StateListNode mNode; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSTATE diff --git a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp index cc667d0ba2..a27d0b04a0 100644 --- a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp +++ b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp @@ -40,14 +40,14 @@ class TickDataSet { * @symbol ?acquireAllRandomTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void acquireAllRandomTicks(class LevelChunk &); - /** - * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z - */ - MCAPI void acquireAllTicks(class LevelChunk &); /** * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAV1\@\@Z */ MCAPI void acquireAllTicks(class BlockTickingQueue &); + /** + * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z + */ + MCAPI void acquireAllTicks(class LevelChunk &); /** * @symbol ?add\@BlockTickingQueue\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@HH\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockTraitConversionUtils.hpp b/LiteLoader/include/llapi/mc/BlockTraitConversionUtils.hpp index 1b1505e99b..b29769b01b 100644 --- a/LiteLoader/include/llapi/mc/BlockTraitConversionUtils.hpp +++ b/LiteLoader/include/llapi/mc/BlockTraitConversionUtils.hpp @@ -24,5 +24,13 @@ namespace BlockTraitConversionUtils { * @symbol ?cardinalDirectionStateSetter\@BlockTraitConversionUtils\@\@3V?$function\@$$A6APEBVBlock\@\@AEBVBlockLegacy\@\@HH\@Z\@std\@\@A */ MCAPI extern class std::function cardinalDirectionStateSetter; + /** + * @symbol ?observerFacingDirectionStateGetter\@BlockTraitConversionUtils\@\@3V?$function\@$$A6A?AV?$optional\@H\@std\@\@AEBVBlockLegacy\@\@H\@Z\@std\@\@A + */ + MCAPI extern class std::function (class BlockLegacy const &, int)> observerFacingDirectionStateGetter; + /** + * @symbol ?observerFacingDirectionStateSetter\@BlockTraitConversionUtils\@\@3V?$function\@$$A6APEBVBlock\@\@AEBVBlockLegacy\@\@HH\@Z\@std\@\@A + */ + MCAPI extern class std::function observerFacingDirectionStateSetter; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BlockTraitFactory.hpp b/LiteLoader/include/llapi/mc/BlockTraitFactory.hpp index ffced2e702..d8ce842fe0 100644 --- a/LiteLoader/include/llapi/mc/BlockTraitFactory.hpp +++ b/LiteLoader/include/llapi/mc/BlockTraitFactory.hpp @@ -24,10 +24,6 @@ class BlockTraitFactory { #endif public: - /** - * @symbol ?createTrait\@BlockTraitFactory\@\@QEBA?AV?$unique_ptr\@VITrait\@BlockTrait\@\@U?$default_delete\@VITrait\@BlockTrait\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z - */ - MCAPI std::unique_ptr createTrait(std::string const &) const; /** * @symbol ??1BlockTraitFactory\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp b/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp index 12910f78f5..f3b1e7f49a 100644 --- a/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockTransformationComponent.hpp @@ -24,14 +24,14 @@ class BlockTransformationComponent { #endif public: - /** - * @symbol ??0BlockTransformationComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI BlockTransformationComponent(class BlockTransformationComponent &&); /** * @symbol ??0BlockTransformationComponent\@\@QEAA\@AEBVVec3\@\@AEBURotationType\@0\@0\@Z */ MCAPI BlockTransformationComponent(class Vec3 const &, struct BlockTransformationComponent::RotationType const &, class Vec3 const &); + /** + * @symbol ??0BlockTransformationComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI BlockTransformationComponent(class BlockTransformationComponent &&); /** * @symbol ?getTransformationMatrix\@BlockTransformationComponent\@\@QEBAAEBVMatrix\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp b/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp index 37b7519c3d..ae0f5b8e7f 100644 --- a/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockTransformationDescription.hpp @@ -35,14 +35,14 @@ struct BlockTransformationDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockTransformationDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@BlockTransformationDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -50,16 +50,21 @@ struct BlockTransformationDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockTransformationDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockTransformationDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockTransformationDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp index 6b8b46d882..db23b0625b 100644 --- a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp @@ -39,6 +39,10 @@ class BlockTypeRegistry { * @symbol ?computeBlockTypeRegistryChecksum\@BlockTypeRegistry\@\@SA_KAEBVBaseGameVersion\@\@\@Z */ MCAPI static unsigned __int64 computeBlockTypeRegistryChecksum(class BaseGameVersion const &); + /** + * @symbol ?finalizeBlockComponentStorage\@BlockTypeRegistry\@\@SAXXZ + */ + MCAPI static void finalizeBlockComponentStorage(); /** * @symbol ?forEachBlock\@BlockTypeRegistry\@\@SAXV?$function\@$$A6A_NAEBVBlockLegacy\@\@\@Z\@std\@\@\@Z */ @@ -83,14 +87,14 @@ class BlockTypeRegistry { * @symbol ?lookupByName\@BlockTypeRegistry\@\@SA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@AEBVHashedString\@\@_N\@Z */ MCAPI static class WeakPtr lookupByName(class HashedString const &, bool); - /** - * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@H_N\@Z - */ - MCAPI static class Block const * lookupByName(class HashedString const &, int, bool); /** * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI static class Block const * lookupByName(class HashedString const &, std::vector const &, bool); + /** + * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@H_N\@Z + */ + MCAPI static class Block const * lookupByName(class HashedString const &, int, bool); /** * @symbol ?prepareBlocks\@BlockTypeRegistry\@\@SAXI\@Z */ diff --git a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp index 3f822c7fbe..2146c8d3bc 100644 --- a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp @@ -38,14 +38,14 @@ struct BlockUnitCubeDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockUnitCubeDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeFromNetwork\@BlockUnitCubeDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ - virtual void initializeComponent(class EntityContext &) const; + virtual void initializeFromNetwork(class CompoundTag const &); /** * @vftbl 3 - * @symbol ?initializeFromNetwork\@BlockUnitCubeDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?initializeComponent\@BlockUnitCubeDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void initializeFromNetwork(class CompoundTag const &); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -53,11 +53,16 @@ struct BlockUnitCubeDescription { virtual void __unk_vfn_4(); /** * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockUnitCubeDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockUnitCubeDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; diff --git a/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp b/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp index 32a3c5bbec..c0da63f446 100644 --- a/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp @@ -42,31 +42,36 @@ class BlockUnwalkableDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@BlockUnwalkableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@BlockUnwalkableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?buildSchema\@BlockUnwalkableDescription\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class BlockComponentFactory const &) const; /** - * @vftbl 5 + * @vftbl 6 * @symbol ?isNetworkComponent\@BlockUnwalkableDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@BlockUnwalkableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@BlockUnwalkableDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/BlueIceBlock.hpp b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp index c16aeb2be4..e94501e1c4 100644 --- a/LiteLoader/include/llapi/mc/BlueIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp @@ -36,20 +36,10 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BlueIceBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BlueIceBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BlueIceBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,57 +171,62 @@ class BlueIceBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@BlueIceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Boat.hpp b/LiteLoader/include/llapi/mc/Boat.hpp index caa6a25166..26702180b3 100644 --- a/LiteLoader/include/llapi/mc/Boat.hpp +++ b/LiteLoader/include/llapi/mc/Boat.hpp @@ -51,162 +51,157 @@ class Boat : public Actor { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Boat\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 55 + * @vftbl 49 * @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 &, enum class InputMode, enum class NewInteractionModel) const; /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@Boat\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Boat\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 - */ - virtual void __unk_vfn_86(); - /** - * @vftbl 88 - * @symbol ?onAboveBubbleColumn\@Boat\@\@UEAAX_N\@Z + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void onAboveBubbleColumn(bool); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Boat\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Boat\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 178 + * @vftbl 166 * @symbol ?getControllingPlayer\@Boat\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 186 + * @vftbl 174 * @symbol ?canAddPassenger\@Boat\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 219 + * @vftbl 206 * @symbol ?getPassengerYRotation\@Boat\@\@UEBAMAEBVActor\@\@\@Z */ virtual float getPassengerYRotation(class Actor const &) const; /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Boat\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?destroy\@Boat\@\@UEAAXPEAVActor\@\@\@Z */ virtual void destroy(class Actor *); diff --git a/LiteLoader/include/llapi/mc/BoatItem.hpp b/LiteLoader/include/llapi/mc/BoatItem.hpp index 4edf7d8f3d..3b3996bf7a 100644 --- a/LiteLoader/include/llapi/mc/BoatItem.hpp +++ b/LiteLoader/include/llapi/mc/BoatItem.hpp @@ -52,10 +52,10 @@ class BoatItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 46 * @symbol ?isStackedByData\@BoatItem\@\@UEBA_NXZ @@ -142,12 +142,12 @@ class BoatItem : public Item { */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BoatItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?_getActorType\@BoatItem\@\@EEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType _getActorType() const; diff --git a/LiteLoader/include/llapi/mc/BoneMealItem.hpp b/LiteLoader/include/llapi/mc/BoneMealItem.hpp new file mode 100644 index 0000000000..3afd86dc21 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BoneMealItem.hpp @@ -0,0 +1,139 @@ +/** + * @file BoneMealItem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Json.hpp" +#include "FertilizerItem.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BoneMealItem : public FertilizerItem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BONEMEALITEM +public: + class BoneMealItem& operator=(class BoneMealItem const &) = delete; + BoneMealItem(class BoneMealItem const &) = delete; + BoneMealItem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol ?isDye\@BoneMealItem\@\@UEBA_NXZ + */ + virtual bool isDye() const; + /** + * @vftbl 20 + * @symbol ?getItemColor\@BoneMealItem\@\@UEBA?AW4ItemColor\@\@XZ + */ + virtual enum class ItemColor getItemColor() const; + /** + * @vftbl 21 + * @symbol __unk_vfn_21 + */ + virtual void __unk_vfn_21(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 66 + * @symbol __unk_vfn_66 + */ + virtual void __unk_vfn_66(); + /** + * @vftbl 67 + * @symbol ?isValidAuxValue\@BoneMealItem\@\@UEBA_NH\@Z + */ + virtual bool isValidAuxValue(int) const; + /** + * @vftbl 70 + * @symbol __unk_vfn_70 + */ + virtual void __unk_vfn_70(); + /** + * @vftbl 71 + * @symbol __unk_vfn_71 + */ + virtual void __unk_vfn_71(); + /** + * @vftbl 72 + * @symbol __unk_vfn_72 + */ + virtual void __unk_vfn_72(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 79 + * @symbol __unk_vfn_79 + */ + virtual void __unk_vfn_79(); + /** + * @vftbl 80 + * @symbol __unk_vfn_80 + */ + virtual void __unk_vfn_80(); + /** + * @vftbl 95 + * @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; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 119 + * @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); + /** + * @symbol ??0BoneMealItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + */ + MCAPI BoneMealItem(std::string const &, int, bool); + +}; diff --git a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp index e09a2d08cc..e22a2d8102 100644 --- a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp @@ -70,14 +70,14 @@ class BookCloningRecipe : public Recipe { * @symbol ?size\@BookCloningRecipe\@\@UEBAHXZ */ virtual int size() const; - /** - * @symbol ??0BookCloningRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z - */ - MCAPI BookCloningRecipe(class std::basic_string_view>, class mce::UUID const &); /** * @symbol ??0BookCloningRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI BookCloningRecipe(class std::basic_string_view>); + /** + * @symbol ??0BookCloningRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z + */ + MCAPI BookCloningRecipe(class std::basic_string_view>, class mce::UUID const &); /** * @symbol ?ID\@BookCloningRecipe\@\@2VUUID\@mce\@\@B */ diff --git a/LiteLoader/include/llapi/mc/BookEditPacket.hpp b/LiteLoader/include/llapi/mc/BookEditPacket.hpp index 74bedfcff4..ae73f4e461 100644 --- a/LiteLoader/include/llapi/mc/BookEditPacket.hpp +++ b/LiteLoader/include/llapi/mc/BookEditPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -50,9 +51,9 @@ class BookEditPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BookEditPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BookEditPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOOKEDITPACKET /** * @symbol __unk_destructor_-1 @@ -74,9 +75,9 @@ class BookEditPacket : public Packet { //private: /** - * @symbol ?_readPage\@BookEditPacket\@\@AEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_readPage\@BookEditPacket\@\@AEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI void _readPage(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result _readPage(class ReadOnlyBinaryStream &); /** * @symbol ?_writePage\@BookEditPacket\@\@AEBAXAEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp index 677e76e5e2..4ea7768a21 100644 --- a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp @@ -36,20 +36,10 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BookshelfBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BookshelfBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BookshelfBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class BookshelfBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@BookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@BookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BorderBlock.hpp b/LiteLoader/include/llapi/mc/BorderBlock.hpp index e0aa5b4779..bff88ef33d 100644 --- a/LiteLoader/include/llapi/mc/BorderBlock.hpp +++ b/LiteLoader/include/llapi/mc/BorderBlock.hpp @@ -36,25 +36,25 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@BorderBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 11 + * @symbol ?getVisualShapeInWorld\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 12 + * @symbol ?getVisualShape\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_28(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +66,10 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +80,6 @@ class BorderBlock : public WallBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +100,11 @@ class BorderBlock : public WallBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +115,6 @@ class BorderBlock : public WallBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +131,55 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 78 - * @symbol ?setupRedstoneComponent\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** * @vftbl 81 - * @symbol __unk_vfn_81 + * @symbol ?setupRedstoneComponent\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_81(); + virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,92 +191,87 @@ class BorderBlock : public WallBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 - */ - virtual void __unk_vfn_127(); - /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_125(); /** - * @vftbl 132 - * @symbol ?buildDescriptionId\@BorderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual std::string buildDescriptionId(class Block const &) const; + virtual void __unk_vfn_128(); /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@BorderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BorderBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BorderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BossEventPacket.hpp b/LiteLoader/include/llapi/mc/BossEventPacket.hpp index cc9fbf8c3d..842934e97c 100644 --- a/LiteLoader/include/llapi/mc/BossEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BossEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,23 +52,23 @@ class BossEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@BossEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@BossEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOSSEVENTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~BossEventPacket(); #endif - /** - * @symbol ??0BossEventPacket\@\@QEAA\@W4BossEventUpdateType\@\@AEAVRaidBossComponent\@\@\@Z - */ - MCAPI BossEventPacket(enum class BossEventUpdateType, class RaidBossComponent &); /** * @symbol ??0BossEventPacket\@\@QEAA\@W4BossEventUpdateType\@\@UActorUniqueID\@\@AEAVBossComponent\@\@\@Z */ MCAPI BossEventPacket(enum class BossEventUpdateType, struct ActorUniqueID, class BossComponent &); + /** + * @symbol ??0BossEventPacket\@\@QEAA\@W4BossEventUpdateType\@\@AEAVRaidBossComponent\@\@\@Z + */ + MCAPI BossEventPacket(enum class BossEventUpdateType, class RaidBossComponent &); /** * @symbol ??0BossEventPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BottleItem.hpp b/LiteLoader/include/llapi/mc/BottleItem.hpp index 9c957a7a92..df48c0a14a 100644 --- a/LiteLoader/include/llapi/mc/BottleItem.hpp +++ b/LiteLoader/include/llapi/mc/BottleItem.hpp @@ -52,10 +52,10 @@ class BottleItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,7 +122,7 @@ class BottleItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BottleItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp b/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp index 4984b824cf..eca791208f 100644 --- a/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp +++ b/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp @@ -27,10 +27,6 @@ class BounceEventingSystem { #endif public: - /** - * @symbol ?_tickBounceEventingSystem\@BounceEventingSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@$$CBUActorUniqueIDComponent\@\@$$CBUEventingDispatcherComponent\@\@UBounceComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@\@Z - */ - MCAPI static void _tickBounceEventingSystem(class ViewT, class FlagComponent>, struct StateVectorComponent const, struct ActorUniqueIDComponent const, struct EventingDispatcherComponent const, struct BounceComponent>, class ViewT); /** * @symbol ?createSystem\@BounceEventingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/BowItem.hpp b/LiteLoader/include/llapi/mc/BowItem.hpp index f87a24f7b8..3b56e51a59 100644 --- a/LiteLoader/include/llapi/mc/BowItem.hpp +++ b/LiteLoader/include/llapi/mc/BowItem.hpp @@ -52,10 +52,10 @@ class BowItem : public RangedWeaponItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/BreathableComponent.hpp b/LiteLoader/include/llapi/mc/BreathableComponent.hpp index 5e5e5ab187..2ab846c6d7 100644 --- a/LiteLoader/include/llapi/mc/BreathableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreathableComponent.hpp @@ -86,9 +86,5 @@ enum class BreathableState; * @symbol ?updateBreathableState\@BreathableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void updateBreathableState(class Actor &); - /** - * @symbol ??1BreathableComponent\@\@QEAA\@XZ - */ - MCAPI ~BreathableComponent(); }; diff --git a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp index e0cfe206a8..54d934d892 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp @@ -36,40 +36,30 @@ class BrewingStandBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@BrewingStandBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?addCollisionShapes\@BrewingStandBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; + virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BrewingStandBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@BrewingStandBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@BrewingStandBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ - virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@BrewingStandBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -81,10 +71,10 @@ class BrewingStandBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -95,11 +85,6 @@ class BrewingStandBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -120,6 +105,11 @@ class BrewingStandBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -130,11 +120,6 @@ class BrewingStandBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -151,50 +136,60 @@ class BrewingStandBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@BrewingStandBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@BrewingStandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -207,81 +202,86 @@ class BrewingStandBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@BrewingStandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@BrewingStandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BrewingStandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BrushItem.hpp b/LiteLoader/include/llapi/mc/BrushItem.hpp index 3223d73195..337fa3feba 100644 --- a/LiteLoader/include/llapi/mc/BrushItem.hpp +++ b/LiteLoader/include/llapi/mc/BrushItem.hpp @@ -47,10 +47,10 @@ class BrushItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -127,7 +127,7 @@ class BrushItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BrushItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; @@ -138,12 +138,4 @@ class BrushItem : public Item { MCVAPI bool useInterruptedByAttacking() const; #endif -//protected: - /** - * @symbol ?_spawnDustParticles\@BrushItem\@\@KAXAEAVLevel\@\@VVec3\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z - */ - MCAPI static void _spawnDustParticles(class Level &, class Vec3, class Block const &, class BlockPos const &, unsigned char); - -protected: - }; diff --git a/LiteLoader/include/llapi/mc/BrushableBlock.hpp b/LiteLoader/include/llapi/mc/BrushableBlock.hpp index 5241f56926..a80c60f6a9 100644 --- a/LiteLoader/include/llapi/mc/BrushableBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrushableBlock.hpp @@ -31,20 +31,10 @@ class BrushableBlock : public FallingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class BrushableBlock : public FallingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class BrushableBlock : public FallingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class BrushableBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class BrushableBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,60 +111,70 @@ class BrushableBlock : public FallingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@BrushableBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,97 +186,102 @@ class BrushableBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@BrushableBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@BrushableBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BrushableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@BrushableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@BrushableBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** - * @vftbl 197 + * @vftbl 195 * @symbol ?onLand\@BrushableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp index d06a8a4bd7..2e17c9318b 100644 --- a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp +++ b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp @@ -36,40 +36,30 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@BubbleColumnBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 9 - * @symbol ?addAABBs\@BubbleColumnBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z - */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; - /** - * @vftbl 10 - * @symbol ?getAABB\@BubbleColumnBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; - /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@BubbleColumnBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 8 + * @symbol ?getAABB\@BubbleColumnBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 9 + * @symbol ?addAABBs\@BubbleColumnBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -81,10 +71,10 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -95,11 +85,6 @@ class BubbleColumnBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -120,6 +105,11 @@ class BubbleColumnBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -130,11 +120,6 @@ class BubbleColumnBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -151,75 +136,80 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@BubbleColumnBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 62 + * @vftbl 65 * @symbol ?getRequiredMedium\@BubbleColumnBlock\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ */ virtual class std::optional getRequiredMedium() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@BubbleColumnBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 83 + * @vftbl 86 * @symbol ?isPreservingMediumWhenPlaced\@BubbleColumnBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 89 + * @vftbl 92 * @symbol ?mayPick\@BubbleColumnBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,82 +221,87 @@ class BubbleColumnBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 139 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@BubbleColumnBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BubbleColumnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@BubbleColumnBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/BucketItem.hpp b/LiteLoader/include/llapi/mc/BucketItem.hpp index 3c659a1a84..0491332cea 100644 --- a/LiteLoader/include/llapi/mc/BucketItem.hpp +++ b/LiteLoader/include/llapi/mc/BucketItem.hpp @@ -52,10 +52,10 @@ class BucketItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -182,7 +182,7 @@ class BucketItem : public Item { */ virtual std::string getAuxValuesDescription() const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@BucketItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp b/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp index 7e73a5e91d..06671b2ace 100644 --- a/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp @@ -36,20 +36,10 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class BuddingAmethystBlock : public AmethystBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class BuddingAmethystBlock : public AmethystBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class BuddingAmethystBlock : public AmethystBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@BuddingAmethystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@BuddingAmethystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,60 +176,65 @@ class BuddingAmethystBlock : public AmethystBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@BuddingAmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUDDINGAMETHYSTBLOCK /** * @symbol ?canBeSilkTouched\@BuddingAmethystBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/BushBlock.hpp b/LiteLoader/include/llapi/mc/BushBlock.hpp index 59dbadb6cc..c3bc34fe40 100644 --- a/LiteLoader/include/llapi/mc/BushBlock.hpp +++ b/LiteLoader/include/llapi/mc/BushBlock.hpp @@ -36,25 +36,15 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@BushBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class BushBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class BushBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class BushBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,50 +121,60 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@BushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,72 +186,77 @@ class BushBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@BushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?checkAlive\@BushBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?setGrowth\@BushBlock\@\@MEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@GH\@Z */ virtual class Block const & setGrowth(class BlockSource &, class BlockPos const &, class Block const &, unsigned short, int) const; diff --git a/LiteLoader/include/llapi/mc/ButtonBlock.hpp b/LiteLoader/include/llapi/mc/ButtonBlock.hpp index 49cb5f6c36..c2c1c0c938 100644 --- a/LiteLoader/include/llapi/mc/ButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/ButtonBlock.hpp @@ -36,25 +36,25 @@ class ButtonBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@ButtonBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 13 + * @symbol ?getUIShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_28(); + virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +66,10 @@ class ButtonBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +80,6 @@ class ButtonBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +100,11 @@ class ButtonBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +115,6 @@ class ButtonBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,96 +130,101 @@ class ButtonBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@ButtonBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@ButtonBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@ButtonBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@ButtonBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 107 + * @vftbl 110 * @symbol ?isAttachedTo\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; - /** - * @vftbl 112 - * @symbol ?entityInside\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -236,95 +236,95 @@ class ButtonBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** * @vftbl 143 - * @symbol ?getUIShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z - */ - virtual class AABB const & getUIShape(class Block const &, class AABB &) const; - /** - * @vftbl 145 * @symbol ?getVariant\@ButtonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@ButtonBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@ButtonBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@ButtonBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ - virtual void __unk_vfn_186(); + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUTTONBLOCK /** * @symbol ?isButtonBlock\@ButtonBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ByteArrayTag.hpp b/LiteLoader/include/llapi/mc/ByteArrayTag.hpp index fe5440460d..ed6249bc83 100644 --- a/LiteLoader/include/llapi/mc/ByteArrayTag.hpp +++ b/LiteLoader/include/llapi/mc/ByteArrayTag.hpp @@ -47,9 +47,9 @@ TagMemoryChunk val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@ByteArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@ByteArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -80,12 +80,6 @@ TagMemoryChunk val; * @symbol ?hash\@ByteArrayTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BYTEARRAYTAG - /** - * @symbol ?write\@ByteArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; -#endif /** * @symbol ??0ByteArrayTag\@\@QEAA\@UTagMemoryChunk\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ByteTag.hpp b/LiteLoader/include/llapi/mc/ByteTag.hpp index c9677b8cf8..41e05bcb6c 100644 --- a/LiteLoader/include/llapi/mc/ByteTag.hpp +++ b/LiteLoader/include/llapi/mc/ByteTag.hpp @@ -45,9 +45,9 @@ unsigned char val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@ByteTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@ByteTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,10 +79,6 @@ unsigned char val; */ virtual unsigned __int64 hash() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BYTETAG - /** - * @symbol ?write\@ByteTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/CactusBlock.hpp b/LiteLoader/include/llapi/mc/CactusBlock.hpp index a1993e2dce..7d2b8d43e9 100644 --- a/LiteLoader/include/llapi/mc/CactusBlock.hpp +++ b/LiteLoader/include/llapi/mc/CactusBlock.hpp @@ -36,25 +36,15 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@CactusBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class CactusBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class CactusBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class CactusBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +121,65 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@CactusBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,80 +191,85 @@ class CactusBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@CactusBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 157 + * @vftbl 155 * @symbol ?dealsContactDamage\@CactusBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CACTUSBLOCK /** * @symbol ?canBeSilkTouched\@CactusBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CakeBlock.hpp b/LiteLoader/include/llapi/mc/CakeBlock.hpp index e3aa60ffdc..538fa41d47 100644 --- a/LiteLoader/include/llapi/mc/CakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CakeBlock.hpp @@ -36,20 +36,15 @@ class CakeBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@CakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class CakeBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class CakeBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class CakeBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class CakeBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +121,70 @@ class CakeBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@CakeBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CakeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -197,84 +197,84 @@ class CakeBlock : public BlockLegacy { virtual void __unk_vfn_124(); /** * @vftbl 125 - * @symbol ?getComparatorSignal\@CakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @symbol __unk_vfn_125 */ - virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; + virtual void __unk_vfn_125(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 126 + * @symbol ?getComparatorSignal\@CakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ - virtual void __unk_vfn_127(); + virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@CakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CakeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAKEBLOCK /** * @symbol ?canBeSilkTouched\@CakeBlock\@\@EEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp index d2f0cf7767..664940af8e 100644 --- a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp +++ b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlock.hpp @@ -31,20 +31,10 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,50 +111,60 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 78 + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 81 * @symbol ?setupRedstoneComponent\@CalibratedSculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@CalibratedSculkSensorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,70 +176,75 @@ class CalibratedSculkSensorBlock : public SculkSensorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CalibratedSculkSensorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@CalibratedSculkSensorBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getFaceFlip\@CalibratedSculkSensorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0CalibratedSculkSensorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp index aee2fecb03..bababea5e5 100644 --- a/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CalibratedSculkSensorBlockActor.hpp @@ -40,6 +40,11 @@ class CalibratedSculkSensorBlockActor : public SculkSensorBlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +71,15 @@ class CalibratedSculkSensorBlockActor : public SculkSensorBlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0CalibratedSculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Camel.hpp b/LiteLoader/include/llapi/mc/Camel.hpp index 41ca9ebf3a..0bdcb0c254 100644 --- a/LiteLoader/include/llapi/mc/Camel.hpp +++ b/LiteLoader/include/llapi/mc/Camel.hpp @@ -35,145 +35,145 @@ class Camel : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 35 + * @vftbl 32 * @symbol ?getInterpolatedRidingOffset\@Camel\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Camel\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@Camel\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Camel\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Camel\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Camel\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ @@ -183,4 +183,12 @@ class Camel : public Animal { */ MCAPI class std::optional getDashCooldown() const; +//private: + /** + * @symbol ?_monitorSitting\@Camel\@\@AEAAXXZ + */ + MCAPI void _monitorSitting(); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/CameraBlock.hpp b/LiteLoader/include/llapi/mc/CameraBlock.hpp index b9263eca95..c48e5bc72d 100644 --- a/LiteLoader/include/llapi/mc/CameraBlock.hpp +++ b/LiteLoader/include/llapi/mc/CameraBlock.hpp @@ -36,20 +36,10 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class CameraBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class CameraBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class CameraBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 65 - * @symbol ?canBeUsedInCommands\@CameraBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 68 + * @symbol ?canBeUsedInCommands\@CameraBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ - virtual void __unk_vfn_81(); + virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,55 +176,60 @@ class CameraBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0CameraBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/CameraCommand.hpp b/LiteLoader/include/llapi/mc/CameraCommand.hpp index a5a6598fcb..2bd79b3127 100644 --- a/LiteLoader/include/llapi/mc/CameraCommand.hpp +++ b/LiteLoader/include/llapi/mc/CameraCommand.hpp @@ -31,7 +31,7 @@ class CameraCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@CameraCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; @@ -55,6 +55,10 @@ class CameraCommand : public Command { * @symbol ?ENUM_OPTION_EASE\@CameraCommand\@\@2PEBDEB */ MCAPI static char const * ENUM_OPTION_EASE; + /** + * @symbol ?ENUM_OPTION_FACING\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * ENUM_OPTION_FACING; /** * @symbol ?ENUM_OPTION_FADE\@CameraCommand\@\@2PEBDEB */ @@ -91,6 +95,10 @@ class CameraCommand : public Command { * @symbol ?OPTION_EASE\@CameraCommand\@\@2PEBDEB */ MCAPI static char const * OPTION_EASE; + /** + * @symbol ?OPTION_FACING\@CameraCommand\@\@2PEBDEB + */ + MCAPI static char const * OPTION_FACING; /** * @symbol ?OPTION_FADE\@CameraCommand\@\@2PEBDEB */ diff --git a/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp index 73d0078a3c..9d63cb66f4 100644 --- a/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -46,27 +47,27 @@ class CameraInstructionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?read\@CameraInstructionPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@CameraInstructionPacket\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@CameraInstructionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraInstructionPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERAINSTRUCTIONPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~CameraInstructionPacket(); #endif - /** - * @symbol ??0CameraInstructionPacket\@\@QEAA\@XZ - */ - MCAPI CameraInstructionPacket(); /** * @symbol ??0CameraInstructionPacket\@\@QEAA\@AEBUCameraInstruction\@\@\@Z */ MCAPI CameraInstructionPacket(struct CameraInstruction const &); + /** + * @symbol ??0CameraInstructionPacket\@\@QEAA\@XZ + */ + MCAPI CameraInstructionPacket(); }; diff --git a/LiteLoader/include/llapi/mc/CameraItem.hpp b/LiteLoader/include/llapi/mc/CameraItem.hpp index 8da1fbc6fd..1fc205a9b8 100644 --- a/LiteLoader/include/llapi/mc/CameraItem.hpp +++ b/LiteLoader/include/llapi/mc/CameraItem.hpp @@ -52,10 +52,10 @@ class CameraItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -111,5 +111,9 @@ class CameraItem : public Item { * @symbol __unk_vfn_116 */ virtual void __unk_vfn_116(); + /** + * @symbol ??0CameraItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI CameraItem(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/CameraPacket.hpp b/LiteLoader/include/llapi/mc/CameraPacket.hpp index 8737451999..f490017904 100644 --- a/LiteLoader/include/llapi/mc/CameraPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class CameraPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CameraPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CameraPreset.hpp b/LiteLoader/include/llapi/mc/CameraPreset.hpp index 40813f8f12..23c14a3ef2 100644 --- a/LiteLoader/include/llapi/mc/CameraPreset.hpp +++ b/LiteLoader/include/llapi/mc/CameraPreset.hpp @@ -18,11 +18,14 @@ struct CameraPreset { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CAMERAPRESET public: - CameraPreset(struct CameraPreset const &) = delete; CameraPreset() = delete; #endif public: + /** + * @symbol ??0CameraPreset\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI CameraPreset(struct CameraPreset const &); /** * @symbol ??4CameraPreset\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CameraPresets.hpp b/LiteLoader/include/llapi/mc/CameraPresets.hpp index 53faf7b09b..fb505f5f34 100644 --- a/LiteLoader/include/llapi/mc/CameraPresets.hpp +++ b/LiteLoader/include/llapi/mc/CameraPresets.hpp @@ -51,10 +51,6 @@ class CameraPresets { * @symbol ??4CameraPresets\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CameraPresets & operator=(class CameraPresets &&); - /** - * @symbol ?bindType\@CameraPresets\@\@SAXXZ - */ - MCAPI static void bindType(); /** * @symbol ?isAllowedEaseTarget\@CameraPresets\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp index 3d217914d1..20d2c1fc2a 100644 --- a/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -46,27 +47,27 @@ class CameraPresetsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?read\@CameraPresetsPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@CameraPresetsPacket\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@CameraPresetsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraPresetsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERAPRESETSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~CameraPresetsPacket(); #endif - /** - * @symbol ??0CameraPresetsPacket\@\@QEAA\@XZ - */ - MCAPI CameraPresetsPacket(); /** * @symbol ??0CameraPresetsPacket\@\@QEAA\@AEBVCameraPresets\@\@\@Z */ MCAPI CameraPresetsPacket(class CameraPresets const &); + /** + * @symbol ??0CameraPresetsPacket\@\@QEAA\@XZ + */ + MCAPI CameraPresetsPacket(); }; diff --git a/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp b/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp index b05d3e6987..4425d340e8 100644 --- a/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp +++ b/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp @@ -36,7 +36,7 @@ class CameraShakeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@CameraShakeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp index cfb8e891a9..145557126a 100644 --- a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class CameraShakePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CameraShakePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CameraShakePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERASHAKEPACKET /** * @symbol __unk_destructor_-1 @@ -64,13 +65,13 @@ class CameraShakePacket : public Packet { * @symbol ??0CameraShakePacket\@\@QEAA\@MMW4CameraShakeType\@\@\@Z */ MCAPI CameraShakePacket(float, float, enum class CameraShakeType); - /** - * @symbol ??0CameraShakePacket\@\@QEAA\@W4CameraShakeAction\@\@\@Z - */ - MCAPI CameraShakePacket(enum class CameraShakeAction); /** * @symbol ??0CameraShakePacket\@\@QEAA\@XZ */ MCAPI CameraShakePacket(); + /** + * @symbol ??0CameraShakePacket\@\@QEAA\@W4CameraShakeAction\@\@\@Z + */ + MCAPI CameraShakePacket(enum class CameraShakeAction); }; diff --git a/LiteLoader/include/llapi/mc/CampfireBlock.hpp b/LiteLoader/include/llapi/mc/CampfireBlock.hpp index 4af12d4406..8283e19e2b 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlock.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlock.hpp @@ -36,30 +36,25 @@ class CampfireBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@CampfireBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@CampfireBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +65,11 @@ class CampfireBlock : public ActorBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@CampfireBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +82,9 @@ class CampfireBlock : public ActorBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@CampfireBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class CampfireBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class CampfireBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,75 +136,80 @@ class CampfireBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@CampfireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@CampfireBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@CampfireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@CampfireBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 112 - * @symbol ?entityInside\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,105 +221,110 @@ class CampfireBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@CampfireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@CampfireBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CampfireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@CampfireBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 188 + * @symbol ?entityInside\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMPFIREBLOCK /** * @symbol ?canBeSilkTouched\@CampfireBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp index 9a1b20d74d..aef8d61141 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp @@ -70,6 +70,11 @@ class CampfireBlockActor : public BlockActor { * @symbol ?getShadowRadius\@CampfireBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -96,17 +101,22 @@ class CampfireBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@CampfireBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@CampfireBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/CanDestroyInCreativeItemComponent.hpp b/LiteLoader/include/llapi/mc/CanDestroyInCreativeItemComponent.hpp new file mode 100644 index 0000000000..d09f5a87c1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CanDestroyInCreativeItemComponent.hpp @@ -0,0 +1,76 @@ +/** + * @file CanDestroyInCreativeItemComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CanDestroyInCreativeItemComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CANDESTROYINCREATIVEITEMCOMPONENT +public: + class CanDestroyInCreativeItemComponent& operator=(class CanDestroyInCreativeItemComponent const &) = delete; + CanDestroyInCreativeItemComponent(class CanDestroyInCreativeItemComponent const &) = delete; + CanDestroyInCreativeItemComponent() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VCanDestroyInCreativeItemComponent\@\@\@\@UEBA_NXZ + */ + virtual bool isNetworkComponent() const; + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VCanDestroyInCreativeItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + */ + virtual std::unique_ptr buildNetworkTag() const; + /** + * @vftbl 5 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VCanDestroyInCreativeItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + */ + virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @vftbl 6 + * @symbol __unk_vfn_6 + */ + virtual void __unk_vfn_6(); + /** + * @vftbl 7 + * @symbol ?initializeComponent\@CanDestroyInCreativeItemComponent\@\@UEBAXXZ + */ + virtual void initializeComponent() const; + /** + * @symbol ?bindType\@CanDestroyInCreativeItemComponent\@\@SAXXZ + */ + MCAPI static void bindType(); + /** + * @symbol ?getIdentifier\@CanDestroyInCreativeItemComponent\@\@SAAEBVHashedString\@\@XZ + */ + MCAPI static class HashedString const & getIdentifier(); + +}; diff --git a/LiteLoader/include/llapi/mc/CandleBlock.hpp b/LiteLoader/include/llapi/mc/CandleBlock.hpp index 7ff76c0cd6..3b1dc28419 100644 --- a/LiteLoader/include/llapi/mc/CandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlock.hpp @@ -36,25 +36,20 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@CandleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@CandleBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@CandleBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class CandleBlock : public AbstractCandleBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class CandleBlock : public AbstractCandleBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class CandleBlock : public AbstractCandleBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +126,55 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,87 +186,87 @@ class CandleBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@CandleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CandleBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@CandleBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?_getNumCandles\@CandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?_iterateCandles\@CandleBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ virtual void _iterateCandles(class Block const &, class BlockPos const &, class std::function) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?_tryLightOnFire\@CandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; diff --git a/LiteLoader/include/llapi/mc/CandleBlockItem.hpp b/LiteLoader/include/llapi/mc/CandleBlockItem.hpp index fc571224a3..6117b41f4b 100644 --- a/LiteLoader/include/llapi/mc/CandleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlockItem.hpp @@ -52,10 +52,10 @@ class CandleBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@CandleBlockItem\@\@UEBAHH\@Z @@ -117,7 +117,7 @@ class CandleBlockItem : public BlockItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@CandleBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp b/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp index b93be5d78b..2a6c08e956 100644 --- a/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp @@ -36,20 +36,15 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@CandleCakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class CandleCakeBlock : public AbstractCandleBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class CandleCakeBlock : public AbstractCandleBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class CandleCakeBlock : public AbstractCandleBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +121,70 @@ class CandleCakeBlock : public AbstractCandleBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@CandleCakeBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CandleCakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -197,96 +197,96 @@ class CandleCakeBlock : public AbstractCandleBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@CandleCakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 + */ + virtual void __unk_vfn_128(); + /** + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_131(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_153(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@CandleCakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_162(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 */ virtual void __unk_vfn_164(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_167(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_166(); - /** - * @vftbl 169 - * @symbol __unk_vfn_169 - */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_171(); /** * @vftbl 173 - * @symbol __unk_vfn_173 - */ - virtual void __unk_vfn_173(); - /** - * @vftbl 176 * @symbol ?use\@CandleCakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@CandleCakeBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?_getNumCandles\@CandleCakeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?_iterateCandles\@CandleCakeBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ virtual void _iterateCandles(class Block const &, class BlockPos const &, class std::function) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?_tryLightOnFire\@CandleCakeBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; diff --git a/LiteLoader/include/llapi/mc/CarpetBlock.hpp b/LiteLoader/include/llapi/mc/CarpetBlock.hpp index 5a7e4e6033..5ca09b0836 100644 --- a/LiteLoader/include/llapi/mc/CarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarpetBlock.hpp @@ -36,25 +36,20 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@CarpetBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@CarpetBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class CarpetBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class CarpetBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class CarpetBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +126,70 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@CarpetBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CarpetBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,75 +201,75 @@ class CarpetBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@CarpetBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CARPETBLOCK /** * @symbol ?waterSpreadCausesSpawn\@CarpetBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CarrotBlock.hpp b/LiteLoader/include/llapi/mc/CarrotBlock.hpp index 0ba22f5a52..fa3da75369 100644 --- a/LiteLoader/include/llapi/mc/CarrotBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarrotBlock.hpp @@ -36,25 +36,15 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@CarrotBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class CarrotBlock : public CropBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class CarrotBlock : public CropBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class CarrotBlock : public CropBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,40 +121,50 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,87 +176,92 @@ class CarrotBlock : public CropBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@CarrotBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getBaseSeed\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getBaseCrop\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?getCropNum\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp index 0b09fcc7fa..be23f788bc 100644 --- a/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp @@ -52,10 +52,10 @@ class CarrotOnAStickItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 49 * @symbol ?isHandEquipped\@CarrotOnAStickItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp index bd1403a619..f992930f95 100644 --- a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp @@ -36,20 +36,10 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class CartographyTableBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class CartographyTableBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class CartographyTableBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +171,65 @@ class CartographyTableBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CartographyTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CARTOGRAPHYTABLEBLOCK /** * @symbol ?isCraftingBlock\@CartographyTableBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/Cat.hpp b/LiteLoader/include/llapi/mc/Cat.hpp index 56a0fae56f..b567770557 100644 --- a/LiteLoader/include/llapi/mc/Cat.hpp +++ b/LiteLoader/include/llapi/mc/Cat.hpp @@ -37,145 +37,145 @@ class Cat : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 119 + * @vftbl 108 * @symbol ?onTame\@Cat\@\@UEAAXXZ */ virtual void onTame(); /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@Cat\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Cat\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Cat\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 339 + * @vftbl 319 * @symbol ?_serverAiMobStep\@Cat\@\@UEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Cat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CauldronBlock.hpp b/LiteLoader/include/llapi/mc/CauldronBlock.hpp index 15c1a60a92..e427009e8e 100644 --- a/LiteLoader/include/llapi/mc/CauldronBlock.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlock.hpp @@ -37,35 +37,30 @@ class CauldronBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@CauldronBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?clip\@CauldronBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 9 + * @symbol ?addAABBs\@CauldronBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ - virtual void __unk_vfn_19(); + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @symbol __unk_vfn_22 */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -77,10 +72,10 @@ class CauldronBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -91,11 +86,6 @@ class CauldronBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -116,6 +106,11 @@ class CauldronBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -126,11 +121,6 @@ class CauldronBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -147,70 +137,75 @@ class CauldronBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@CauldronBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 + * @vftbl 67 * @symbol ?handlePrecipitation\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z */ virtual void handlePrecipitation(class BlockSource &, class BlockPos const &, float, float) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 109 - * @symbol ?handleEntityInside\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -223,101 +218,106 @@ class CauldronBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@CauldronBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@CauldronBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CauldronBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 181 + * @vftbl 178 * @symbol ?getExtraRenderLayers\@CauldronBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 183 + * @vftbl 180 * @symbol ?getLight\@CauldronBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLight(class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -335,10 +335,6 @@ class CauldronBlock : public ActorBlock { * @symbol ??0CauldronBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CauldronBlock(std::string const &, int); - /** - * @symbol ?getLiquidLevel\@CauldronBlock\@\@QEBAHH\@Z - */ - MCAPI int getLiquidLevel(int) const; /** * @symbol ?setLiquidLevel\@CauldronBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HW4CauldronLiquidType\@\@\@Z */ @@ -351,6 +347,10 @@ class CauldronBlock : public ActorBlock { * @symbol ?canReceiveStalactiteDrip\@CauldronBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4MaterialType\@\@\@Z */ MCAPI static bool canReceiveStalactiteDrip(class BlockSource &, class BlockPos const &, enum class MaterialType); + /** + * @symbol ?clampLiquidLevel\@CauldronBlock\@\@SAHH\@Z + */ + MCAPI static int clampLiquidLevel(int); /** * @symbol ?spawnPotionParticles\@CauldronBlock\@\@SAXAEAVLevel\@\@AEBVVec3\@\@AEAVRandom\@\@HH\@Z */ diff --git a/LiteLoader/include/llapi/mc/CaveSpider.hpp b/LiteLoader/include/llapi/mc/CaveSpider.hpp index 3c59f9ac33..13e308ead3 100644 --- a/LiteLoader/include/llapi/mc/CaveSpider.hpp +++ b/LiteLoader/include/llapi/mc/CaveSpider.hpp @@ -37,132 +37,132 @@ class CaveSpider : public Spider { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 217 + * @vftbl 204 * @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 &); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 346 + * @vftbl 326 * @symbol ?getModelScale\@CaveSpider\@\@UEBAMXZ */ virtual float getModelScale() const; /** - * @vftbl 347 + * @vftbl 327 * @symbol ?getSpiderType\@CaveSpider\@\@UEBA?AW4Type\@Spider\@\@XZ */ virtual enum class Spider::Type getSpiderType() const; diff --git a/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp b/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp index 5d4d997410..80b3937049 100644 --- a/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp @@ -41,25 +41,15 @@ class CaveVinesBlock : public BlockLegacy { */ virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@CaveVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class CaveVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class CaveVinesBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class CaveVinesBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class CaveVinesBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,75 +126,85 @@ class CaveVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@CaveVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 117 + * @vftbl 118 * @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 &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,97 +216,102 @@ class CaveVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@CaveVinesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CaveVinesBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; @@ -330,9 +330,9 @@ class CaveVinesBlock : public BlockLegacy { */ MCAPI bool _isCaveVinesBlock(class Block const &) const; /** - * @symbol ?_pickBerries\@CaveVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_pickBerries\@CaveVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ - MCAPI bool _pickBerries(class BlockSource &, class BlockPos const &) const; + MCAPI bool _pickBerries(class BlockSource &, class BlockPos const &, class Actor &) const; /** * @symbol ?_updateBlockBasedOnNeighborBelow\@CaveVinesBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp b/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp index b9f5fff9eb..800bc433bd 100644 --- a/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp +++ b/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp @@ -29,13 +29,13 @@ class CerealDocumentUpgrader { public: /** - * @symbol ??0CerealDocumentUpgrader\@\@QEAA\@AEBUSchema\@reflection\@\@\@Z + * @symbol ??0CerealDocumentUpgrader\@\@QEAA\@AEBUSchema\@cereal\@\@\@Z */ - MCAPI CerealDocumentUpgrader(struct reflection::Schema const &); + MCAPI CerealDocumentUpgrader(struct cereal::Schema const &); /** - * @symbol ?buildPatchSchemas\@CerealDocumentUpgrader\@\@QEAAXAEBV?$function\@$$A6A?BUSchema\@reflection\@\@AEBVSemVersion\@\@\@Z\@std\@\@\@Z + * @symbol ?buildPatchSchemas\@CerealDocumentUpgrader\@\@QEAAXAEBV?$function\@$$A6A?BUSchema\@cereal\@\@AEBVSemVersion\@\@\@Z\@std\@\@\@Z */ - MCAPI void buildPatchSchemas(class std::function const &); + MCAPI void buildPatchSchemas(class std::function const &); /** * @symbol ?clear\@CerealDocumentUpgrader\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp index 1444d8d052..e31aa215ad 100644 --- a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp @@ -40,9 +40,9 @@ struct Constructor { */ MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader &); /** - * @symbol ?bindAllComponentSchemas\@CerealItemComponentFactory\@\@SAXAEAVSchemaFactory\@reflection\@\@AEBVSemVersion\@\@\@Z + * @symbol ?bindAllComponentSchemas\@CerealItemComponentFactory\@\@SAXAEAVSchemaFactory\@cereal\@\@AEBVSemVersion\@\@\@Z */ - MCAPI static void bindAllComponentSchemas(class reflection::SchemaFactory &, class SemVersion const &); + MCAPI static void bindAllComponentSchemas(class cereal::SchemaFactory &, class SemVersion const &); /** * @symbol ?constructItemComponent\@CerealItemComponentFactory\@\@SA?AV?$shared_ptr\@VItemComponent\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ @@ -59,14 +59,30 @@ struct Constructor { * @symbol ?isRegisteredComponent\@CerealItemComponentFactory\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isRegisteredComponent(std::string const &); + /** + * @symbol ?registerDeprecatedComponent\@CerealItemComponentFactory\@\@SAX$$QEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + */ + MCAPI static void registerDeprecatedComponent(std::string const &&, std::string const &&); + /** + * @symbol ?resetItemContext\@CerealItemComponentFactory\@\@SAXXZ + */ + MCAPI static void resetItemContext(); + /** + * @symbol ?setItemContext\@CerealItemComponentFactory\@\@SAXPEAVComponentItem\@\@\@Z + */ + MCAPI static void setItemContext(class ComponentItem *); //private: /** - * @symbol ?updateReleasedMinFormatVersionForAnyComponent\@CerealItemComponentFactory\@\@CAXVSemVersion\@\@\@Z + * @symbol ?updateReleasedMinFormatVersionForAnyComponentIfLower\@CerealItemComponentFactory\@\@CAXVSemVersion\@\@\@Z */ - MCAPI static void updateReleasedMinFormatVersionForAnyComponent(class SemVersion); + MCAPI static void updateReleasedMinFormatVersionForAnyComponentIfLower(class SemVersion); private: + /** + * @symbol ?mDeprecatedComponents\@CerealItemComponentFactory\@\@0V?$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\@\@A + */ + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mDeprecatedComponents; /** * @symbol ?mItemContext\@CerealItemComponentFactory\@\@0PEAVComponentItem\@\@EA */ diff --git a/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp b/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp index 57d542ae1a..d15d5dd165 100644 --- a/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp +++ b/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp @@ -53,9 +53,9 @@ class CerealSchemaUpgrade { */ MCAPI CerealSchemaUpgrade(class SemVersion, std::string const &, std::string const &); /** - * @symbol ?bindLegacySchema\@CerealSchemaUpgrade\@\@QEAAXAEAVSchemaFactory\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?bindLegacySchema\@CerealSchemaUpgrade\@\@QEAAXAEAVSchemaFactory\@cereal\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void bindLegacySchema(class reflection::SchemaFactory &, std::string const &); + MCAPI void bindLegacySchema(class cereal::SchemaFactory &, std::string const &); /** * @symbol ?getTargetVersion\@CerealSchemaUpgrade\@\@QEBAAEBVSemVersion\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ChainBlock.hpp b/LiteLoader/include/llapi/mc/ChainBlock.hpp index 2a5e835a61..f82858f058 100644 --- a/LiteLoader/include/llapi/mc/ChainBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChainBlock.hpp @@ -36,30 +36,25 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@ChainBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@ChainBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @symbol __unk_vfn_22 */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; + virtual void __unk_vfn_22(); /** * @vftbl 25 - * @symbol ?canConnect\@ChainBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @symbol ?canProvideSupport\@ChainBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @symbol ?canConnect\@ChainBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ - virtual void __unk_vfn_29(); + virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +66,10 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +80,6 @@ class ChainBlock : public RotatedPillarBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class ChainBlock : public RotatedPillarBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class ChainBlock : public RotatedPillarBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,50 +131,60 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@ChainBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,67 +196,67 @@ class ChainBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@ChainBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp b/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp index d0ca0b24d6..c86f713dfc 100644 --- a/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp @@ -70,6 +70,11 @@ class ChalkboardBlockActor : public BlockActor { * @symbol ?getImmersiveReaderText\@ChalkboardBlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::string getImmersiveReaderText(class BlockSource &); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -97,26 +102,31 @@ class ChalkboardBlockActor : public BlockActor { virtual void __unk_vfn_35(); /** * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 * @symbol ?getUgcStrings\@ChalkboardBlockActor\@\@UEBA?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\@\@AEBVCompoundTag\@\@\@Z */ virtual std::vector getUgcStrings(class CompoundTag const &) const; /** - * @vftbl 37 + * @vftbl 38 * @symbol ?setUgcStrings\@ChalkboardBlockActor\@\@UEBAXAEAVCompoundTag\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void setUgcStrings(class CompoundTag &, std::vector const &) const; /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** - * @vftbl 39 + * @vftbl 40 * @symbol ?_getUpdatePacket\@ChalkboardBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@ChalkboardBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp index a8ec2641de..44a922a3eb 100644 --- a/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -60,9 +61,9 @@ class ChangeDimensionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ChangeDimensionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ChangeDimensionPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHANGEDIMENSIONPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp b/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp index 0b6b636be6..36816873dd 100644 --- a/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -56,9 +57,9 @@ class ChangeMobPropertyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ChangeMobPropertyPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp index da88d586dd..e9e4e4d685 100644 --- a/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp +++ b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp @@ -36,7 +36,7 @@ class ChangeSettingCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ChangeSettingCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp index 4af3b6e000..c8720cf15e 100644 --- a/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp @@ -32,12 +32,4 @@ class CheckFallDamageInMoveSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); -//private: - /** - * @symbol ?_tick\@CheckFallDamageInMoveSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUMoveRequestComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UCheckFallDamageRequestComponent\@\@\@\@\@Z - */ - MCAPI static void _tick(class ViewT>, struct MoveRequestComponent const, class Optional const>>, class EntityModifierT); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystemImpl.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystemImpl.hpp new file mode 100644 index 0000000000..1c83bb0e46 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file CheckFallDamageInMoveSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace CheckFallDamageInMoveSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?checkFallDamageInMove\@CheckFallDamageInMoveSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UCheckFallDamageRequestComponent\@\@\@\@\@Z + */ + MCAPI void checkFallDamageInMove(class StrictEntityContext &, struct MoveRequestComponent const &, class Optional const>, class EntityModifierT &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp index 0b382a1aec..bf3125ff15 100644 --- a/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp +++ b/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp @@ -27,14 +27,6 @@ class CheckFallDamageSystem { #endif public: - /** - * @symbol ?_checkFallDamage\@CheckFallDamageSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUCheckFallDamageRequestComponent\@\@\@Z - */ - MCAPI static void _checkFallDamage(class StrictEntityContext &, class ActorOwnerComponent &, struct CheckFallDamageRequestComponent &); - /** - * @symbol ?_tickCheckFallDamageSystem\@CheckFallDamageSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VActorOwnerComponent\@\@UCheckFallDamageRequestComponent\@\@\@\@\@Z - */ - MCAPI static void _tickCheckFallDamageSystem(class ViewT); /** * @symbol ?createSystem\@CheckFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageSystemImpl.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageSystemImpl.hpp new file mode 100644 index 0000000000..03317a1bbe --- /dev/null +++ b/LiteLoader/include/llapi/mc/CheckFallDamageSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file CheckFallDamageSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace CheckFallDamageSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?checkFallDamage\@CheckFallDamageSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUCheckFallDamageRequestComponent\@\@\@Z + */ + MCAPI void checkFallDamage(class StrictEntityContext &, class ActorOwnerComponent &, struct CheckFallDamageRequestComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp index dae249d614..7926a8b1d2 100644 --- a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp @@ -36,20 +36,10 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ChemicalHeatBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ChemicalHeatBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ChemicalHeatBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 65 - * @symbol ?canBeUsedInCommands\@ChemicalHeatBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 68 + * @symbol ?canBeUsedInCommands\@ChemicalHeatBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ - virtual void __unk_vfn_74(); + virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,70 +176,75 @@ class ChemicalHeatBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 181 + * @vftbl 178 * @symbol ?getExtraRenderLayers\@ChemicalHeatBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0ChemicalHeatBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp b/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp index 9ca2fea9fd..af9a785138 100644 --- a/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp @@ -52,10 +52,10 @@ class ChemistryAuxDataBlockItem : public AuxDataBlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/ChemistryItem.hpp b/LiteLoader/include/llapi/mc/ChemistryItem.hpp index 057261d010..bf0457f207 100644 --- a/LiteLoader/include/llapi/mc/ChemistryItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryItem.hpp @@ -52,10 +52,10 @@ class ChemistryItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp index a73dc90aab..dbf5dfff9d 100644 --- a/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp @@ -52,10 +52,10 @@ class ChemistryStickItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 30 * @symbol ?setMaxDamage\@ChemistryStickItem\@\@UEAAAEAVItem\@\@H\@Z diff --git a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp index 2f255c7fdc..6dbbd7c2e7 100644 --- a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp @@ -36,20 +36,10 @@ class ChemistryTableBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -60,16 +50,11 @@ class ChemistryTableBlock : public ActorBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@ChemistryTableBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -82,9 +67,9 @@ class ChemistryTableBlock : public ActorBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@ChemistryTableBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class ChemistryTableBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class ChemistryTableBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,65 +121,75 @@ class ChemistryTableBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@ChemistryTableBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 57 + * @vftbl 60 * @symbol ?onFillBlock\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 65 + * @vftbl 68 * @symbol ?canBeUsedInCommands\@ChemistryTableBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@ChemistryTableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@ChemistryTableBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,87 +201,92 @@ class ChemistryTableBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@ChemistryTableBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@ChemistryTableBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@ChemistryTableBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@ChemistryTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getEntityResourceItem\@ChemistryTableBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CherryLeavesBlock.hpp b/LiteLoader/include/llapi/mc/CherryLeavesBlock.hpp index f8fae2e5db..9ee5c30d7f 100644 --- a/LiteLoader/include/llapi/mc/CherryLeavesBlock.hpp +++ b/LiteLoader/include/llapi/mc/CherryLeavesBlock.hpp @@ -31,20 +31,10 @@ class CherryLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class CherryLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class CherryLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class CherryLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class CherryLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,40 +111,50 @@ class CherryLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -171,97 +166,102 @@ class CherryLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 135 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 136 * @symbol ?getColor\@CherryLeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 + * @vftbl 139 * @symbol ?isSeasonTinted\@CherryLeavesBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@CherryLeavesBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CherryLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@CherryLeavesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@CherryLeavesBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@CherryLeavesBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CherryLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@CherryLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp b/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp index 2a8b8db537..8c681ade9d 100644 --- a/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp +++ b/LiteLoader/include/llapi/mc/CherrySaplingBlock.hpp @@ -31,20 +31,10 @@ class CherrySaplingBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class CherrySaplingBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class CherrySaplingBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class CherrySaplingBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class CherrySaplingBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,60 +111,70 @@ class CherrySaplingBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@CherrySaplingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@CherrySaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,72 +186,77 @@ class CherrySaplingBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@CherrySaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@CherrySaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@CherrySaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CherrySaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ChestBlock.hpp b/LiteLoader/include/llapi/mc/ChestBlock.hpp index ff59cd3d6d..f5fda3fcf7 100644 --- a/LiteLoader/include/llapi/mc/ChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlock.hpp @@ -36,25 +36,15 @@ class ChestBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@ChestBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class ChestBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class ChestBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class ChestBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class ChestBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,81 +120,91 @@ class ChestBlock : public ActorBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@ChestBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@ChestBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 70 + * @vftbl 73 * @symbol ?dispense\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 73 + * @vftbl 76 * @symbol ?onMove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void onMove(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@ChestBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@ChestBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@ChestBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -222,84 +217,89 @@ class ChestBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@ChestBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@ChestBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@ChestBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@ChestBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHESTBLOCK /** * @symbol ?detachesOnPistonMove\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/ChestBoat.hpp b/LiteLoader/include/llapi/mc/ChestBoat.hpp index aa8096f008..5a064aca8e 100644 --- a/LiteLoader/include/llapi/mc/ChestBoat.hpp +++ b/LiteLoader/include/llapi/mc/ChestBoat.hpp @@ -35,117 +35,117 @@ class ChestBoat : public Boat { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 56 + * @vftbl 50 * @symbol ?getEntityLocNameString\@ChestBoat\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getEntityLocNameString() const; /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 236 + * @vftbl 223 * @symbol ?kill\@ChestBoat\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?destroy\@ChestBoat\@\@UEAAXPEAVActor\@\@\@Z */ virtual void destroy(class Actor *); diff --git a/LiteLoader/include/llapi/mc/ChestBoatItem.hpp b/LiteLoader/include/llapi/mc/ChestBoatItem.hpp index 6924bf24ff..fce475d6a0 100644 --- a/LiteLoader/include/llapi/mc/ChestBoatItem.hpp +++ b/LiteLoader/include/llapi/mc/ChestBoatItem.hpp @@ -50,10 +50,10 @@ class ChestBoatItem : public BoatItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -115,7 +115,7 @@ class ChestBoatItem : public BoatItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 135 + * @vftbl 136 * @symbol ?_getActorType\@ChestBoatItem\@\@EEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType _getActorType() const; diff --git a/LiteLoader/include/llapi/mc/Chicken.hpp b/LiteLoader/include/llapi/mc/Chicken.hpp index c42f131428..16117cee90 100644 --- a/LiteLoader/include/llapi/mc/Chicken.hpp +++ b/LiteLoader/include/llapi/mc/Chicken.hpp @@ -37,130 +37,130 @@ class Chicken : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Chicken\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Chicken\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Chicken\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp index 4582c8d98c..3311ef8a9e 100644 --- a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp @@ -34,20 +34,10 @@ class ChiseledBookshelfBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -59,10 +49,10 @@ class ChiseledBookshelfBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -73,11 +63,6 @@ class ChiseledBookshelfBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -98,6 +83,11 @@ class ChiseledBookshelfBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -108,11 +98,6 @@ class ChiseledBookshelfBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -129,45 +114,55 @@ class ChiseledBookshelfBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -180,81 +175,86 @@ class ChiseledBookshelfBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@ChiseledBookshelfBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@ChiseledBookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 175 + * @vftbl 172 * @symbol ?use\@ChiseledBookshelfBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char, class std::optional) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@ChiseledBookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp index d0d7ff9f1c..2bb076f2dc 100644 --- a/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp @@ -36,25 +36,15 @@ class ChorusFlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@ChorusFlowerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +55,11 @@ class ChorusFlowerBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@ChorusFlowerBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +72,9 @@ class ChorusFlowerBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@ChorusFlowerBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class ChorusFlowerBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class ChorusFlowerBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,55 +126,65 @@ class ChorusFlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@ChorusFlowerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,82 +196,87 @@ class ChorusFlowerBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@ChorusFlowerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@ChorusFlowerBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@ChorusFlowerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp index c4aa531e6e..db3e460b79 100644 --- a/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp @@ -36,30 +36,20 @@ class ChorusPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@ChorusPlantBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@ChorusPlantBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +60,11 @@ class ChorusPlantBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@ChorusPlantBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +77,9 @@ class ChorusPlantBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@ChorusPlantBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class ChorusPlantBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class ChorusPlantBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,60 +131,70 @@ class ChorusPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 61 + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@ChorusPlantBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@ChorusPlantBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,104 +206,80 @@ class ChorusPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ChorusPlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@ChorusPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHORUSPLANTBLOCK /** * @symbol ?canBeSilkTouched\@ChorusPlantBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp index be39a31fd8..63dcb8a3d3 100644 --- a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ChunkRadiusUpdatedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ChunkRadiusUpdatedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ChunkRadiusUpdatedPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHUNKRADIUSUPDATEDPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp index f016395ba7..98371ea105 100644 --- a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp @@ -20,10 +20,13 @@ class ChunkRecyclerTelemetryData { public: class ChunkRecyclerTelemetryData& operator=(class ChunkRecyclerTelemetryData const &) = delete; ChunkRecyclerTelemetryData(class ChunkRecyclerTelemetryData const &) = delete; - ChunkRecyclerTelemetryData() = delete; #endif public: + /** + * @symbol ??0ChunkRecyclerTelemetryData\@\@QEAA\@XZ + */ + MCAPI ChunkRecyclerTelemetryData(); /** * @symbol ?endLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ChunkSource.hpp b/LiteLoader/include/llapi/mc/ChunkSource.hpp index 3067876727..f390166658 100644 --- a/LiteLoader/include/llapi/mc/ChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkSource.hpp @@ -20,7 +20,7 @@ class ChunkSource { #define AFTER_EXTRA // Add Member There public: -char filler[0x48]; +char filler[0x58]; enum class LoadMode : int { None = 0x0, @@ -243,6 +243,10 @@ enum class ChunkSourceViewGenerateMode; * @symbol ?getLevel\@ChunkSource\@\@QEBAAEAVLevel\@\@XZ */ MCAPI class Level & getLevel() const; + /** + * @symbol ?initializeWithLevelStorageManager\@ChunkSource\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void initializeWithLevelStorageManager(class LevelStorageManager &); /** * @symbol ?setShuttingDown\@ChunkSource\@\@QEAAX_N\@Z */ @@ -322,6 +326,14 @@ enum class ChunkSourceViewGenerateMode; */ MCAPI void _spawnChunkGenerationTasks(int, bool); +//private: + /** + * @symbol ?_saveDirtyChunks\@ChunkSource\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _saveDirtyChunks(class LevelStorage &); + protected: +private: + }; diff --git a/LiteLoader/include/llapi/mc/ClayBlock.hpp b/LiteLoader/include/llapi/mc/ClayBlock.hpp index de0e845378..9ba8f5342e 100644 --- a/LiteLoader/include/llapi/mc/ClayBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClayBlock.hpp @@ -36,20 +36,10 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ClayBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ClayBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ClayBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,61 +115,71 @@ class ClayBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@ClayBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,62 +191,67 @@ class ClayBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@ClayBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@ClayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CleanUpSingleTickRemovePassengersSystem.hpp b/LiteLoader/include/llapi/mc/CleanUpSingleTickRemovePassengersSystem.hpp new file mode 100644 index 0000000000..c831b6754e --- /dev/null +++ b/LiteLoader/include/llapi/mc/CleanUpSingleTickRemovePassengersSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file CleanUpSingleTickRemovePassengersSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CleanUpSingleTickRemovePassengersSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLEANUPSINGLETICKREMOVEPASSENGERSSYSTEM +public: + class CleanUpSingleTickRemovePassengersSystem& operator=(class CleanUpSingleTickRemovePassengersSystem const &) = delete; + CleanUpSingleTickRemovePassengersSystem(class CleanUpSingleTickRemovePassengersSystem const &) = delete; + CleanUpSingleTickRemovePassengersSystem() = delete; +#endif + +public: + /** + * @symbol ?createSingleTickSystem\@CleanUpSingleTickRemovePassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSingleTickSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/ClearCommand.hpp b/LiteLoader/include/llapi/mc/ClearCommand.hpp index 9008110b39..e27f950bd8 100644 --- a/LiteLoader/include/llapi/mc/ClearCommand.hpp +++ b/LiteLoader/include/llapi/mc/ClearCommand.hpp @@ -36,7 +36,7 @@ class ClearCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ClearCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp index fd71ee32a8..aaa8cbda74 100644 --- a/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp @@ -36,7 +36,7 @@ class ClearSpawnPointCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ClearSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp deleted file mode 100644 index 0288fefb8f..0000000000 --- a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @file ClientAutoStepSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ClientAutoStepSystem. - * - */ -class ClientAutoStepSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTAUTOSTEPSYSTEM -public: - class ClientAutoStepSystem& operator=(class ClientAutoStepSystem const &) = delete; - ClientAutoStepSystem(class ClientAutoStepSystem const &) = delete; - ClientAutoStepSystem() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol __unk_vfn_1 - */ - virtual void __unk_vfn_1(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol ?tick\@ClientAutoStepSystem\@\@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\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z - */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct SynchedActorDataComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent, struct SideBySidePlaybackBlocksComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); - /** - * @symbol ?createClientAutoStepSystem\@ClientAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createClientAutoStepSystem(); - /** - * @symbol ?createClientAutoStepSystemSideBySide\@ClientAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createClientAutoStepSystemSideBySide(); - -}; diff --git a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp index d54e0be0ef..288a0a4a61 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,8 +53,8 @@ class ClientCacheBlobStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientCacheBlobStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientCacheBlobStatusPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp index 17703fee1d..0a8c3e70fd 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class ClientCacheMissResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientCacheMissResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientCacheMissResponsePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTCACHEMISSRESPONSEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp index 3e914c3900..656ffad79e 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ClientCacheStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientCacheStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientCacheStatusPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ClientCacheStatusPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp b/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp deleted file mode 100644 index 09ef73cfa2..0000000000 --- a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @file ClientCheatAbilityPacket.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Packet.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class ClientCheatAbilityPacket : public Packet { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTCHEATABILITYPACKET -public: - class ClientCheatAbilityPacket& operator=(class ClientCheatAbilityPacket const &) = delete; - ClientCheatAbilityPacket(class ClientCheatAbilityPacket const &) = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getId\@ClientCheatAbilityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ - */ - virtual enum class MinecraftPacketIds getId() const; - /** - * @vftbl 2 - * @symbol ?getName\@ClientCheatAbilityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - virtual std::string getName() const; - /** - * @vftbl 3 - * @symbol ?write\@ClientCheatAbilityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z - */ - virtual void write(class BinaryStream &) const; - /** - * @vftbl 7 - * @symbol ?_read\@ClientCheatAbilityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z - */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0ClientCheatAbilityPacket\@\@QEAA\@XZ - */ - MCAPI ClientCheatAbilityPacket(); - -}; diff --git a/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp b/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp index 046290729d..d35804d206 100644 --- a/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp @@ -31,9 +31,5 @@ class ClientInteractStopRidingSystem { * @symbol ?createSystem\@ClientInteractStopRidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@ClientInteractStopRidingSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURuntimeIDComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class StrictEntityContext &, struct PassengerComponent const &, struct StateVectorComponent const &, class EntityModifierT &, class ViewT, struct RuntimeIDComponent const>); }; diff --git a/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystemImpl.hpp b/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystemImpl.hpp new file mode 100644 index 0000000000..5fa8057408 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file ClientInteractStopRidingSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ClientInteractStopRidingSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tick\@ClientInteractStopRidingSystemImpl\@\@YAXU?$type_list\@U?$Include\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@entt\@\@AEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEBUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURuntimeIDComponent\@\@\@\@\@Z + */ + MCAPI void tick(struct entt::type_list, class FlagComponent>, struct Exclude, class FlagComponent>>, class StrictEntityContext const &, struct PassengerComponent const &, struct StateVectorComponent const &, class EntityModifierT, class ViewT, struct RuntimeIDComponent const>); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClientPlayerInputFilterSystem.hpp b/LiteLoader/include/llapi/mc/ClientPlayerInputFilterSystem.hpp deleted file mode 100644 index 38632af11e..0000000000 --- a/LiteLoader/include/llapi/mc/ClientPlayerInputFilterSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ClientPlayerInputFilterSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ClientPlayerInputFilterSystem. - * - */ -class ClientPlayerInputFilterSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTPLAYERINPUTFILTERSYSTEM -public: - class ClientPlayerInputFilterSystem& operator=(class ClientPlayerInputFilterSystem const &) = delete; - ClientPlayerInputFilterSystem(class ClientPlayerInputFilterSystem const &) = delete; - ClientPlayerInputFilterSystem() = delete; -#endif - -public: - /** - * @symbol ?create\@ClientPlayerInputFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo create(); - -//private: - /** - * @symbol ?tickSystem\@ClientPlayerInputFilterSystem\@\@CAXAEAVStrictEntityContext\@\@AEBVLoadingStateComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerInputRequestComponent\@\@\@\@\@Z - */ - MCAPI static void tickSystem(class StrictEntityContext &, class LoadingStateComponent const &, class EntityModifierT); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp index d500ebbcb8..71454a28c2 100644 --- a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp @@ -36,20 +36,15 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 5 + * @symbol ?clip\@ClientRequestPlaceholderBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void __unk_vfn_28(); + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +121,50 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +176,60 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 174 - * @symbol ?clip\@ClientRequestPlaceholderBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0ClientRequestPlaceholderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp b/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp index bfe1b35f0a..5d78ac23f5 100644 --- a/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp @@ -46,9 +46,9 @@ struct ClientStopGlidingSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol ?tick\@ClientStopGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UStateVectorComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UOffsetsComponent\@\@UPlayerActionComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol ?tick\@ClientStopGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@$$V\@\@U?$Write\@UOffsetsComponent\@\@UPlayerActionComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@UShouldUpdateBoundingBoxRequestComponent\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent>, struct Read, struct Write, struct AddRemove, class FlagComponent>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent>, struct Read<>, struct Write, struct AddRemove, struct ShouldUpdateBoundingBoxRequestComponent>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createClientStopGlidingSystem\@ClientStopGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp index 8b1b256a96..e18e2d0d3c 100644 --- a/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ClientToServerHandshakePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientToServerHandshakePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientToServerHandshakePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ClientToServerHandshakePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp index 6977523a24..e8cdd6a328 100644 --- a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ClientboundDebugRendererPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientboundDebugRendererPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientboundDebugRendererPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTBOUNDDEBUGRENDERERPACKET /** * @symbol __unk_destructor_-1 @@ -64,13 +65,13 @@ class ClientboundDebugRendererPacket : public Packet { * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@AEBVVec3\@\@V?$duration\@_JU?$ratio\@$00$0DOI\@\@std\@\@\@chrono\@2\@\@Z */ MCAPI ClientboundDebugRendererPacket(std::string, class mce::Color const &, class Vec3 const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000>>); - /** - * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@W4Type\@0\@\@Z - */ - MCAPI ClientboundDebugRendererPacket(enum class ClientboundDebugRendererPacket::Type); /** * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@XZ */ MCAPI ClientboundDebugRendererPacket(); + /** + * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@W4Type\@0\@\@Z + */ + MCAPI ClientboundDebugRendererPacket(enum class ClientboundDebugRendererPacket::Type); }; diff --git a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp index 95eb1aec0a..e7c49083d0 100644 --- a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "MapItemTrackedActor.hpp" #include "Packet.hpp" @@ -21,6 +22,7 @@ class ClientboundMapItemDataPacket : public Packet { #define AFTER_EXTRA // Add Member There + char val[0x98]{}; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTBOUNDMAPITEMDATAPACKET @@ -52,9 +54,9 @@ class ClientboundMapItemDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ClientboundMapItemDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ClientboundMapItemDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTBOUNDMAPITEMDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ClockItem.hpp b/LiteLoader/include/llapi/mc/ClockItem.hpp index a6d8abef38..56b6160025 100644 --- a/LiteLoader/include/llapi/mc/ClockItem.hpp +++ b/LiteLoader/include/llapi/mc/ClockItem.hpp @@ -52,10 +52,10 @@ class ClockItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/CloneCommand.hpp b/LiteLoader/include/llapi/mc/CloneCommand.hpp index d8d50f3c91..3e1bc135b9 100644 --- a/LiteLoader/include/llapi/mc/CloneCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloneCommand.hpp @@ -36,7 +36,7 @@ class CloneCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@CloneCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp index bc2fb76618..f42b2adee6 100644 --- a/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp @@ -36,7 +36,7 @@ class CloseWebSocketCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@CloseWebSocketCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CoalItem.hpp b/LiteLoader/include/llapi/mc/CoalItem.hpp index d674c3c73a..80ec0eba8a 100644 --- a/LiteLoader/include/llapi/mc/CoalItem.hpp +++ b/LiteLoader/include/llapi/mc/CoalItem.hpp @@ -52,10 +52,10 @@ class CoalItem : public ComponentItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp index e1ef41cacd..785e81b22c 100644 --- a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp @@ -36,20 +36,10 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class CobblestoneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class CobblestoneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class CobblestoneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +171,65 @@ class CobblestoneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 158 + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 156 * @symbol ?tryGetInfested\@CobblestoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0CobblestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CocoaBeanItem.hpp b/LiteLoader/include/llapi/mc/CocoaBeanItem.hpp new file mode 100644 index 0000000000..b796701cc3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CocoaBeanItem.hpp @@ -0,0 +1,144 @@ +/** + * @file CocoaBeanItem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Json.hpp" +#include "Item.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CocoaBeanItem : public Item { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COCOABEANITEM +public: + class CocoaBeanItem& operator=(class CocoaBeanItem const &) = delete; + CocoaBeanItem(class CocoaBeanItem const &) = delete; + CocoaBeanItem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol ?isDye\@CocoaBeanItem\@\@UEBA_NXZ + */ + virtual bool isDye() const; + /** + * @vftbl 20 + * @symbol ?getItemColor\@CocoaBeanItem\@\@UEBA?AW4ItemColor\@\@XZ + */ + virtual enum class ItemColor getItemColor() const; + /** + * @vftbl 21 + * @symbol __unk_vfn_21 + */ + virtual void __unk_vfn_21(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 66 + * @symbol __unk_vfn_66 + */ + virtual void __unk_vfn_66(); + /** + * @vftbl 67 + * @symbol ?isValidAuxValue\@CocoaBeanItem\@\@UEBA_NH\@Z + */ + virtual bool isValidAuxValue(int) const; + /** + * @vftbl 70 + * @symbol __unk_vfn_70 + */ + virtual void __unk_vfn_70(); + /** + * @vftbl 71 + * @symbol __unk_vfn_71 + */ + virtual void __unk_vfn_71(); + /** + * @vftbl 72 + * @symbol __unk_vfn_72 + */ + virtual void __unk_vfn_72(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 79 + * @symbol __unk_vfn_79 + */ + virtual void __unk_vfn_79(); + /** + * @vftbl 80 + * @symbol __unk_vfn_80 + */ + virtual void __unk_vfn_80(); + /** + * @vftbl 95 + * @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; + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @vftbl 119 + * @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); + /** + * @vftbl 135 + * @symbol ?_useOn\@CocoaBeanItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + */ + virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + /** + * @symbol ??0CocoaBeanItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + */ + MCAPI CocoaBeanItem(std::string const &, int, bool); + +}; diff --git a/LiteLoader/include/llapi/mc/CocoaBlock.hpp b/LiteLoader/include/llapi/mc/CocoaBlock.hpp index de44f2d634..e3280c983e 100644 --- a/LiteLoader/include/llapi/mc/CocoaBlock.hpp +++ b/LiteLoader/include/llapi/mc/CocoaBlock.hpp @@ -36,20 +36,15 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@CocoaBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class CocoaBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class CocoaBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class CocoaBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,65 +121,75 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 85 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 88 * @symbol ?onFertilized\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@CocoaBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,82 +201,82 @@ class CocoaBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@CocoaBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@CocoaBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CodeBuilder.hpp b/LiteLoader/include/llapi/mc/CodeBuilder.hpp index 468e437b15..7c318525ef 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilder.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilder.hpp @@ -45,17 +45,21 @@ struct DataMessage; */ MCAPI bool fromString(std::string const &, enum class CodeBuilder::EncryptionCipherMode &); /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@AEBV23\@\@Z + * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@\@Z */ - MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &, std::string const &); + MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &); /** * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandMessage\@1\@\@Z */ MCAPI std::string serialize(struct CodeBuilder::CommandMessage const &); /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@\@Z + * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEncryptionResult\@1\@\@Z */ - MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &); + MCAPI std::string serialize(struct CodeBuilder::EncryptionResult const &); + /** + * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUChatMessage\@1\@AEBV23\@\@Z + */ + MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &, std::string const &); /** * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUErrorMessage\@1\@\@Z */ @@ -64,10 +68,6 @@ struct DataMessage; * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUDataMessage\@1\@\@Z */ MCAPI std::string serialize(struct CodeBuilder::DataMessage const &); - /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEncryptionResult\@1\@\@Z - */ - MCAPI std::string serialize(struct CodeBuilder::EncryptionResult const &); /** * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEventMessage\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp b/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp index 95051d5edc..bdbffb19cc 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp @@ -34,7 +34,7 @@ class CodeBuilderActorInfoCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@CodeBuilderActorInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp index 51c88396da..2c6794b6db 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp @@ -36,7 +36,7 @@ class CodeBuilderCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@CodeBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp index e228f09d0a..18b92eb18d 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class CodeBuilderPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CodeBuilderPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CodeBuilderPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CODEBUILDERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp index 248a11d648..fe15471fc7 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class CodeBuilderSourcePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CodeBuilderSourcePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CodeBuilderSourcePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CodeBuilderSourcePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CollisionBoxComponent.hpp b/LiteLoader/include/llapi/mc/CollisionBoxComponent.hpp new file mode 100644 index 0000000000..7b86602f23 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CollisionBoxComponent.hpp @@ -0,0 +1,36 @@ +/** + * @file CollisionBoxComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CollisionBoxComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COLLISIONBOXCOMPONENT +public: + class CollisionBoxComponent& operator=(class CollisionBoxComponent const &) = delete; + CollisionBoxComponent(class CollisionBoxComponent const &) = delete; + CollisionBoxComponent() = delete; +#endif + +public: + /** + * @symbol ?fromVec3\@CollisionBoxComponent\@\@QEAAXAEBVVec3\@\@\@Z + */ + MCAPI void fromVec3(class Vec3 const &); + /** + * @symbol ?getDefaultBB\@CollisionBoxComponent\@\@QEBAAEBVVec2\@\@XZ + */ + MCAPI class Vec2 const & getDefaultBB() const; + +}; diff --git a/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp b/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp index c8be4aaf01..3116091d04 100644 --- a/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp @@ -12,11 +12,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure CollisionBoxDefinition. - * - */ -struct CollisionBoxDefinition { + +class CollisionBoxDefinition { #define AFTER_EXTRA // Add Member There @@ -24,16 +21,16 @@ struct CollisionBoxDefinition { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_COLLISIONBOXDEFINITION public: - struct CollisionBoxDefinition& operator=(struct CollisionBoxDefinition const &) = delete; - CollisionBoxDefinition(struct CollisionBoxDefinition const &) = delete; + class CollisionBoxDefinition& operator=(class CollisionBoxDefinition const &) = delete; + CollisionBoxDefinition(class CollisionBoxDefinition const &) = delete; CollisionBoxDefinition() = delete; #endif public: /** - * @symbol ?initialize\@CollisionBoxDefinition\@\@QEBAXAEAVEntityContext\@\@AEAUCollisionBoxDefinitionComponent\@\@\@Z + * @symbol ?initialize\@CollisionBoxDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVCollisionBoxComponent\@\@\@Z */ - MCAPI void initialize(class EntityContext &, struct CollisionBoxDefinitionComponent &) const; + MCAPI void initialize(class EntityContext &, class CollisionBoxComponent &) const; /** * @symbol ?setHeight\@CollisionBoxDefinition\@\@QEAAXAEBM\@Z */ @@ -43,12 +40,8 @@ struct CollisionBoxDefinition { */ MCAPI void setWidth(float const &); /** - * @symbol ?buildSchema\@CollisionBoxDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCollisionBoxDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z - */ - MCAPI static void buildSchema(class std::shared_ptr> &); - /** - * @symbol ?mBoxEpsilon\@CollisionBoxDefinition\@\@2MB + * @symbol ?buildSchema\@CollisionBoxDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VCollisionBoxDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ - MCAPI static float const mBoxEpsilon; + MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ColorFormat.hpp b/LiteLoader/include/llapi/mc/ColorFormat.hpp index 78d28aa91a..189ab720c2 100644 --- a/LiteLoader/include/llapi/mc/ColorFormat.hpp +++ b/LiteLoader/include/llapi/mc/ColorFormat.hpp @@ -102,9 +102,9 @@ LIAPI std::string& transferColorCodeToConsole(std::string& str, bool keepColorCo */ MCAPI extern std::string const ESCAPE; /** - * @symbol ?FromString\@ColorFormat\@\@YA?BV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?FormatCodeFromName\@ColorFormat\@\@YA?BV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ - MCAPI class std::basic_string_view> const FromString(std::string const &); + MCAPI class std::basic_string_view> const FormatCodeFromName(std::string const &); /** * @symbol ?GOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/ColoredTerracottaBlock.hpp b/LiteLoader/include/llapi/mc/ColoredTerracottaBlock.hpp index 3a3a278654..05ac6a12d3 100644 --- a/LiteLoader/include/llapi/mc/ColoredTerracottaBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredTerracottaBlock.hpp @@ -31,20 +31,10 @@ class ColoredTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class ColoredTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class ColoredTerracottaBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class ColoredTerracottaBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class ColoredTerracottaBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,45 +111,55 @@ class ColoredTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@ColoredTerracottaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@ColoredTerracottaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,77 +171,82 @@ class ColoredTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @symbol ?buildDescriptionId\@ColoredTerracottaBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@ColoredTerracottaBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@ColoredTerracottaBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ColoredTerracottaBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@ColoredTerracottaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp index 3a71d55dd1..bcf5db44d8 100644 --- a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp @@ -36,20 +36,10 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ColoredTorchBlock : public TorchBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ColoredTorchBlock : public TorchBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ColoredTorchBlock : public TorchBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,55 +116,65 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 65 + * @vftbl 68 * @symbol ?canBeUsedInCommands\@ColoredTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@ColoredTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@ColoredTorchBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,77 +186,82 @@ class ColoredTorchBlock : public TorchBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@ColoredTorchBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@ColoredTorchBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@ColoredTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ColoredTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Command.hpp b/LiteLoader/include/llapi/mc/Command.hpp index 4a9c30e239..dac9e599d2 100644 --- a/LiteLoader/include/llapi/mc/Command.hpp +++ b/LiteLoader/include/llapi/mc/Command.hpp @@ -52,7 +52,6 @@ class Command { Command(class Command const &) = delete; #endif -public: public: /** * @vftbl 0 @@ -105,14 +104,14 @@ class Command { * @symbol ?shouldUseCommandOriginRotation\@Command\@\@SA_NAEBVCommandOrigin\@\@H\@Z */ MCAPI static bool shouldUseCommandOriginRotation(class CommandOrigin const &, int); - /** - * @symbol ?validRange\@Command\@\@SA_NMMMAEAVCommandOutput\@\@\@Z - */ - MCAPI static bool validRange(float, float, float, class CommandOutput &); /** * @symbol ?validRange\@Command\@\@SA_NHHHAEAVCommandOutput\@\@\@Z */ MCAPI static bool validRange(int, int, int, class CommandOutput &); + /** + * @symbol ?validRange\@Command\@\@SA_NMMMAEAVCommandOutput\@\@\@Z + */ + MCAPI static bool validRange(float, float, float, class CommandOutput &); //protected: /** diff --git a/LiteLoader/include/llapi/mc/CommandBlock.hpp b/LiteLoader/include/llapi/mc/CommandBlock.hpp index fd6b6311df..e4a6309766 100644 --- a/LiteLoader/include/llapi/mc/CommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlock.hpp @@ -36,20 +36,10 @@ class CommandBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class CommandBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class CommandBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class CommandBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class CommandBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,65 +116,75 @@ class CommandBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 72 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 75 * @symbol ?onRedstoneUpdate\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CommandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@CommandBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -202,84 +197,89 @@ class CommandBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@CommandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CommandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@CommandBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CommandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDBLOCK /** * @symbol ?canInstatick\@CommandBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CommandBlockActor.hpp b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp index da4e8b5392..21bcaa2acf 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp @@ -95,6 +95,11 @@ class CommandBlockActor : public BlockActor { * @symbol ?setCustomName\@CommandBlockActor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setCustomName(std::string const &); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -121,22 +126,27 @@ class CommandBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@CommandBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@CommandBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 41 + * @vftbl 42 * @symbol ?_playerCanUpdate\@CommandBlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; diff --git a/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp b/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp index b0bf5aa053..933cd9fcd5 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp @@ -28,14 +28,14 @@ class CommandBlockComponent { #endif public: - /** - * @symbol ??0CommandBlockComponent\@\@QEAA\@XZ - */ - MCAPI CommandBlockComponent(); /** * @symbol ??0CommandBlockComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI CommandBlockComponent(class CommandBlockComponent &&); + /** + * @symbol ??0CommandBlockComponent\@\@QEAA\@XZ + */ + MCAPI CommandBlockComponent(); /** * @symbol ?addAdditionalSaveData\@CommandBlockComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandBlockName.hpp b/LiteLoader/include/llapi/mc/CommandBlockName.hpp index b2a7391ada..f125d6416c 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockName.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockName.hpp @@ -44,10 +44,6 @@ class CommandBlockName { * @symbol ??BCommandBlockName\@\@QEBA_KXZ */ MCAPI operator unsigned __int64() const; - /** - * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@H\@Z - */ - MCAPI class CommandBlockNameResult resolveBlock(int) const; /** * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@HAEAVCommandOutput\@\@\@Z */ @@ -56,5 +52,9 @@ class CommandBlockName { * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, class CommandOutput &) const; + /** + * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@H\@Z + */ + MCAPI class CommandBlockNameResult resolveBlock(int) const; }; diff --git a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp index 7ecdfd8fe6..26be8452af 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -50,9 +51,9 @@ class CommandBlockUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CommandBlockUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CommandBlockUpdatePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDBLOCKUPDATEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CommandOutput.hpp b/LiteLoader/include/llapi/mc/CommandOutput.hpp index 429f9b5577..0836b0ce7c 100644 --- a/LiteLoader/include/llapi/mc/CommandOutput.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutput.hpp @@ -102,14 +102,14 @@ class CommandOutput { #endif public: - /** - * @symbol ??0CommandOutput\@\@QEAA\@W4CommandOutputType\@\@\@Z - */ - MCAPI CommandOutput(enum class CommandOutputType); /** * @symbol ??0CommandOutput\@\@QEAA\@AEBV0\@\@Z */ MCAPI CommandOutput(class CommandOutput const &); + /** + * @symbol ??0CommandOutput\@\@QEAA\@W4CommandOutputType\@\@\@Z + */ + MCAPI CommandOutput(enum class CommandOutputType); /** * @symbol ?addToResultList\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z */ @@ -158,14 +158,14 @@ class CommandOutput { * @symbol ?setHasPlayerText\@CommandOutput\@\@QEAAXXZ */ MCAPI void setHasPlayerText(); - /** - * @symbol ?success\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z - */ - MCAPI void success(std::string const &, std::vector const &); /** * @symbol ?success\@CommandOutput\@\@QEAAXXZ */ MCAPI void success(); + /** + * @symbol ?success\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z + */ + MCAPI void success(std::string const &, std::vector const &); /** * @symbol ?wantsData\@CommandOutput\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp index a0725c5f6d..f18cecb23b 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class CommandOutputPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CommandOutputPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CommandOutputPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDOUTPUTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp index 03c37727eb..de8b6c5b70 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp @@ -32,6 +32,10 @@ class CommandOutputParameter { * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI CommandOutputParameter(std::vector const &); + /** + * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z + */ + MCAPI CommandOutputParameter(class BlockPos); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBVActor\@\@\@Z */ @@ -49,9 +53,9 @@ class CommandOutputParameter { */ MCAPI CommandOutputParameter(float); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@H\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z */ - MCAPI CommandOutputParameter(int); + MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z */ @@ -68,14 +72,18 @@ class CommandOutputParameter { * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI CommandOutputParameter(class CommandOutputParameter &&); + /** + * @symbol ??0CommandOutputParameter\@\@QEAA\@H\@Z + */ + MCAPI CommandOutputParameter(int); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI CommandOutputParameter(std::string const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV0\@\@Z */ - MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); + MCAPI CommandOutputParameter(class CommandOutputParameter const &); /** * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@\@Z */ @@ -84,14 +92,6 @@ class CommandOutputParameter { * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVPlayer\@\@V?$allocator\@PEBVPlayer\@\@\@std\@\@\@std\@\@\@Z */ MCAPI CommandOutputParameter(std::vector const &); - /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI CommandOutputParameter(class CommandOutputParameter const &); - /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z - */ - MCAPI CommandOutputParameter(class BlockPos); /** * @symbol ??4CommandOutputParameter\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandParameterData.hpp b/LiteLoader/include/llapi/mc/CommandParameterData.hpp index e38d5e8033..50769fe7f2 100644 --- a/LiteLoader/include/llapi/mc/CommandParameterData.hpp +++ b/LiteLoader/include/llapi/mc/CommandParameterData.hpp @@ -33,12 +33,14 @@ class CommandParameterData { ParseFn parser; // 8 std::string name; // 16 char const* desc; // 48 - int unk56; // 56 - CommandParameterDataType type; // 60 - int offset; // 64 - int flag_offset; // 68 - bool mand; // 72 - unsigned char options; // 73 + int fix_symbol; // 56 + char const* unk64; // 64 + int unk72; // 72 + CommandParameterDataType type; // 76 + int offset; // 80 + int set_offset; // 84 + bool is_optional; // 88 + unsigned char options; // 89 CommandParameterData() : tid(tid){}; @@ -50,11 +52,13 @@ class CommandParameterData { , parser(parser) , name(describe) , desc(enumName) - , unk56(-1) + , fix_symbol(-1) + , unk64(nullptr) + , unk72(-1) , type(type) , offset(offset) - , flag_offset(flag_offset) - , mand(optional) + , set_offset(flag_offset) + , is_optional(optional) , options(0){}; #undef AFTER_EXTRA @@ -65,14 +69,14 @@ class CommandParameterData { #endif public: - /** - * @symbol ??0CommandParameterData\@\@QEAA\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@3\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@7\@\@ZPEBDW4CommandParameterDataType\@\@7H_NH\@Z - */ - MCAPI CommandParameterData(class Bedrock::typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const, char const *, enum class CommandParameterDataType, char const *, int, bool, int); /** * @symbol ??0CommandParameterData\@\@QEAA\@AEBV0\@\@Z */ MCAPI CommandParameterData(class CommandParameterData const &); + /** + * @symbol ??0CommandParameterData\@\@QEAA\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@3\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@7\@\@ZPEBDW4CommandParameterDataType\@\@77H_NH\@Z + */ + MCAPI CommandParameterData(class Bedrock::typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const, char const *, enum class CommandParameterDataType, char const *, char const *, int, bool, int); /** * @symbol ?addOptions\@CommandParameterData\@\@QEAAAEAV1\@W4CommandParameterOption\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandRegistry.hpp b/LiteLoader/include/llapi/mc/CommandRegistry.hpp index a21abb7462..4bca95eadd 100644 --- a/LiteLoader/include/llapi/mc/CommandRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandRegistry.hpp @@ -24,6 +24,7 @@ class CommandParameterData; #include "CommandItem.hpp" #include "CommandIntegerRange.hpp" #include "CommandBlockName.hpp" +#include "BlockStateCommandParam.hpp" #include "ActorDamageSource.hpp" #undef BEFORE_EXTRA @@ -42,8 +43,7 @@ class CommandRegistry { class Symbol { public: int val; - MCAPI Symbol(unsigned __int64 = -1); - MCAPI Symbol(class Symbol const&); + MCAPI unsigned __int64 toIndex() const; MCAPI int value() const; inline bool operator==(Symbol const& right) const { @@ -115,15 +115,16 @@ class CommandRegistry { std::string name; // 0 std::string desc; // 32 std::vector overloads; // 64 - CommandPermissionLevel perm; // 88 - Symbol main_symbol; // 92 - Symbol alt_symbol; // 96 - CommandFlag flag; // 100 - int firstRule; - int firstFactorization; - int firstOptional; - bool runnable; - size_t ruleCounter; + std::vector unk88; // 88 + CommandPermissionLevel perm; // 112 + Symbol main_symbol; // 116 + Symbol alt_symbol; // 120 + CommandFlag flag; // 124 + int firstRule; // 128 + int firstFactorization; // 132 + int firstOptional; // 136 + bool runnable; // 140 + size_t ruleCounter; // 144 inline Signature(std::string_view name, std::string_view desc, @@ -145,7 +146,7 @@ class CommandRegistry { struct Enum { std::string name; // 0 - Bedrock::typeid_t type; // 32 + Bedrock::typeid_t type; // 32 ParseFn parse; // 40 std::vector> values; // 48 @@ -266,82 +267,52 @@ class CommandRegistry { }; using CommandOverrideFunctor = std::function, class std::allocator> const&)>; - using ParamSymbols = std::array; - - std::function mGetScoreForObjective; // 0 - std::function mNetworkUpdateCallback; // 64 - std::vector mRules; // 128 - // map - std::map mParseTableMap; // 152 - std::vector mOptionals; // 168 - std::vector mEnumValues; // 192 - std::vector mEnums; // 216 - std::vector mFactorizations; // 240 - std::vector mPostfixes; // 264 - std::map mEnumLookup; // 288 - std::map mEnumValueLookup; // 304 - 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 + using ParamSymbols = std::array; + + std::function mGetScoreForObjective;//0 + std::function mNetworkUpdateCallback;//64 + std::vector mRules;//128 + std::map mParseTableMap;//152 + std::vector mOptionals; //168 + std::vector mEnumValues;//192 + std::vector mEnums;//216 + char filler48[48]; + std::vector mFactorizations;//288 + std::vector mPostfixes;//312 + std::map mEnumLookup;//336 + std::map mEnumValueLookup;//352 + std::vector mCommandSymbols;//368 + char filler32[32]; + std::map mSignatures;//424 + std::map,int> mTypeLookup;//440 + std::map mAliases;//456 + std::vector mSemanticConstraints;//472 + std::map mSemanticConstraintLookup;//496 + std::vector mConstrainedValues;//512 + std::map, unsigned int> mConstrainedValueLookup;//536 + std::vector mSoftEnums;//552 + std::map mSoftEnumLookup;//576 + std::vector mStateStack; //592 + ParamSymbols mArgs;//616 + char filler[64]; + CommandOverrideFunctor mCommandOverrideFunctor;//712 + //840 + + inline void printAll() const; inline void printSize() const; void test() { - auto mParseTableMapCopy = mParseTableMap; - auto mEnumLookupCopy = mEnumLookup; - auto mEnumValueLookupCopy = mEnumValueLookup; - auto mSignaturesCopy = mSignatures; - auto mTypeLookupCopy = mTypeLookup; - auto unk376Copy = unk376; - auto mAliasesCopy = mAliases; - auto mSemanticConstraintLookupCopy = mSemanticConstraintLookup; - auto mConstrainedValueLookupCopy = mConstrainedValueLookup; - auto mSoftEnumLookupCopy = mSoftEnumLookup; - constexpr auto size = sizeof(CommandRegistry); + static_assert(size == 840); static_assert(sizeof(Enum) == 72); - static_assert(sizeof(ParseTable) == 48); - static_assert(sizeof(ParseRule) == 104); - static_assert(sizeof(CommandRegistry) == 0x2c0); - static_assert(offsetof(CommandRegistry, mGetScoreForObjective) == 0); - static_assert(offsetof(CommandRegistry, mNetworkUpdateCallback) == 64); - static_assert(offsetof(CommandRegistry, mRules) == 128); - static_assert(offsetof(CommandRegistry, mParseTableMap) == 152); - static_assert(offsetof(CommandRegistry, mOptionals) == 168); static_assert(offsetof(CommandRegistry, mEnumValues) == 192); static_assert(offsetof(CommandRegistry, mEnums) == 216); - static_assert(offsetof(CommandRegistry, mFactorizations) == 240); - static_assert(offsetof(CommandRegistry, mPostfixes) == 264); - static_assert(offsetof(CommandRegistry, mEnumLookup) == 288); - static_assert(offsetof(CommandRegistry, mEnumValueLookup) == 304); - 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, mCommandSymbols) == 368); + static_assert(offsetof(CommandRegistry, mSignatures) == 424); + static_assert(offsetof(CommandRegistry, mSoftEnumLookup) == 576); } #endif // COMMAND_REGISTRY_EXTRA @@ -362,13 +333,13 @@ class CommandRegistry { fakeParse(void*, ParseToken const&, CommandOrigin const&, int, std::string&, std::vector&) const { return false; } + inline static std::unordered_map parse_ptr = { {typeid(CommandMessage).name(), - dlsym_real( - "??$parse@VCommandMessage@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@" - "@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_" - "string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$" - "char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VCommandMessage@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@" + "@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_" + "string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$" + "char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(std::string).name(), dlsym_real("??$parse@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@" "CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_" @@ -391,58 +362,76 @@ class CommandRegistry { "string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@" "DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(CommandSelector).name(), - dlsym_real( - "??$parse@V?$CommandSelector@VActor@@@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@" - "AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@" - "AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@" - "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@V?$CommandSelector@VActor@@@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@" + "AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@" + "AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@" + "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(CommandSelector).name(), - dlsym_real( - "??$parse@V?$CommandSelector@VPlayer@@@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@" - "AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@" - "AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@" - "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@V?$CommandSelector@VPlayer@@@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@" + "AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@" + "AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@" + "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(CommandPosition).name(), - dlsym_real( - "??$parse@VCommandPosition@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@" - "HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@" - "DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@" - "std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VCommandPosition@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@" + "HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@" + "DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@" + "std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(CommandPositionFloat).name(), - dlsym_real( - "??$parse@VCommandPositionFloat@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@" - "HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@" - "DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@" - "V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VCommandPositionFloat@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@" + "HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@" + "DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@" + "V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(Json::Value).name(), - dlsym_real( - "??$parse@VValue@Json@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@" - "HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@" - "DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@" - "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VValue@Json@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@" + "HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@" + "DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@" + "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(std::unique_ptr).name(), - dlsym_real( - "??$parse@V?$unique_ptr@VCommand@@U?$default_delete@VCommand@@@std@@@std@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@V?$unique_ptr@VCommand@@U?$default_delete@VCommand@@@std@@@std@@@CommandRegistry@@AEBA_" + "NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@" + "D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@" + "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(RelativeFloat).name(), - dlsym_real( - "??$parse@VRelativeFloat@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VRelativeFloat@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$" + "basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_" + "traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$" + "allocator@D@2@@std@@@2@@4@@Z")}, {typeid(CommandRawText).name(), - dlsym_real( - "??$parse@VCommandRawText@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VCommandRawText@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$" + "basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_" + "traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$" + "allocator@D@2@@std@@@2@@4@@Z")}, {typeid(class MobEffect const*).name(), - dlsym_real( - "??$parse@PEBVMobEffect@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@PEBVMobEffect@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$" + "basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_" + "traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$" + "allocator@D@2@@std@@@2@@4@@Z")}, {typeid(CommandItem).name(), - dlsym_real( - "??$parse@VCommandItem@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VCommandItem@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$" + "basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_" + "traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$" + "allocator@D@2@@std@@@2@@4@@Z")}, {typeid(WildcardCommandSelector).name(), - dlsym_real( - "??$parse@V?$WildcardCommandSelector@VActor@@@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@V?$WildcardCommandSelector@VActor@@@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@" + "AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@" + "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$" + "char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(ActorDefinitionIdentifier const*).name(), - dlsym_real( - "??$parse@PEBUActorDefinitionIdentifier@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@PEBUActorDefinitionIdentifier@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@" + "AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@" + "V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$" + "char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, {typeid(CommandBlockName).name(), - dlsym_real("??$parse@VCommandBlockName@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, + dlsym_real("??$parse@VCommandBlockName@@@CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?" + "$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_" + "traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$" + "allocator@D@2@@std@@@2@@4@@Z")}, + {typeid(std::vector).name(), + dlsym_real( + "??$parse@V?$vector@VBlockStateCommandParam@@V?$allocator@VBlockStateCommandParam@@@std@@@std@@@" + "CommandRegistry@@AEBA_NPEAXAEBUParseToken@0@AEBVCommandOrigin@@HAEAV?$basic_string@DU?$char_traits@D@std@" + "@V?$allocator@D@2@@std@@AEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$" + "allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z")}, }; private: @@ -575,6 +564,10 @@ class CommandRegistry { * @symbol ?buildSelector\@CommandRegistry\@\@QEBA_NAEBUActorSelectorArgs\@\@PEAVCommandSelectorBase\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool buildSelector(struct ActorSelectorArgs const &, class CommandSelectorBase *, std::string &) const; + /** + * @symbol ?finalizeChainedSubcommandOverloadRules\@CommandRegistry\@\@QEAAXPEBD\@Z + */ + MCAPI void finalizeChainedSubcommandOverloadRules(char const *); /** * @symbol ?fireCommandParseTableTelemetry\@CommandRegistry\@\@QEBAXAEBVIMinecraftEventing\@\@_N\@Z */ @@ -701,6 +694,14 @@ class CommandRegistry { MCAPI static char const * TAG_VALUES_SOFTENUM_NAME; //private: + /** + * @symbol ?_addChainedSubcommandValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@ZPEAUSignature\@1\@\@Z + */ + MCAPI class CommandRegistry::Symbol _addChainedSubcommandValuesInternal(std::string const &, std::vector> const &, class Bedrock::typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const, struct CommandRegistry::Signature *); + /** + * @symbol ?_addChainedSubcommandValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@_KI\@std\@\@V?$allocator\@U?$pair\@_KI\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@ZPEAUSignature\@1\@\@Z + */ + MCAPI class CommandRegistry::Symbol _addChainedSubcommandValuesInternal(std::string const &, std::vector> const &, class Bedrock::typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const, struct CommandRegistry::Signature *); /** * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@Bedrock\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z */ @@ -725,6 +726,10 @@ class CommandRegistry { * @symbol ?_matchesEnumConstraintsSet\@CommandRegistry\@\@AEBA_NAEBVSymbol\@1\@AEBVCommandOrigin\@\@0W4SemanticConstraint\@\@\@Z */ MCAPI bool _matchesEnumConstraintsSet(class CommandRegistry::Symbol const &, class CommandOrigin const &, class CommandRegistry::Symbol const &, enum class SemanticConstraint) const; + /** + * @symbol ?addChainedSubcommandValuesToExisting\@CommandRegistry\@\@AEAAXIAEBV?$vector\@U?$pair\@_KI\@std\@\@V?$allocator\@U?$pair\@_KI\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI void addChainedSubcommandValuesToExisting(unsigned int, std::vector> const &); /** * @symbol ?addEnumValuesToExisting\@CommandRegistry\@\@AEAAXIAEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@std\@\@\@Z */ @@ -734,9 +739,9 @@ class CommandRegistry { */ MCAPI class CommandRegistry::Symbol addPostfix(std::string const &); /** - * @symbol ?addRule\@CommandRegistry\@\@AEAAXVSymbol\@1\@$$QEAV?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@std\@\@V?$function\@$$A6APEAUParseToken\@CommandRegistry\@\@AEAU12\@VSymbol\@2\@\@Z\@4\@VCommandVersion\@\@\@Z + * @symbol ?addRule\@CommandRegistry\@\@AEAAXVSymbol\@1\@V?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@std\@\@V?$function\@$$A6APEAUParseToken\@CommandRegistry\@\@AEAU12\@VSymbol\@2\@\@Z\@4\@VCommandVersion\@\@\@Z */ - MCAPI void addRule(class CommandRegistry::Symbol, std::vector &&, class std::function, class CommandVersion); + MCAPI void addRule(class CommandRegistry::Symbol, std::vector, class std::function, class CommandVersion); /** * @symbol ?addSemanticConstraint\@CommandRegistry\@\@AEAAXW4SemanticConstraint\@\@\@Z */ @@ -757,6 +762,10 @@ class CommandRegistry { * @symbol ?buildOptionalRuleChain\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBUSignature\@1\@AEBV?$vector\@VCommandParameterData\@\@V?$allocator\@VCommandParameterData\@\@\@std\@\@\@std\@\@AEBV?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@5\@\@Z */ MCAPI class CommandRegistry::Symbol buildOptionalRuleChain(struct CommandRegistry::Signature const &, std::vector const &, std::vector const &); + /** + * @symbol ?buildOptionalRuleChain\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBUSignature\@1\@AEBV?$vector\@VCommandParameterData\@\@V?$allocator\@VCommandParameterData\@\@\@std\@\@\@std\@\@PEBVCommandParameterData\@\@_K\@Z + */ + MCAPI class CommandRegistry::Symbol buildOptionalRuleChain(struct CommandRegistry::Signature const &, std::vector const &, class CommandParameterData const *, unsigned __int64); /** * @symbol ?buildParseTable\@CommandRegistry\@\@AEBAXI\@Z */ @@ -778,25 +787,25 @@ class CommandRegistry { */ MCAPI std::unique_ptr createCommand(struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const; /** - * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUSignature\@1\@AEBV23\@AEBUOverload\@1\@IPEAI3\@Z + * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSymbol\@1\@\@Z */ - MCAPI std::string describe(struct CommandRegistry::Signature const &, std::string const &, struct CommandRegistry::Overload const &, unsigned int, unsigned int *, unsigned int *) const; + MCAPI std::string describe(class CommandRegistry::Symbol) const; /** * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandParameterData\@\@\@Z */ MCAPI std::string describe(class CommandParameterData const &) const; /** - * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSymbol\@1\@\@Z - */ - MCAPI std::string describe(class CommandRegistry::Symbol) const; - /** - * @symbol ?findCommand\@CommandRegistry\@\@AEBAPEBUSignature\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUSignature\@1\@AEBV23\@AEBUOverload\@1\@IPEAI3\@Z */ - MCAPI struct CommandRegistry::Signature const * findCommand(std::string const &) const; + MCAPI std::string describe(struct CommandRegistry::Signature const &, std::string const &, struct CommandRegistry::Overload const &, unsigned int, unsigned int *, unsigned int *) const; /** * @symbol ?findCommand\@CommandRegistry\@\@AEAAPEAUSignature\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct CommandRegistry::Signature * findCommand(std::string const &); + /** + * @symbol ?findCommand\@CommandRegistry\@\@AEBAPEBUSignature\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI struct CommandRegistry::Signature const * findCommand(std::string const &) const; /** * @symbol ?findEnumValue\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -825,14 +834,14 @@ class CommandRegistry { * @symbol ?isValid\@CommandRegistry\@\@AEBA_NVSymbol\@1\@\@Z */ MCAPI bool isValid(class CommandRegistry::Symbol) const; - /** - * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUSignature\@1\@\@Z - */ - MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Signature const &) const; /** * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUOverload\@1\@\@Z */ MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Overload const &) const; + /** + * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUSignature\@1\@\@Z + */ + MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Signature const &) const; /** * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NPEAVCommandSelectorBase\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@_N\@Z */ @@ -845,6 +854,10 @@ class CommandRegistry { * @symbol ?registerOverloadInternal\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@AEAUOverload\@1\@\@Z */ MCAPI void registerOverloadInternal(struct CommandRegistry::Signature &, struct CommandRegistry::Overload &); + /** + * @symbol ?setupChainedSubcommandOverloadRules\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@\@Z + */ + MCAPI void setupChainedSubcommandOverloadRules(struct CommandRegistry::Signature &); /** * @symbol ?setupOverloadRules\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp index 3992d89623..6bfa766d21 100644 --- a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp @@ -52,9 +52,9 @@ class CommandRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CommandRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CommandRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDREQUESTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp index b2e800ddf9..f869862a9e 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp @@ -36,20 +36,10 @@ class ComparatorBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ComparatorBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ComparatorBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ComparatorBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ComparatorBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,91 +115,101 @@ class ComparatorBlock : public ActorBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 * @symbol ?isSignalSource\@ComparatorBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 58 + * @vftbl 61 * @symbol ?getDirectSignal\@ComparatorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@ComparatorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@ComparatorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 115 + * @vftbl 116 * @symbol ?triggerEvent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,87 +221,92 @@ class ComparatorBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@ComparatorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@ComparatorBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@ComparatorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ComparatorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp index 64726799d0..4c65181463 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp @@ -60,6 +60,11 @@ class ComparatorBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -86,17 +91,22 @@ class ComparatorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** - * @vftbl 42 + * @vftbl 43 * @symbol ?getOutputSignal\@ComparatorBlockActor\@\@UEAAHXZ */ virtual int getOutputSignal(); /** - * @vftbl 43 + * @vftbl 44 * @symbol ?setOutputSignal\@ComparatorBlockActor\@\@UEAAXH\@Z */ virtual void setOutputSignal(int); diff --git a/LiteLoader/include/llapi/mc/CompassItem.hpp b/LiteLoader/include/llapi/mc/CompassItem.hpp index 95beeb57e2..a722dbf666 100644 --- a/LiteLoader/include/llapi/mc/CompassItem.hpp +++ b/LiteLoader/include/llapi/mc/CompassItem.hpp @@ -52,10 +52,10 @@ class CompassItem : public AbstractCompassItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,7 @@ class CompassItem : public AbstractCompassItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@CompassItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp index a5b1fe3859..f4894e9ad8 100644 --- a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class CompletedUsingItemPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CompletedUsingItemPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CompletedUsingItemPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPLETEDUSINGITEMPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~CompletedUsingItemPacket(); #endif - /** - * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@FH\@Z - */ - MCAPI CompletedUsingItemPacket(short, int); /** * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@XZ */ MCAPI CompletedUsingItemPacket(); + /** + * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@FH\@Z + */ + MCAPI CompletedUsingItemPacket(short, int); }; diff --git a/LiteLoader/include/llapi/mc/ComplexAliasDescriptor.hpp b/LiteLoader/include/llapi/mc/ComplexAliasDescriptor.hpp index 4d4f7427b9..dd0af0de9a 100644 --- a/LiteLoader/include/llapi/mc/ComplexAliasDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ComplexAliasDescriptor.hpp @@ -7,21 +7,22 @@ #include "llapi/Global.h" #include "ItemDescriptor.hpp" #include "Json.hpp" +#include "Bedrock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -class ComplexAliasDescriptor { +struct ComplexAliasDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPLEXALIASDESCRIPTOR public: - class ComplexAliasDescriptor& operator=(class ComplexAliasDescriptor const &) = delete; - ComplexAliasDescriptor(class ComplexAliasDescriptor const &) = delete; + struct ComplexAliasDescriptor& operator=(struct ComplexAliasDescriptor const &) = delete; + ComplexAliasDescriptor(struct ComplexAliasDescriptor const &) = delete; ComplexAliasDescriptor() = delete; #endif @@ -85,5 +86,9 @@ class ComplexAliasDescriptor { * @symbol ??0ComplexAliasDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ComplexAliasDescriptor(std::string const &); + /** + * @symbol ?deserialize\@ComplexAliasDescriptor\@\@SA?AV?$Result\@V?$unique_ptr\@UComplexAliasDescriptor\@\@U?$default_delete\@UComplexAliasDescriptor\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI static class Bedrock::Result, class std::error_code> deserialize(class ReadOnlyBinaryStream &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp index 5533b5f27c..de1502bceb 100644 --- a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -46,14 +47,14 @@ InventoryTransaction data; virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol __unk_vfn_1 + * @symbol ?read\@ComplexInventoryTransaction\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual void __unk_vfn_1(); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@ComplexInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class BinaryStream &) const; /** * @vftbl 3 * @symbol ?postLoadItems\@ComplexInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z @@ -70,14 +71,6 @@ InventoryTransaction data; */ virtual void onTransactionError(class Player &, enum class InventoryTransactionError) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPLEXINVENTORYTRANSACTION - /** - * @symbol ?read\@ComplexInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z - */ - MCVAPI void read(class ReadOnlyBinaryStream &); - /** - * @symbol ?write\@ComplexInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z - */ - MCVAPI void write(class BinaryStream &) const; /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/ComplexItem.hpp b/LiteLoader/include/llapi/mc/ComplexItem.hpp index 6bfa303d15..8a37e1f0ea 100644 --- a/LiteLoader/include/llapi/mc/ComplexItem.hpp +++ b/LiteLoader/include/llapi/mc/ComplexItem.hpp @@ -52,10 +52,10 @@ class ComplexItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,7 @@ class ComplexItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 135 + * @vftbl 136 * @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 &, class Level &, class Actor &) const; diff --git a/LiteLoader/include/llapi/mc/ComponentComparer.hpp b/LiteLoader/include/llapi/mc/ComponentComparer.hpp index 258707c054..9b6f508f86 100644 --- a/LiteLoader/include/llapi/mc/ComponentComparer.hpp +++ b/LiteLoader/include/llapi/mc/ComponentComparer.hpp @@ -27,9 +27,5 @@ namespace ComponentComparer { * @symbol ?TOSTRING_NOT_IMPLEMENTED\@ComponentComparer\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const TOSTRING_NOT_IMPLEMENTED; - /** - * @symbol ?getDiffMessage\@ComponentComparer\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDAEBV23\@1\@Z - */ - MCAPI std::string getDiffMessage(char const *, std::string const &, std::string const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComponentInfo.hpp b/LiteLoader/include/llapi/mc/ComponentInfo.hpp index 05b81a8851..25b7dc1f2e 100644 --- a/LiteLoader/include/llapi/mc/ComponentInfo.hpp +++ b/LiteLoader/include/llapi/mc/ComponentInfo.hpp @@ -26,14 +26,14 @@ struct ComponentInfo { #endif public: - /** - * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct ComponentInfo & operator=(struct ComponentInfo &&); /** * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ComponentInfo & operator=(struct ComponentInfo const &); + /** + * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct ComponentInfo & operator=(struct ComponentInfo &&); /** * @symbol ??1ComponentInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ComponentItem.hpp b/LiteLoader/include/llapi/mc/ComponentItem.hpp index 2419a7f008..63e7b10556 100644 --- a/LiteLoader/include/llapi/mc/ComponentItem.hpp +++ b/LiteLoader/include/llapi/mc/ComponentItem.hpp @@ -104,10 +104,10 @@ class ComponentItem : public Item { */ virtual bool isDyeable() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 22 * @symbol ?isFood\@ComponentItem\@\@UEBA_NXZ @@ -440,6 +440,11 @@ class ComponentItem : public Item { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 134 + * @symbol ?_shouldAutoCalculatePlacePos\@ComponentItem\@\@EEBA_NXZ + */ + virtual bool _shouldAutoCalculatePlacePos() const; + /** + * @vftbl 135 * @symbol ?_useOn\@ComponentItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; @@ -497,14 +502,18 @@ class ComponentItem : public Item { * @symbol ?parseJsonEvents\@ComponentItem\@\@QEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool parseJsonEvents(class Json::Value const &, class SemVersion const &); + /** + * @symbol ?setCanDestroyInCreative\@ComponentItem\@\@QEAAX_N\@Z + */ + MCAPI void setCanDestroyInCreative(bool); /** * @symbol ?buildAllPatchSchemas\@ComponentItem\@\@SAXAEAVCerealDocumentUpgrader\@\@\@Z */ MCAPI static void buildAllPatchSchemas(class CerealDocumentUpgrader &); /** - * @symbol ?createItemAbstractCerealSchema\@ComponentItem\@\@SA?AUSchema\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createItemAbstractCerealSchema\@ComponentItem\@\@SA?AUSchema\@cereal\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI static struct reflection::Schema createItemAbstractCerealSchema(std::string const &); + MCAPI static struct cereal::Schema createItemAbstractCerealSchema(std::string const &); /** * @symbol ?registerItemComponentTypes\@ComponentItem\@\@SAXXZ */ @@ -543,6 +552,10 @@ class ComponentItem : public Item { * @symbol ?_parseCereal\@ComponentItem\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z */ MCAPI bool _parseCereal(class Json::Value const &, class SemVersion const &, bool, class Experiments const &); + /** + * @symbol ?_validateCerealComponent\@ComponentItem\@\@AEAA_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@_NAEBVExperiments\@\@\@Z + */ + MCAPI bool _validateCerealComponent(std::string, class SemVersion const &, bool, class Experiments const &); private: /** diff --git a/LiteLoader/include/llapi/mc/ComponentItemData.hpp b/LiteLoader/include/llapi/mc/ComponentItemData.hpp index df81bcff7f..ad40e5a533 100644 --- a/LiteLoader/include/llapi/mc/ComponentItemData.hpp +++ b/LiteLoader/include/llapi/mc/ComponentItemData.hpp @@ -11,26 +11,14 @@ #undef BEFORE_EXTRA -struct ComponentItemData { +namespace ComponentItemData { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPONENTITEMDATA -public: - struct ComponentItemData& operator=(struct ComponentItemData const &) = delete; - ComponentItemData(struct ComponentItemData const &) = delete; - ComponentItemData() = delete; -#endif - -public: - /** - * @symbol ??1ComponentItemData\@\@QEAA\@XZ - */ - MCAPI ~ComponentItemData(); /** - * @symbol ?VERSION\@ComponentItemData\@\@2VSemVersion\@\@B + * @symbol ?bindTypes\@ComponentItemData\@\@YAXXZ */ - MCAPI static class SemVersion const VERSION; + MCAPI void bindTypes(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComponentItemDataLoader.hpp b/LiteLoader/include/llapi/mc/ComponentItemDataLoader.hpp new file mode 100644 index 0000000000..22fd80e568 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComponentItemDataLoader.hpp @@ -0,0 +1,41 @@ +/** + * @file ComponentItemDataLoader.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Puv.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ComponentItemDataLoader { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPONENTITEMDATALOADER +public: + class ComponentItemDataLoader& operator=(class ComponentItemDataLoader const &) = delete; + ComponentItemDataLoader(class ComponentItemDataLoader const &) = delete; + ComponentItemDataLoader() = delete; +#endif + +public: + /** + * @symbol ??0ComponentItemDataLoader\@\@QEAA\@PEAVComponentItem\@\@VSemVersion\@\@\@Z + */ + MCAPI ComponentItemDataLoader(class ComponentItem *, class SemVersion); + /** + * @symbol ?load\@ComponentItemDataLoader\@\@QEBA?AV?$LoadResult\@UComponentItemData_v1_20\@\@\@Puv\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class Puv::LoadResult load(std::string const &) const; + /** + * @symbol ??1ComponentItemDataLoader\@\@QEAA\@XZ + */ + MCAPI ~ComponentItemDataLoader(); + +}; diff --git a/LiteLoader/include/llapi/mc/ComponentItemData_v1_19_83.hpp b/LiteLoader/include/llapi/mc/ComponentItemData_v1_19_83.hpp new file mode 100644 index 0000000000..eda83b6a9c --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComponentItemData_v1_19_83.hpp @@ -0,0 +1,40 @@ +/** + * @file ComponentItemData_v1_19_83.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ComponentItemData_v1_19_83 { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPONENTITEMDATA_V1_19_83 +public: + struct ComponentItemData_v1_19_83& operator=(struct ComponentItemData_v1_19_83 const &) = delete; + ComponentItemData_v1_19_83(struct ComponentItemData_v1_19_83 const &) = delete; + ComponentItemData_v1_19_83() = delete; +#endif + +public: + /** + * @symbol ??0ComponentItemData_v1_19_83\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI ComponentItemData_v1_19_83(struct ComponentItemData_v1_19_83 &&); + /** + * @symbol ??1ComponentItemData_v1_19_83\@\@QEAA\@XZ + */ + MCAPI ~ComponentItemData_v1_19_83(); + /** + * @symbol ?VERSION\@ComponentItemData_v1_19_83\@\@2VSemVersion\@\@B + */ + MCAPI static class SemVersion const VERSION; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComponentItemData_v1_20.hpp b/LiteLoader/include/llapi/mc/ComponentItemData_v1_20.hpp index 97b0ad1e0e..99515c5127 100644 --- a/LiteLoader/include/llapi/mc/ComponentItemData_v1_20.hpp +++ b/LiteLoader/include/llapi/mc/ComponentItemData_v1_20.hpp @@ -19,18 +19,21 @@ struct ComponentItemData_v1_20 { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPONENTITEMDATA_V1_20 public: struct ComponentItemData_v1_20& operator=(struct ComponentItemData_v1_20 const &) = delete; - ComponentItemData_v1_20(struct ComponentItemData_v1_20 const &) = delete; #endif public: + /** + * @symbol ??0ComponentItemData_v1_20\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI ComponentItemData_v1_20(struct ComponentItemData_v1_20 const &); /** * @symbol ??0ComponentItemData_v1_20\@\@QEAA\@XZ */ MCAPI ComponentItemData_v1_20(); /** - * @symbol ??4ComponentItemData_v1_20\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??0ComponentItemData_v1_20\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI struct ComponentItemData_v1_20 & operator=(struct ComponentItemData_v1_20 &&); + MCAPI ComponentItemData_v1_20(struct ComponentItemData_v1_20 &&); /** * @symbol ??1ComponentItemData_v1_20\@\@QEAA\@XZ */ @@ -43,5 +46,9 @@ struct ComponentItemData_v1_20 { * @symbol ?bindType\@ComponentItemData_v1_20\@\@SAXXZ */ MCAPI static void bindType(); + /** + * @symbol ?upgrade\@ComponentItemData_v1_20\@\@SA?AU1\@AEAUComponentItemData_v1_19_83\@\@\@Z + */ + MCAPI static struct ComponentItemData_v1_20 upgrade(struct ComponentItemData_v1_19_83 &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComponentItemDescriptionData.hpp b/LiteLoader/include/llapi/mc/ComponentItemDescriptionData.hpp deleted file mode 100644 index c5513a16b5..0000000000 --- a/LiteLoader/include/llapi/mc/ComponentItemDescriptionData.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ComponentItemDescriptionData.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct ComponentItemDescriptionData { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPONENTITEMDESCRIPTIONDATA -public: - ComponentItemDescriptionData(struct ComponentItemDescriptionData const &) = delete; - ComponentItemDescriptionData() = delete; -#endif - -public: - /** - * @symbol ??4ComponentItemDescriptionData\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct ComponentItemDescriptionData & operator=(struct ComponentItemDescriptionData const &); - /** - * @symbol ??1ComponentItemDescriptionData\@\@QEAA\@XZ - */ - MCAPI ~ComponentItemDescriptionData(); - /** - * @symbol ?VERSION\@ComponentItemDescriptionData\@\@2VSemVersion\@\@B - */ - MCAPI static class SemVersion const VERSION; - /** - * @symbol ?bindType\@ComponentItemDescriptionData\@\@SAXXZ - */ - MCAPI static void bindType(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComponentItemDescriptionData_v1_20.hpp b/LiteLoader/include/llapi/mc/ComponentItemDescriptionData_v1_20.hpp new file mode 100644 index 0000000000..2eebf75fb3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComponentItemDescriptionData_v1_20.hpp @@ -0,0 +1,43 @@ +/** + * @file ComponentItemDescriptionData_v1_20.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ComponentItemDescriptionData_v1_20 { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPONENTITEMDESCRIPTIONDATA_V1_20 +public: + ComponentItemDescriptionData_v1_20(struct ComponentItemDescriptionData_v1_20 const &) = delete; + ComponentItemDescriptionData_v1_20() = delete; +#endif + +public: + /** + * @symbol ??4ComponentItemDescriptionData_v1_20\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct ComponentItemDescriptionData_v1_20 & operator=(struct ComponentItemDescriptionData_v1_20 const &); + /** + * @symbol ??1ComponentItemDescriptionData_v1_20\@\@QEAA\@XZ + */ + MCAPI ~ComponentItemDescriptionData_v1_20(); + /** + * @symbol ?VERSION\@ComponentItemDescriptionData_v1_20\@\@2VSemVersion\@\@B + */ + MCAPI static class SemVersion const VERSION; + /** + * @symbol ?bindType\@ComponentItemDescriptionData_v1_20\@\@SAXXZ + */ + MCAPI static void bindType(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ComposterBlock.hpp b/LiteLoader/include/llapi/mc/ComposterBlock.hpp index 031a2d0d53..4d1c5995a6 100644 --- a/LiteLoader/include/llapi/mc/ComposterBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComposterBlock.hpp @@ -42,35 +42,30 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos */ virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@ComposterBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?clip\@ComposterBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 9 + * @symbol ?addAABBs\@ComposterBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ - virtual void __unk_vfn_19(); + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -82,10 +77,10 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -96,11 +91,6 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -121,6 +111,11 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -131,11 +126,6 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -152,55 +142,65 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 61 + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@ComposterBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 73 + * @vftbl 76 * @symbol ?onMove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void onMove(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -213,84 +213,89 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@ComposterBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@ComposterBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@ComposterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPOSTERBLOCK /** * @symbol ?hasComparatorSignal\@ComposterBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CompoundItem.hpp b/LiteLoader/include/llapi/mc/CompoundItem.hpp index 4726549569..48074ba107 100644 --- a/LiteLoader/include/llapi/mc/CompoundItem.hpp +++ b/LiteLoader/include/llapi/mc/CompoundItem.hpp @@ -52,10 +52,10 @@ class CompoundItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/CompoundTag.hpp b/LiteLoader/include/llapi/mc/CompoundTag.hpp index 7a15794bde..e68d527718 100644 --- a/LiteLoader/include/llapi/mc/CompoundTag.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTag.hpp @@ -114,9 +114,9 @@ class CompoundTag : public Tag { virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@CompoundTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@CompoundTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -153,10 +153,6 @@ class CompoundTag : public Tag { */ virtual unsigned __int64 hash() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPOUNDTAG - /** - * @symbol ?write\@CompoundTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; /** * @symbol __unk_destructor_-1 */ @@ -199,6 +195,7 @@ class CompoundTag : public Tag { * * * + * * @brief This function performs a deep copy of a CompoundTag object. * @param[in] tag A constant reference to a CompoundTag object to be copied. * @details A CompoundTag object contains a collection of key-value pairs, where each value can be of various data types. A deep copy of a CompoundTag object creates a new object with a separate memory location that contains the same values and structure as the original object. This function takes a constant reference to a CompoundTag object and performs a deep copy of it. The copied object is not shared with the original object and any changes made to the copied object will not affect the original object. @@ -300,14 +297,14 @@ class CompoundTag : public Tag { * @symbol ??4CompoundTag\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CompoundTag & operator=(class CompoundTag &&); - /** - * @symbol ?put\@CompoundTag\@\@QEAAAEAVTag\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV2\@\@Z - */ - MCAPI class Tag & put(std::string, class Tag &&); /** * @symbol ?put\@CompoundTag\@\@QEAAPEAVTag\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@4\@\@Z */ MCAPI class Tag * put(std::string, std::unique_ptr); + /** + * @symbol ?put\@CompoundTag\@\@QEAAAEAVTag\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV2\@\@Z + */ + MCAPI class Tag & put(std::string, class Tag &&); /** * @symbol ?putBoolean\@CompoundTag\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp index feb9d92aa5..11e8f1c481 100644 --- a/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp +++ b/LiteLoader/include/llapi/mc/CompressedBiomeDefinitionListPacket.hpp @@ -5,17 +5,20 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA - +#include "CompoundTag.hpp" #undef BEFORE_EXTRA class CompressedBiomeDefinitionListPacket : public Packet { #define AFTER_EXTRA - +public: + CompoundTag mBiomeData; + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream&); #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPRESSEDBIOMEDEFINITIONLISTPACKET public: @@ -46,9 +49,9 @@ class CompressedBiomeDefinitionListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?read\@CompressedBiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@CompressedBiomeDefinitionListPacket\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPRESSEDBIOMEDEFINITIONLISTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ConcreteBlock.hpp b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp index 0b44617030..c555086884 100644 --- a/LiteLoader/include/llapi/mc/ConcreteBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp @@ -36,20 +36,10 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ConcreteBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ConcreteBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ConcreteBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,50 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol ?isValidAuxValue\@ConcreteBlock\@\@UEBA_NH\@Z + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual bool isValidAuxValue(int) const; + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,80 +171,60 @@ class ConcreteBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 - * @symbol ?buildDescriptionId\@ConcreteBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual std::string buildDescriptionId(class Block const &) const; + virtual void __unk_vfn_153(); /** - * @vftbl 133 - * @symbol ?isAuxValueRelevantForPicking\@ConcreteBlock\@\@UEBA_NXZ + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual bool isAuxValueRelevantForPicking() const; + virtual void __unk_vfn_162(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 */ virtual void __unk_vfn_164(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 - */ - virtual void __unk_vfn_166(); - /** - * @vftbl 169 - * @symbol __unk_vfn_169 - */ - virtual void __unk_vfn_169(); - /** - * @vftbl 173 - * @symbol __unk_vfn_173 - */ - virtual void __unk_vfn_173(); - /** - * @vftbl 177 - * @symbol __unk_vfn_177 - */ - virtual void __unk_vfn_177(); - /** - * @vftbl 185 - * @symbol ?getMapColor\@ConcreteBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual void __unk_vfn_167(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_171(); /** - * @vftbl 188 - * @symbol ?getResourceItem\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_174(); /** - * @vftbl 190 - * @symbol ?getSilkTouchItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + virtual void __unk_vfn_183(); /** * @symbol ??0ConcreteBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp index 4f492f9eda..06f37e7a4d 100644 --- a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp @@ -36,20 +36,10 @@ class ConcretePowderBlock : public FallingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ConcretePowderBlock : public FallingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ConcretePowderBlock : public FallingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ConcretePowderBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ConcretePowderBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +116,70 @@ class ConcretePowderBlock : public FallingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 54 + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 57 * @symbol ?isValidAuxValue\@ConcretePowderBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 121 + * @vftbl 122 * @symbol ?shouldStopFalling\@ConcretePowderBlock\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool shouldStopFalling(class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,100 +191,105 @@ class ConcretePowderBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @symbol ?buildDescriptionId\@ConcretePowderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@ConcretePowderBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** * @symbol ??0ConcretePowderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ConditionalRecordingConstBlockSource.hpp b/LiteLoader/include/llapi/mc/ConditionalRecordingConstBlockSource.hpp deleted file mode 100644 index 91f4e2bd16..0000000000 --- a/LiteLoader/include/llapi/mc/ConditionalRecordingConstBlockSource.hpp +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file ConditionalRecordingConstBlockSource.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ConditionalRecordingConstBlockSource. - * - */ -class ConditionalRecordingConstBlockSource { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONDITIONALRECORDINGCONSTBLOCKSOURCE -public: - class ConditionalRecordingConstBlockSource& operator=(class ConditionalRecordingConstBlockSource const &) = delete; - ConditionalRecordingConstBlockSource(class ConditionalRecordingConstBlockSource const &) = delete; - ConditionalRecordingConstBlockSource() = delete; -#endif - -public: - /** - * @symbol ??0ConditionalRecordingConstBlockSource\@\@QEAA\@V?$variant\@PEBVIConstBlockSource\@\@VAccessRecordingConstBlockSource\@\@\@std\@\@\@Z - */ - MCAPI ConditionalRecordingConstBlockSource(class std::variant); - /** - * @symbol ?get\@ConditionalRecordingConstBlockSource\@\@QEAA?AV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@XZ - */ - MCAPI class gsl::not_null get(); - /** - * @symbol ??DConditionalRecordingConstBlockSource\@\@QEAAAEBVIConstBlockSource\@\@XZ - */ - MCAPI class IConstBlockSource const & operator*(); - /** - * @symbol ??CConditionalRecordingConstBlockSource\@\@QEAAPEBVIConstBlockSource\@\@XZ - */ - MCAPI class IConstBlockSource const * operator->(); - /** - * @symbol ?takeAccessedBlocks\@ConditionalRecordingConstBlockSource\@\@QEHAA?AUAccessedBlockSourceBlocks\@\@XZ - */ - MCAPI struct AccessedBlockSourceBlocks takeAccessedBlocks(); - /** - * @symbol ??1ConditionalRecordingConstBlockSource\@\@QEAA\@XZ - */ - MCAPI ~ConditionalRecordingConstBlockSource(); - -}; diff --git a/LiteLoader/include/llapi/mc/ConduitBlock.hpp b/LiteLoader/include/llapi/mc/ConduitBlock.hpp index 74c2aea9f1..44d953874b 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlock.hpp @@ -36,20 +36,10 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ConduitBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ConduitBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ConduitBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@ConduitBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@ConduitBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,55 +181,60 @@ class ConduitBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0ConduitBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp index 13598788b9..2435a60b9f 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp @@ -65,6 +65,11 @@ class ConduitBlockActor : public BlockActor { * @symbol ?hasAlphaLayer\@ConduitBlockActor\@\@UEBA_NXZ */ virtual bool hasAlphaLayer() const; + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -91,17 +96,22 @@ class ConduitBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@ConduitBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@ConduitBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/Container.hpp b/LiteLoader/include/llapi/mc/Container.hpp index 52c7ae7e8e..19d2bdbec0 100644 --- a/LiteLoader/include/llapi/mc/Container.hpp +++ b/LiteLoader/include/llapi/mc/Container.hpp @@ -69,7 +69,7 @@ class Container { virtual void removeContentChangeListener(class ContainerContentChangeListener *); /** * @vftbl 5 - * @symbol ?getItem\@CraftingContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@FillingContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItem(int) const = 0; /** @@ -94,7 +94,7 @@ class Container { virtual bool addItemToFirstEmptySlot(class ItemStack const &); /** * @vftbl 10 - * @symbol ?setItem\@Inventory\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@SimplePlayerContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &) = 0; /** @@ -240,14 +240,14 @@ class Container { * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@\@Z */ MCAPI Container(enum class ContainerType); - /** - * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCAPI Container(enum class ContainerType, std::string const &, bool); /** * @symbol ??0Container\@\@QEAA\@AEBV0\@\@Z */ MCAPI Container(class Container const &); + /** + * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCAPI Container(enum class ContainerType, std::string const &, bool); /** * @symbol ?getContainerType\@Container\@\@QEBA?AW4ContainerType\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp index d215b65d3c..5379610926 100644 --- a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ContainerClosePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ContainerClosePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ContainerClosePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERCLOSEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ContainerComponent.hpp b/LiteLoader/include/llapi/mc/ContainerComponent.hpp index eb963788a9..50e57c809b 100644 --- a/LiteLoader/include/llapi/mc/ContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ContainerComponent.hpp @@ -55,14 +55,14 @@ class ContainerComponent { * @symbol ?addAdditionalSaveData\@ContainerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; - /** - * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@HH\@Z - */ - MCAPI bool addItem(class ItemStack &, int, int); /** * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemActor\@\@\@Z */ MCAPI bool addItem(class ItemActor &); + /** + * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@HH\@Z + */ + MCAPI bool addItem(class ItemStack &, int, int); /** * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp index a7d3114135..8fcda9097f 100644 --- a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class ContainerOpenPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ContainerOpenPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ContainerOpenPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINEROPENPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ContainerOpenPacket(); #endif - /** - * @symbol ??0ContainerOpenPacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@AEBVBlockPos\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI ContainerOpenPacket(enum class ContainerID, enum class ContainerType, class BlockPos const &, struct ActorUniqueID const &); /** * @symbol ??0ContainerOpenPacket\@\@QEAA\@XZ */ MCAPI ContainerOpenPacket(); + /** + * @symbol ??0ContainerOpenPacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@AEBVBlockPos\@\@AEBUActorUniqueID\@\@\@Z + */ + MCAPI ContainerOpenPacket(enum class ContainerID, enum class ContainerType, class BlockPos const &, struct ActorUniqueID const &); }; diff --git a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp index 33357cc07a..f50664c550 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp @@ -28,6 +28,10 @@ class ContainerScreenContext { #endif public: + /** + * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI ContainerScreenContext(class Player &, enum class ContainerType, class BlockPos const &); /** * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBUActorUniqueID\@\@\@Z */ @@ -36,10 +40,6 @@ class ContainerScreenContext { * @symbol ??0ContainerScreenContext\@\@QEAA\@XZ */ MCAPI ContainerScreenContext(); - /** - * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI ContainerScreenContext(class Player &, enum class ContainerType, class BlockPos const &); /** * @symbol ?getPlayer\@ContainerScreenContext\@\@QEBAAEAVPlayer\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp index 42a82b350d..d18a8ffb50 100644 --- a/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ContainerSetDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ContainerSetDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ContainerSetDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERSETDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp b/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp index 51946c1ff4..0033bfaaf9 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp @@ -37,5 +37,9 @@ class ContainerValidatorFactory { * @symbol ?createContainerValidator\@ContainerValidatorFactory\@\@SA?AV?$shared_ptr\@$$CBVContainerValidationBase\@\@\@std\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@\@Z */ MCAPI static class std::shared_ptr createContainerValidator(enum class ContainerEnumName, class ContainerScreenContext const &, enum class ContainerValidationCaller); + /** + * @symbol ?getBackingContainer\@ContainerValidatorFactory\@\@SAPEAVContainer\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@\@Z + */ + MCAPI static class Container * getBackingContainer(enum class ContainerEnumName, class ContainerScreenContext const &); }; diff --git a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp index aad2d45034..058f24071f 100644 --- a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp +++ b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp @@ -28,6 +28,10 @@ class ContainerWeakRef { #endif public: + /** + * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBUActorUniqueID\@\@W4ActorContainerType\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z + */ + MCAPI ContainerWeakRef(struct ActorUniqueID const &, enum class ActorContainerType, class TypedRuntimeId const &); /** * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBVBlockPos\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z */ @@ -36,10 +40,6 @@ class ContainerWeakRef { * @symbol ??0ContainerWeakRef\@\@QEAA\@XZ */ MCAPI ContainerWeakRef(); - /** - * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBUActorUniqueID\@\@W4ActorContainerType\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z - */ - MCAPI ContainerWeakRef(struct ActorUniqueID const &, enum class ActorContainerType, class TypedRuntimeId const &); /** * @symbol ??BContainerWeakRef\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ContentIdentity.hpp b/LiteLoader/include/llapi/mc/ContentIdentity.hpp index 133d534e7e..e018a85ebc 100644 --- a/LiteLoader/include/llapi/mc/ContentIdentity.hpp +++ b/LiteLoader/include/llapi/mc/ContentIdentity.hpp @@ -24,14 +24,14 @@ class ContentIdentity { bool valid{}; #undef AFTER_EXTRA public: - /** - * @symbol ??0ContentIdentity\@\@QEAA\@AEBVUUID\@mce\@\@\@Z - */ - MCAPI ContentIdentity(class mce::UUID const &); /** * @symbol ??0ContentIdentity\@\@QEAA\@XZ */ MCAPI ContentIdentity(); + /** + * @symbol ??0ContentIdentity\@\@QEAA\@AEBVUUID\@mce\@\@\@Z + */ + MCAPI ContentIdentity(class mce::UUID const &); /** * @symbol ??0ContentIdentity\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ContentLog.hpp b/LiteLoader/include/llapi/mc/ContentLog.hpp index 14c631b48d..917c91dccb 100644 --- a/LiteLoader/include/llapi/mc/ContentLog.hpp +++ b/LiteLoader/include/llapi/mc/ContentLog.hpp @@ -32,10 +32,6 @@ class ContentLog { * @symbol ??0ContentLog\@\@QEAA\@XZ */ MCAPI ContentLog(); - /** - * @symbol ?getScope\@ContentLog\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string getScope(); /** * @symbol ?isEnabled\@ContentLog\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/CopperBlock.hpp b/LiteLoader/include/llapi/mc/CopperBlock.hpp index d26f049d44..1e02cadbec 100644 --- a/LiteLoader/include/llapi/mc/CopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/CopperBlock.hpp @@ -36,30 +36,20 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 16 + * @vftbl 19 * @symbol ?onLightningHit\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 27 + * @vftbl 30 * @symbol ?tryGetCopperBehavior\@CopperBlock\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class CopperBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class CopperBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class CopperBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,40 +126,50 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,65 +181,70 @@ class CopperBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@22\@Z */ diff --git a/LiteLoader/include/llapi/mc/CoralBlock.hpp b/LiteLoader/include/llapi/mc/CoralBlock.hpp index 2f7202d5ad..8b0d73eb60 100644 --- a/LiteLoader/include/llapi/mc/CoralBlock.hpp +++ b/LiteLoader/include/llapi/mc/CoralBlock.hpp @@ -36,20 +36,10 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class CoralBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class CoralBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class CoralBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +116,70 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@CoralBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@CoralBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CoralBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,87 +191,92 @@ class CoralBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@CoralBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CoralBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@CoralBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CoralBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CoralFan.hpp b/LiteLoader/include/llapi/mc/CoralFan.hpp index da54dc26fb..e7a0848aee 100644 --- a/LiteLoader/include/llapi/mc/CoralFan.hpp +++ b/LiteLoader/include/llapi/mc/CoralFan.hpp @@ -37,29 +37,19 @@ class CoralFan : public BushBlock { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@CoralFan\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@CoralFan\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@CoralFan\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +60,11 @@ class CoralFan : public BushBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@CoralFan\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +77,9 @@ class CoralFan : public BushBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@CoralFan\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class CoralFan : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class CoralFan : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,80 +131,90 @@ class CoralFan : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 54 + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 57 * @symbol ?isValidAuxValue\@CoralFan\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@CoralFan\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@CoralFan\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@CoralFan\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@CoralFan\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CoralFan\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@CoralFan\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,112 +226,117 @@ class CoralFan : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@CoralFan\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@CoralFan\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@CoralFan\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@CoralFan\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CoralFan\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@CoralFan\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?checkAlive\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp index c1c3279413..112644f51a 100644 --- a/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp @@ -52,10 +52,10 @@ class CoralFanBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@CoralFanBlockItem\@\@UEBAHH\@Z @@ -122,7 +122,7 @@ class CoralFanBlockItem : public BlockItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@CoralFanBlockItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/CoralFanHang.hpp b/LiteLoader/include/llapi/mc/CoralFanHang.hpp index 6a5b12f5d0..0553cb5165 100644 --- a/LiteLoader/include/llapi/mc/CoralFanHang.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanHang.hpp @@ -37,29 +37,19 @@ class CoralFanHang : public CoralFan { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@CoralFanHang\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@CoralFanHang\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@CoralFanHang\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class CoralFanHang : public CoralFan { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class CoralFanHang : public CoralFan { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class CoralFanHang : public CoralFan { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class CoralFanHang : public CoralFan { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,55 +126,65 @@ class CoralFanHang : public CoralFan { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 92 + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 95 * @symbol ?mayPlaceOn\@CoralFanHang\@\@EEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CoralFanHang\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,92 +196,97 @@ class CoralFanHang : public CoralFan { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CoralFanHang\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CoralFanHang\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@CoralFanHang\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?checkAlive\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/CoralPlantBlock.hpp b/LiteLoader/include/llapi/mc/CoralPlantBlock.hpp index 90a0d3b163..73eba13d01 100644 --- a/LiteLoader/include/llapi/mc/CoralPlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/CoralPlantBlock.hpp @@ -32,29 +32,19 @@ class CoralPlantBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@CoralPlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@CoralPlantBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@CoralPlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +55,11 @@ class CoralPlantBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@CoralPlantBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +72,9 @@ class CoralPlantBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@CoralPlantBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class CoralPlantBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class CoralPlantBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,65 +126,75 @@ class CoralPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 68 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@CoralPlantBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@CoralPlantBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@CoralPlantBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CoralPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@CoralPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,77 +206,82 @@ class CoralPlantBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@CoralPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@CoralPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CoralPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@CoralPlantBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@CoralPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp index 97ec694b08..c382514305 100644 --- a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp +++ b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class CorrectPlayerMovePredictionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CorrectPlayerMovePredictionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CorrectPlayerMovePredictionPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CORRECTPLAYERMOVEPREDICTIONPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp index a98f369335..3800b4af28 100644 --- a/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -40,9 +40,5 @@ class CraftHandleNonImplemented_DEPRECATEDASKTYLAING : public CraftHandlerBase { * @symbol ?_handleCraftAction\@CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); - /** - * @symbol ??0CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandleNonImplemented_DEPRECATEDASKTYLAING(class ItemStackRequestActionCraftHandler &); }; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp index b8c6b8bd2b..79c6aef246 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp @@ -52,7 +52,7 @@ class CraftHandlerBase { virtual void endRequestBatch(); /** * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerLoom\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @symbol ?_handleCraftAction\@CraftHandlerSmithingTable\@\@EEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &) = 0; /** @@ -71,45 +71,5 @@ class CraftHandlerBase { */ MCVAPI ~CraftHandlerBase(); #endif - /** - * @symbol ??0CraftHandlerBase\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerBase(class ItemStackRequestActionCraftHandler &); - /** - * @symbol ?_isNonImplementedTrustClientResults\@CraftHandlerBase\@\@QEBA_NXZ - */ - MCAPI bool _isNonImplementedTrustClientResults() const; - /** - * @symbol ?endRequest\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z - */ - MCAPI enum class ItemStackNetResult endRequest(enum class ItemStackNetResult); - /** - * @symbol ?handleCraftAction\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@W42\@\@Z - */ - MCAPI enum class ItemStackNetResult handleCraftAction(class ItemStackRequestActionCraftBase const &, enum class ItemStackNetResult); - /** - * @symbol ?isCraftRequest\@CraftHandlerBase\@\@QEAA_NXZ - */ - MCAPI bool isCraftRequest(); - /** - * @symbol ?postRequest\@CraftHandlerBase\@\@QEAAX_N\@Z - */ - MCAPI void postRequest(bool); - -//protected: - /** - * @symbol ?_getRecipeFromNetId\@CraftHandlerBase\@\@IEAA?AV?$tuple\@W4ItemStackNetResult\@\@PEBVRecipe\@\@\@std\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z - */ - MCAPI class std::tuple _getRecipeFromNetId(class TypedServerNetId const &); - /** - * @symbol ?_tryGetSparseContainer\@CraftHandlerBase\@\@IEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z - */ - MCAPI class std::shared_ptr _tryGetSparseContainer(enum class ContainerEnumName); - /** - * @symbol ?_validateRequestSlot\@CraftHandlerBase\@\@IEAA?AUItemStackRequestHandlerSlotInfo\@\@UItemStackRequestSlotInfo\@\@\@Z - */ - MCAPI struct ItemStackRequestHandlerSlotInfo _validateRequestSlot(struct ItemStackRequestSlotInfo); - -protected: }; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp index ac8054d799..5ff8f204c9 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp @@ -64,10 +64,6 @@ class CraftHandlerCrafting { * @symbol ?_getLevelRecipes\@CraftHandlerCrafting\@\@EEBAPEBVRecipes\@\@XZ */ virtual class Recipes const * _getLevelRecipes() const; - /** - * @symbol ??0CraftHandlerCrafting\@\@QEAA\@_NAEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z - */ - MCAPI CraftHandlerCrafting(bool, class Player &, class ItemStackRequestActionCraftHandler &); //private: /** @@ -75,9 +71,9 @@ class CraftHandlerCrafting { */ MCAPI enum class ItemStackNetResult _handleAutoCraft(class ItemStackRequestActionCraftRecipeAuto const &); /** - * @symbol ?_handleCarefulRestoration\@CraftHandlerCrafting\@\@AEBAXAEBVItemInstance\@\@PEAVPlayer\@\@\@Z + * @symbol ?_handleCarefulRestoration\@CraftHandlerCrafting\@\@AEBAXAEBVItemInstance\@\@\@Z */ - MCAPI void _handleCarefulRestoration(class ItemInstance const &, class Player *) const; + MCAPI void _handleCarefulRestoration(class ItemInstance const &) const; /** * @symbol ?_handleCraftOutput\@CraftHandlerCrafting\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionCraft\@V?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@$0M\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp b/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp index 385eaca367..e73bcebc07 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp @@ -45,24 +45,24 @@ class CraftHandlerGrindstone : public CraftHandlerBase { * @symbol ?_postCraftRequest\@CraftHandlerGrindstone\@\@EEAAX_N\@Z */ virtual void _postCraftRequest(bool); - -//private: /** - * @symbol ?_createResultItem\@CraftHandlerGrindstone\@\@AEAA?AVItemStack\@\@AEBV2\@0\@Z + * @symbol ?getResultItem\@CraftHandlerGrindstone\@\@SA?AU?$pair\@VItemStack\@\@UItemStackNetIdVariant\@\@\@std\@\@AEBVItemStack\@\@0\@Z */ - MCAPI class ItemStack _createResultItem(class ItemStack const &, class ItemStack const &); + MCAPI static struct std::pair getResultItem(class ItemStack const &, class ItemStack const &); + +//private: /** * @symbol ?_getExperienceFromItem\@CraftHandlerGrindstone\@\@AEBAHAEBVItemStack\@\@\@Z */ MCAPI int _getExperienceFromItem(class ItemStack const &) const; - /** - * @symbol ?_getResultItemWithNoEnchants\@CraftHandlerGrindstone\@\@AEAA?AVItemStack\@\@AEAV2\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEA_N\@Z - */ - MCAPI class ItemStack _getResultItemWithNoEnchants(class ItemStack &, std::vector const &, bool &); /** * @symbol ?_resolveNetIdAndValidate\@CraftHandlerGrindstone\@\@AEAA_NW4ContainerEnumName\@\@EAEBUItemStackNetIdVariant\@\@\@Z */ MCAPI bool _resolveNetIdAndValidate(enum class ContainerEnumName, unsigned char, struct ItemStackNetIdVariant const &); + /** + * @symbol ?_getResultItemWithNoEnchants\@CraftHandlerGrindstone\@\@CA?AVItemStack\@\@AEAV2\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEA_N\@Z + */ + MCAPI static class ItemStack _getResultItemWithNoEnchants(class ItemStack &, std::vector const &, bool &); private: diff --git a/LiteLoader/include/llapi/mc/CraftableCompounds.hpp b/LiteLoader/include/llapi/mc/CraftableCompounds.hpp index 6b398e090f..527eddb314 100644 --- a/LiteLoader/include/llapi/mc/CraftableCompounds.hpp +++ b/LiteLoader/include/llapi/mc/CraftableCompounds.hpp @@ -70,14 +70,14 @@ class CraftableCompounds { * @symbol ?_getCompoundId\@CraftableCompounds\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@3\@\@Z */ MCAPI std::string _getCompoundId(std::vector const &); - /** - * @symbol ?_registerCompound\@CraftableCompounds\@\@IEAAXAEBV?$vector\@UChemistryIngredient\@\@V?$allocator\@UChemistryIngredient\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@\@Z - */ - MCAPI void _registerCompound(std::vector const &, class ItemStack const &, enum class LabTableReactionType, enum class CompoundContainerType); /** * @symbol ?_registerCompound\@CraftableCompounds\@\@IEAAXAEBV?$vector\@UChemistryIngredient\@\@V?$allocator\@UChemistryIngredient\@\@\@std\@\@\@std\@\@W4CompoundType\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@H\@Z */ MCAPI void _registerCompound(std::vector const &, enum class CompoundType, enum class LabTableReactionType, enum class CompoundContainerType, int); + /** + * @symbol ?_registerCompound\@CraftableCompounds\@\@IEAAXAEBV?$vector\@UChemistryIngredient\@\@V?$allocator\@UChemistryIngredient\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@\@Z + */ + MCAPI void _registerCompound(std::vector const &, class ItemStack const &, enum class LabTableReactionType, enum class CompoundContainerType); protected: diff --git a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp index 6456d3c1b7..08018aaab1 100644 --- a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class CraftingDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CraftingDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CraftingDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CraftingDataPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp index 5b50198e85..a2caec3854 100644 --- a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -78,9 +79,9 @@ class CraftingEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CraftingEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CraftingEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CraftingEventPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CraftingTableBlock.hpp b/LiteLoader/include/llapi/mc/CraftingTableBlock.hpp index 901f02a7f4..41a2d446eb 100644 --- a/LiteLoader/include/llapi/mc/CraftingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/CraftingTableBlock.hpp @@ -31,20 +31,10 @@ class CraftingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class CraftingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class CraftingTableBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class CraftingTableBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class CraftingTableBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,40 +111,50 @@ class CraftingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -171,65 +166,70 @@ class CraftingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@CraftingTableBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CraftingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CRAFTINGTABLEBLOCK /** * @symbol ?isCraftingBlock\@CraftingTableBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp index 68ac5014c6..11324125ed 100644 --- a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp +++ b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class CreatePhotoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0CreatePhotoPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp index a1ada472cb..755a40d78c 100644 --- a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class CreativeContentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@CreativeContentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@CreativeContentPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATIVECONTENTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~CreativeContentPacket(); #endif - /** - * @symbol ??0CreativeContentPacket\@\@QEAA\@XZ - */ - MCAPI CreativeContentPacket(); /** * @symbol ??0CreativeContentPacket\@\@QEAA\@AEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI CreativeContentPacket(std::vector const &); + /** + * @symbol ??0CreativeContentPacket\@\@QEAA\@XZ + */ + MCAPI CreativeContentPacket(); }; diff --git a/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp b/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp index 13270244c4..5224415f5f 100644 --- a/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp @@ -38,14 +38,14 @@ class CreativeItemRegistry { * @symbol ??0CreativeItemRegistry\@\@QEAA\@XZ */ MCAPI CreativeItemRegistry(); - /** - * @symbol ?findCreativeItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@\@Z - */ - MCAPI class CreativeItemEntry * findCreativeItemEntry(class TypedServerNetId const &); /** * @symbol ?findCreativeItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBVItemInstance\@\@\@Z */ MCAPI class CreativeItemEntry * findCreativeItemEntry(class ItemInstance const &); + /** + * @symbol ?findCreativeItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@\@Z + */ + MCAPI class CreativeItemEntry * findCreativeItemEntry(class TypedServerNetId const &); /** * @symbol ?getCreativeCategory\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemGroupCategory\@\@W4CreativeItemCategory\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp index b8d3879d4c..841645d9f9 100644 --- a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp +++ b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp @@ -107,6 +107,10 @@ namespace CreatorMetadataUtils { * @symbol ?getGameSemVersionAsString\@CreatorMetadataUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getGameSemVersionAsString(); + /** + * @symbol ?getRequiredExperimentsForMetadata\@CreatorMetadataUtils\@\@YA?AV?$initializer_list\@W4AllExperiments\@\@\@std\@\@XZ + */ + MCAPI class std::initializer_list getRequiredExperimentsForMetadata(); /** * @symbol ?scriptingVersionToString\@CreatorMetadataUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUVersion\@Scripting\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Creeper.hpp b/LiteLoader/include/llapi/mc/Creeper.hpp index 980a084af6..b7185ae8f2 100644 --- a/LiteLoader/include/llapi/mc/Creeper.hpp +++ b/LiteLoader/include/llapi/mc/Creeper.hpp @@ -37,135 +37,135 @@ class Creeper : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Creeper\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@Creeper\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Creeper\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Creeper\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/CropBlock.hpp b/LiteLoader/include/llapi/mc/CropBlock.hpp index 30730b6ac3..9679bbbfaa 100644 --- a/LiteLoader/include/llapi/mc/CropBlock.hpp +++ b/LiteLoader/include/llapi/mc/CropBlock.hpp @@ -41,25 +41,15 @@ class CropBlock : public BushBlock { */ virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@CropBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class CropBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class CropBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class CropBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class CropBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,80 +126,90 @@ class CropBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@CropBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@CropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@CropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@CropBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 117 + * @vftbl 118 * @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 &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,87 +221,92 @@ class CropBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@CropBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getBaseSeed\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getBaseCrop\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 198 + * @vftbl 196 * @symbol ?getSeedNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z */ virtual int getSeedNum(class Randomize &, int, int) const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?getCropNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/CrossbowItem.hpp b/LiteLoader/include/llapi/mc/CrossbowItem.hpp index 2fa71c493d..adbbfaf6fe 100644 --- a/LiteLoader/include/llapi/mc/CrossbowItem.hpp +++ b/LiteLoader/include/llapi/mc/CrossbowItem.hpp @@ -57,10 +57,10 @@ class CrossbowItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp index d77c2abfc4..dba6d648c1 100644 --- a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp @@ -36,20 +36,10 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class CryingObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class CryingObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class CryingObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class CryingObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 150 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 148 * @symbol ?animateTick\@CryingObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@CryingObsidianBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@CryingObsidianBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp b/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp index 5eeb82f3af..3dacc205b7 100644 --- a/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp +++ b/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp @@ -31,10 +31,6 @@ class CurrentSwimAmountSystem { * @symbol ?createSystem\@CurrentSwimAmountSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@CurrentSwimAmountSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@USwimAmountComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT>, struct SwimAmountComponent, struct SynchedActorDataComponent const>); //private: /** diff --git a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp index 5daeb11233..9769e109c4 100644 --- a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp @@ -36,30 +36,20 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 16 + * @vftbl 19 * @symbol ?onLightningHit\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 27 + * @vftbl 30 * @symbol ?tryGetCopperBehavior\@CutCopperSlab\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class CutCopperSlab : public SlabBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class CutCopperSlab : public SlabBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class CutCopperSlab : public SlabBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,40 +126,50 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,65 +181,70 @@ class CutCopperSlab : public SlabBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CutCopperSlab\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0CutCopperSlab\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVHashedString\@\@W4CopperType\@\@2\@Z */ diff --git a/LiteLoader/include/llapi/mc/CutCopperStairs.hpp b/LiteLoader/include/llapi/mc/CutCopperStairs.hpp index 674675be06..748de7ae5b 100644 --- a/LiteLoader/include/llapi/mc/CutCopperStairs.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperStairs.hpp @@ -36,30 +36,20 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 16 + * @vftbl 19 * @symbol ?onLightningHit\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 27 + * @vftbl 30 * @symbol ?tryGetCopperBehavior\@CutCopperStairs\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class CutCopperStairs : public StairBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class CutCopperStairs : public StairBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class CutCopperStairs : public StairBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,40 +126,50 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,65 +181,70 @@ class CutCopperStairs : public StairBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@CutCopperStairs\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0CutCopperStairs\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@W4CopperType\@\@AEBVHashedString\@\@33\@Z */ diff --git a/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp b/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp index 6d5020f2d0..b75fb0ce4d 100644 --- a/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp +++ b/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp @@ -34,9 +34,9 @@ class DBStoragePerformanceData { */ MCAPI void resetAll(); /** - * @symbol ?CATEGORY_NAMES\@DBStoragePerformanceData\@\@2V?$array\@PEBD$0M\@\@std\@\@A + * @symbol ?CATEGORY_NAMES\@DBStoragePerformanceData\@\@2V?$array\@PEBD$0N\@\@std\@\@A */ - MCAPI static class std::array CATEGORY_NAMES; + MCAPI static class std::array CATEGORY_NAMES; /** * @symbol ?OPERATION_NAMES\@DBStoragePerformanceData\@\@2V?$array\@PEBD$03\@std\@\@A */ diff --git a/LiteLoader/include/llapi/mc/DamageCommand.hpp b/LiteLoader/include/llapi/mc/DamageCommand.hpp index 6514dbe6b3..c3ccbaebfb 100644 --- a/LiteLoader/include/llapi/mc/DamageCommand.hpp +++ b/LiteLoader/include/llapi/mc/DamageCommand.hpp @@ -34,7 +34,7 @@ class DamageCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@DamageCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp index 4e98172daa..3ad232a129 100644 --- a/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp @@ -56,14 +56,14 @@ class DamageSensorComponent { * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@AEBVActorDamageSource\@\@H_NVVariantParameterList\@\@2\@Z */ MCAPI bool recordDamage(class Actor &, class ActorDamageSource const &, int, bool, class VariantParameterList, bool); - /** - * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@PEAV2\@W4ActorDamageCause\@\@H_NVBlockPos\@\@\@Z - */ - MCAPI bool recordDamage(class Actor &, class Actor *, enum class ActorDamageCause, int, bool, class BlockPos); /** * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@PEAV2\@W4ActorDamageCause\@\@H_NVVariantParameterList\@\@\@Z */ MCAPI bool recordDamage(class Actor &, class Actor *, enum class ActorDamageCause, int, bool, class VariantParameterList); + /** + * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@PEAV2\@W4ActorDamageCause\@\@H_NVBlockPos\@\@\@Z + */ + MCAPI bool recordDamage(class Actor &, class Actor *, enum class ActorDamageCause, int, bool, class BlockPos); //private: /** diff --git a/LiteLoader/include/llapi/mc/DashSystem.hpp b/LiteLoader/include/llapi/mc/DashSystem.hpp index 5121f33b18..c7f5fff47e 100644 --- a/LiteLoader/include/llapi/mc/DashSystem.hpp +++ b/LiteLoader/include/llapi/mc/DashSystem.hpp @@ -32,12 +32,4 @@ class DashSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); -//private: - /** - * @symbol ?_tickDashSystem\@DashSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorTickedFlag\@\@\@\@\@\@VActorOwnerComponent\@\@UDashCooldownTimerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UDashCooldownTimerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickDashSystem(class ViewT>, class ActorOwnerComponent, struct DashCooldownTimerComponent>, class EntityModifierT); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/DayLockCommand.hpp b/LiteLoader/include/llapi/mc/DayLockCommand.hpp index 82b1a38568..a1de6b700d 100644 --- a/LiteLoader/include/llapi/mc/DayLockCommand.hpp +++ b/LiteLoader/include/llapi/mc/DayLockCommand.hpp @@ -36,7 +36,7 @@ class DayLockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@DayLockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp index c6ca510429..e6713b50df 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp @@ -36,25 +36,15 @@ class DaylightDetectorBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@DaylightDetectorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class DaylightDetectorBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class DaylightDetectorBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class DaylightDetectorBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class DaylightDetectorBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,66 +120,76 @@ class DaylightDetectorBlock : public ActorBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@DaylightDetectorBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@DaylightDetectorBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@DaylightDetectorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@DaylightDetectorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,124 +201,100 @@ class DaylightDetectorBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@DaylightDetectorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@DaylightDetectorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?updateShape\@DaylightDetectorBlock\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateShape(class BlockSource &, class BlockPos const &); /** - * @vftbl 196 + * @vftbl 194 * @symbol ?updateSignalStrength\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateSignalStrength(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @vftbl 199 - * @symbol __unk_vfn_199 - */ - virtual void __unk_vfn_199(); - /** - * @vftbl 200 - * @symbol __unk_vfn_200 - */ - virtual void __unk_vfn_200(); - /** - * @vftbl 201 - * @symbol __unk_vfn_201 - */ - virtual void __unk_vfn_201(); - /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DAYLIGHTDETECTORBLOCK /** * @symbol ?isInteractiveBlock\@DaylightDetectorBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp index a4ab2d187c..0903dc21d8 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp @@ -50,6 +50,11 @@ class DaylightDetectorBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,9 +81,14 @@ class DaylightDetectorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); }; diff --git a/LiteLoader/include/llapi/mc/DeOpCommand.hpp b/LiteLoader/include/llapi/mc/DeOpCommand.hpp index b16400c151..f870a1edc4 100644 --- a/LiteLoader/include/llapi/mc/DeOpCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeOpCommand.hpp @@ -36,7 +36,7 @@ class DeOpCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@DeOpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DeadBushBlock.hpp b/LiteLoader/include/llapi/mc/DeadBushBlock.hpp index 4f878876cf..f0ce360be1 100644 --- a/LiteLoader/include/llapi/mc/DeadBushBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeadBushBlock.hpp @@ -31,20 +31,10 @@ class DeadBushBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class DeadBushBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class DeadBushBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class DeadBushBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class DeadBushBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,45 +111,55 @@ class DeadBushBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 92 - * @symbol ?mayPlaceOn\@DeadBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 95 + * @symbol ?mayPlaceOn\@DeadBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class DeadBushBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 187 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 184 * @symbol ?playerDestroy\@DeadBushBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DeadBushBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@DeadBushBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp index a0d9ded659..bb2814b273 100644 --- a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class DeathInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DeathInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DeathInfoPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEATHINFOPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp index a7c27f5ab6..9aa596ba90 100644 --- a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp @@ -180,6 +180,16 @@ class DebugInfoComponent { virtual void __unk_vfn_29(); /** * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 31 + * @symbol __unk_vfn_31 + */ + virtual void __unk_vfn_31(); + /** + * @vftbl 32 * @symbol ?onEvent\@DebugInfoComponent\@\@UEAA?AW4EventResult\@\@AEBUActorDefinitionTriggeredEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorDefinitionTriggeredEvent const &); diff --git a/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp index 767742938f..49fef075ad 100644 --- a/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class DebugInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DebugInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DebugInfoPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0DebugInfoPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp index f25895f8dc..1fa0ef3e85 100644 --- a/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp @@ -31,25 +31,15 @@ class DecoratedPotBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@DecoratedPotBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DecoratedPotBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DecoratedPotBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DecoratedPotBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DecoratedPotBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,70 +116,80 @@ class DecoratedPotBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@DecoratedPotBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@DecoratedPotBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@DecoratedPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@DecoratedPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@DecoratedPotBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 103 + * @vftbl 106 * @symbol ?trySpawnResourcesOnExplosion\@DecoratedPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@M\@Z */ virtual void trySpawnResourcesOnExplosion(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, float) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,57 +201,62 @@ class DecoratedPotBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getEntityResourceItem\@DecoratedPotBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp b/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp index f765723756..925d63d30a 100644 --- a/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp @@ -50,6 +50,11 @@ class DecoratedPotBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,17 +81,22 @@ class DecoratedPotBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@DecoratedPotBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@DecoratedPotBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/DecoratedPotBlockItem.hpp b/LiteLoader/include/llapi/mc/DecoratedPotBlockItem.hpp new file mode 100644 index 0000000000..4cf1c8cdc5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlockItem.hpp @@ -0,0 +1,127 @@ +/** + * @file DecoratedPotBlockItem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Json.hpp" +#include "BlockItem.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DecoratedPotBlockItem : public BlockItem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DECORATEDPOTBLOCKITEM +public: + class DecoratedPotBlockItem& operator=(class DecoratedPotBlockItem const &) = delete; + DecoratedPotBlockItem(class DecoratedPotBlockItem const &) = delete; + DecoratedPotBlockItem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 21 + * @symbol __unk_vfn_21 + */ + virtual void __unk_vfn_21(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 60 + * @symbol ?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; + /** + * @vftbl 66 + * @symbol __unk_vfn_66 + */ + virtual void __unk_vfn_66(); + /** + * @vftbl 70 + * @symbol __unk_vfn_70 + */ + virtual void __unk_vfn_70(); + /** + * @vftbl 71 + * @symbol __unk_vfn_71 + */ + virtual void __unk_vfn_71(); + /** + * @vftbl 72 + * @symbol __unk_vfn_72 + */ + virtual void __unk_vfn_72(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 79 + * @symbol __unk_vfn_79 + */ + virtual void __unk_vfn_79(); + /** + * @vftbl 80 + * @symbol __unk_vfn_80 + */ + virtual void __unk_vfn_80(); + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @symbol ??0DecoratedPotBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI DecoratedPotBlockItem(std::string const &, int); + +//private: + /** + * @symbol ?buildIngredientItemList\@DecoratedPotBlockItem\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCompoundTag\@\@\@Z + */ + MCAPI std::string buildIngredientItemList(class CompoundTag const *) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp b/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp index 468997a40f..c1f9d97fd1 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp @@ -31,9 +31,9 @@ class DedicatedServerCommands { public: /** - * @symbol ?setupStandaloneServer\@DedicatedServerCommands\@\@SAXAEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@AEAVIMinecraftApp\@\@AEAVLevel\@\@AEAVLevelStorage\@\@AEAVDedicatedServer\@\@AEAVAllowListFile\@\@\@Z + * @symbol ?setupStandaloneServer\@DedicatedServerCommands\@\@SAXAEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@AEAVIMinecraftApp\@\@AEAVLevel\@\@AEAVLevelStorage\@\@AEAVDedicatedServer\@\@AEAVAllowListFile\@\@PEAUScriptSettings\@\@\@Z */ - MCAPI static void setupStandaloneServer(class gsl::not_null> const &, class IMinecraftApp &, class Level &, class LevelStorage &, class DedicatedServer &, class AllowListFile &); + MCAPI static void setupStandaloneServer(class gsl::not_null> const &, class IMinecraftApp &, class Level &, class LevelStorage &, class DedicatedServer &, class AllowListFile &, struct ScriptSettings *); //private: diff --git a/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp index c607b6812b..6fb52155fc 100644 --- a/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp @@ -36,7 +36,7 @@ class DedicatedWSServerCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@DedicatedWSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp index 21add22b50..3da7d60a7a 100644 --- a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp @@ -36,20 +36,10 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DeepslateBlock : public RotatedPillarBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DeepslateBlock : public RotatedPillarBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DeepslateBlock : public RotatedPillarBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,46 +115,56 @@ class DeepslateBlock : public RotatedPillarBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 - * @symbol ?canBeOriginalSurface\@DeepslateBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_51 */ - virtual bool canBeOriginalSurface() const; + virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 54 + * @symbol ?canBeOriginalSurface\@DeepslateBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool canBeOriginalSurface() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,67 +176,72 @@ class DeepslateBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?tryGetInfested\@DeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp index 9ef15763d7..f9b41ca49e 100644 --- a/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp @@ -36,20 +36,10 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DeepslateOreBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DeepslateOreBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DeepslateOreBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,51 +115,61 @@ class DeepslateOreBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@DeepslateOreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@DeepslateOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,62 +181,67 @@ class DeepslateOreBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@DeepslateOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@DeepslateOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp index 2b5e8d71eb..5db9f43cb8 100644 --- a/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp @@ -36,20 +36,10 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_122(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,67 +176,72 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@DeepslateRedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?_lightUpBlock\@DeepslateRedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void _lightUpBlock(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp b/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp index 9396ee2686..45bd2483d8 100644 --- a/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp +++ b/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp @@ -133,14 +133,14 @@ class DefaultDataLoadHelper { * @symbol ?loadBlockPositionOffset\@DefaultDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ MCVAPI class BlockPos loadBlockPositionOffset(class BlockPos const &); - /** - * @symbol ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z - */ - MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); /** * @symbol ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ MCVAPI class Vec3 loadDirection(class Vec3 const &); + /** + * @symbol ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z + */ + MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); /** * @symbol ?loadFacingID\@DefaultDataLoadHelper\@\@UEAAEE\@Z */ diff --git a/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp b/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp index 51b0cc73f7..ab435a3fe3 100644 --- a/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp @@ -7,21 +7,22 @@ #include "llapi/Global.h" #include "ItemDescriptor.hpp" #include "Json.hpp" +#include "Bedrock.hpp" #define BEFORE_EXTRA #undef BEFORE_EXTRA -class DeferredDescriptor { +struct DeferredDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DEFERREDDESCRIPTOR public: - class DeferredDescriptor& operator=(class DeferredDescriptor const &) = delete; - DeferredDescriptor(class DeferredDescriptor const &) = delete; + struct DeferredDescriptor& operator=(struct DeferredDescriptor const &) = delete; + DeferredDescriptor(struct DeferredDescriptor const &) = delete; DeferredDescriptor() = delete; #endif @@ -76,6 +77,10 @@ class DeferredDescriptor { * @symbol ?resolve\@DeferredDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr resolve() const; + /** + * @symbol ?deserialize\@DeferredDescriptor\@\@SA?AV?$Result\@V?$unique_ptr\@UDeferredDescriptor\@\@U?$default_delete\@UDeferredDescriptor\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI static class Bedrock::Result, class std::error_code> deserialize(class ReadOnlyBinaryStream &); //private: /** @@ -87,6 +92,4 @@ class DeferredDescriptor { */ MCAPI std::unique_ptr _initFromItem(class WeakPtr &&, short) const; -private: - -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DefinitionEvent.hpp b/LiteLoader/include/llapi/mc/DefinitionEvent.hpp index 957337d400..3b5052308e 100644 --- a/LiteLoader/include/llapi/mc/DefinitionEvent.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionEvent.hpp @@ -27,14 +27,14 @@ class DefinitionEvent { #endif public: - /** - * @symbol ??0DefinitionEvent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI DefinitionEvent(class DefinitionEvent &&); /** * @symbol ??0DefinitionEvent\@\@QEAA\@AEBV0\@\@Z */ MCAPI DefinitionEvent(class DefinitionEvent const &); + /** + * @symbol ??0DefinitionEvent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI DefinitionEvent(class DefinitionEvent &&); /** * @symbol ?evaluateEvent\@DefinitionEvent\@\@QEBAXAEAVRenderParams\@\@AEAV?$vector\@UDefinitionModifier\@\@V?$allocator\@UDefinitionModifier\@\@\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp b/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp index b8895858e8..35d6afa296 100644 --- a/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp @@ -100,9 +100,9 @@ class DelayedAttackGoal : public MeleeAttackGoal { //private: /** - * @symbol ?_attemptAttack\@DelayedAttackGoal\@\@AEAAXPEAVActor\@\@\@Z + * @symbol ?_attemptStartAttacking\@DelayedAttackGoal\@\@AEBAXPEAVActor\@\@\@Z */ - MCAPI void _attemptAttack(class Actor *); + MCAPI void _attemptStartAttacking(class Actor *) const; /** * @symbol ?_manageAttackTime\@DelayedAttackGoal\@\@AEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp index af6da66c3c..97060ebc21 100644 --- a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp @@ -52,10 +52,10 @@ class DeprecatedSlabBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,7 +117,7 @@ class DeprecatedSlabBlockItem : public BlockItem { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@DeprecatedSlabBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp b/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp index 4244d6c78e..a3b0fdcaf4 100644 --- a/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp +++ b/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp @@ -31,17 +31,5 @@ class DesiredMoveDirectionSystem { * @symbol ?createDesiredMoveDirectionSystem\@DesiredMoveDirectionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createDesiredMoveDirectionSystem(); - /** - * @symbol ?rotateTowardsControllingPassenger\@DesiredMoveDirectionSystem\@\@SAX_NAEAVVec2\@\@1AEAM2AEBV2\@\@Z - */ - MCAPI static void rotateTowardsControllingPassenger(bool, class Vec2 &, class Vec2 &, float &, float &, class Vec2 const &); - /** - * @symbol ?tickDesiredMoveDirectionSystem\@DesiredMoveDirectionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@$$CBUVehicleComponent\@\@UActorHeadRotationComponent\@\@UActorRotationComponent\@\@UMobBodyRotationComponent\@\@UMobTravelComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@UPassengerComponent\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z - */ - MCAPI static void tickDesiredMoveDirectionSystem(class ViewT, class ViewT, struct PassengerComponent>, struct ActorRotationComponent const, struct LocalMoveVelocityComponent const, class Optional const>>); - /** - * @symbol ?updateLocalMoveVelocity\@DesiredMoveDirectionSystem\@\@SAXAEAM00AEBVVec3\@\@\@Z - */ - MCAPI static void updateLocalMoveVelocity(float &, float &, float &, class Vec3 const &); }; diff --git a/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp index 5e9c5448ff..b002e9615e 100644 --- a/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp @@ -36,20 +36,10 @@ class DetectorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DetectorRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DetectorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DetectorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DetectorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,66 +115,71 @@ class DetectorRailBlock : public BaseRailBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@DetectorRailBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@DetectorRailBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@DetectorRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 - */ - virtual void __unk_vfn_81(); - /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -202,69 +192,79 @@ class DetectorRailBlock : public BaseRailBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@DetectorRailBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@DetectorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DETECTORRAILBLOCK /** * @symbol ?hasComparatorSignal\@DetectorRailBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/DialogueCommand.hpp b/LiteLoader/include/llapi/mc/DialogueCommand.hpp index d52550e8eb..285f7e0f33 100644 --- a/LiteLoader/include/llapi/mc/DialogueCommand.hpp +++ b/LiteLoader/include/llapi/mc/DialogueCommand.hpp @@ -36,7 +36,7 @@ class DialogueCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@DialogueCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp b/LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp index a92e3a207e..7602d11fc6 100644 --- a/LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp +++ b/LiteLoader/include/llapi/mc/DictionaryCompressionUtil.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -33,8 +34,8 @@ namespace DictionaryCompressionUtil { */ MCAPI std::string dictionaryCompressString(std::string const &); /** - * @symbol ?dictionaryDecompressString\@DictionaryCompressionUtil\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?dictionaryDecompressString\@DictionaryCompressionUtil\@\@YA?AV?$Result\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI std::string dictionaryDecompressString(std::string const &); + MCAPI class Bedrock::Result dictionaryDecompressString(std::string const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DifficultyCommand.hpp b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp index 265e73298d..734d730276 100644 --- a/LiteLoader/include/llapi/mc/DifficultyCommand.hpp +++ b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp @@ -36,7 +36,7 @@ class DifficultyCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@DifficultyCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/DiggerItem.hpp b/LiteLoader/include/llapi/mc/DiggerItem.hpp index 5d1c1d60d1..ce76a86933 100644 --- a/LiteLoader/include/llapi/mc/DiggerItem.hpp +++ b/LiteLoader/include/llapi/mc/DiggerItem.hpp @@ -52,10 +52,10 @@ class DiggerItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 48 * @symbol ?getAttackDamage\@DiggerItem\@\@UEBAHXZ diff --git a/LiteLoader/include/llapi/mc/Dimension.hpp b/LiteLoader/include/llapi/mc/Dimension.hpp index 731f18d945..feb64ece8d 100644 --- a/LiteLoader/include/llapi/mc/Dimension.hpp +++ b/LiteLoader/include/llapi/mc/Dimension.hpp @@ -111,6 +111,10 @@ class Dimension { * @symbol ?init\@Dimension\@\@UEAAXXZ */ MCVAPI void init(); + /** + * @symbol ?initializeWithLevelStorageManager\@Dimension\@\@UEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCVAPI void initializeWithLevelStorageManager(class LevelStorageManager &); /** * @symbol ?is2DPositionRelevantForPlayer\@Dimension\@\@UEBA_NAEBVBlockPos\@\@AEAVPlayer\@\@\@Z */ @@ -220,14 +224,14 @@ class Dimension { * @symbol ?fetchEntity\@Dimension\@\@QEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z */ MCAPI class Actor * fetchEntity(struct ActorUniqueID, bool) const; - /** - * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@M\@Z - */ - MCAPI class Player * fetchNearestAttackablePlayer(class Actor &, float); /** * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@VBlockPos\@\@MPEAVActor\@\@\@Z */ MCAPI class Player * fetchNearestAttackablePlayer(class BlockPos, float, class Actor *); + /** + * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@M\@Z + */ + MCAPI class Player * fetchNearestAttackablePlayer(class Actor &, float); /** * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z */ @@ -256,10 +260,6 @@ class Dimension { * @symbol ?forEachPlayer\@Dimension\@\@QEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachPlayer(class std::function) const; - /** - * @symbol ?forceSaveVillageManager\@Dimension\@\@QEAAXXZ - */ - MCAPI void forceSaveVillageManager(); /** * @symbol ?getBlockEventDispatcher\@Dimension\@\@QEAAAEAVBlockEventDispatcher\@\@XZ */ @@ -464,14 +464,14 @@ class Dimension { * @symbol ?transferEntity\@Dimension\@\@QEAAXAEBVChunkPos\@\@AEBVVec3\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI void transferEntity(class ChunkPos const &, class Vec3 const &, std::unique_ptr, bool); - /** - * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEBVChunkPos\@\@0V?$AutomaticID\@VDimension\@\@H\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@5\@\@Z - */ - MCAPI void transferEntityToUnloadedChunk(class ChunkPos const &, class ChunkPos const &, class AutomaticID, std::string &, std::unique_ptr); /** * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEAVActor\@\@PEAVLevelChunk\@\@\@Z */ MCAPI void transferEntityToUnloadedChunk(class Actor &, class LevelChunk *); + /** + * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEBVChunkPos\@\@0V?$AutomaticID\@VDimension\@\@H\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@5\@\@Z + */ + MCAPI void transferEntityToUnloadedChunk(class ChunkPos const &, class ChunkPos const &, class AutomaticID, std::string &, std::unique_ptr); /** * @symbol ?tryGarbageCollectStructures\@Dimension\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp index 3ab9a1571c..002f586d64 100644 --- a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -50,9 +51,9 @@ class DimensionDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DimensionDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DimensionDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIMENSIONDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp b/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp index 6314b84112..8cce00c940 100644 --- a/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp +++ b/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp @@ -31,10 +31,6 @@ class DimensionTransitionSystem { * @symbol ?_tickPortalTransition\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@UPassengerComponent\@\@UVehicleComponent\@\@\@\@VActorOwnerComponent\@\@$$CBUDimensionTransitionComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UDimensionTransitionComponent\@\@\@\@\@Z */ MCAPI static void _tickPortalTransition(class ViewT, class ActorOwnerComponent, struct DimensionTransitionComponent const>, class EntityModifierT); - /** - * @symbol ?_tickReadyToContinueServer\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@UPassengerComponent\@\@UVehicleComponent\@\@UDimensionTransitionComponent\@\@\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@\@Z - */ - MCAPI static void _tickReadyToContinueServer(class ViewT, struct PlayerChangeDimensionRequestComponent>); /** * @symbol ?_tickVehicleDismount\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DiodeBlock.hpp b/LiteLoader/include/llapi/mc/DiodeBlock.hpp index 21fcc524cd..315e265c53 100644 --- a/LiteLoader/include/llapi/mc/DiodeBlock.hpp +++ b/LiteLoader/include/llapi/mc/DiodeBlock.hpp @@ -36,20 +36,10 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DiodeBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DiodeBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DiodeBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,66 +115,76 @@ class DiodeBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 * @symbol ?isSignalSource\@DiodeBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 58 + * @vftbl 61 * @symbol ?getDirectSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@DiodeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@DiodeBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,137 +196,142 @@ class DiodeBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@DiodeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@DiodeBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?isLocked\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?isSameDiode\@DiodeBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isSameDiode(class Block const &) const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?shouldPrioritize\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldPrioritize(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 198 + * @vftbl 196 * @symbol ?isOn\@DiodeBlock\@\@MEBA_NXZ */ virtual bool isOn() const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?shouldTurnOn\@DiodeBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldTurnOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 200 + * @vftbl 198 * @symbol ?getInputSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getInputSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 201 + * @vftbl 199 * @symbol ?isAlternateInput\@DiodeBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 202 + * @vftbl 200 * @symbol ?getAlternateSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getAlternateSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 203 + * @vftbl 201 * @symbol ?getOutputSignal\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getOutputSignal(class Block const &) const; /** - * @vftbl 204 + * @vftbl 202 * @symbol ?getTurnOffDelay\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOffDelay(class Block const &) const; /** - * @vftbl 205 + * @vftbl 203 * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const = 0; /** - * @vftbl 206 + * @vftbl 204 * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const = 0; /** - * @vftbl 207 + * @vftbl 205 * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const = 0; diff --git a/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp index d3009848cb..7650eaf172 100644 --- a/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp @@ -25,22 +25,10 @@ struct DirectAgentMobMovementProxy { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIRECTAGENTMOBMOVEMENTPROXY - /** - * @symbol ?getSlideOffset\@DirectAgentMobMovementProxy\@\@UEBA?AVVec2\@\@XZ - */ - MCVAPI class Vec2 getSlideOffset() const; /** * @symbol ?isFlying\@DirectAgentMobMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isFlying() const; - /** - * @symbol ?setIsFlying\@DirectAgentMobMovementProxy\@\@UEAAX_N\@Z - */ - MCVAPI void setIsFlying(bool); - /** - * @symbol ?setSlideOffset\@DirectAgentMobMovementProxy\@\@UEAAXAEBVVec2\@\@\@Z - */ - MCVAPI void setSlideOffset(class Vec2 const &); #endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp index 5f9c505867..bf8df3e812 100644 --- a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp @@ -194,14 +194,14 @@ class DirectPlayerMovementProxy { * @symbol ?sendInput\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void sendInput(); - /** - * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPlayerActionPacket\@\@\@Z - */ - MCVAPI void sendPacket(class PlayerActionPacket &); /** * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPassengerJumpPacket\@\@\@Z */ MCVAPI void sendPacket(class PassengerJumpPacket &); + /** + * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPlayerActionPacket\@\@\@Z + */ + MCVAPI void sendPacket(class PlayerActionPacket &); /** * @symbol ?sendPlayerInput\@DirectPlayerMovementProxy\@\@UEAAXXZ */ @@ -282,14 +282,14 @@ class DirectPlayerMovementProxy { * @symbol ?stopGliding\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void stopGliding(); - /** - * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEBAPEBUIPlayerMovementProxy\@\@XZ - */ - MCVAPI struct IPlayerMovementProxy const * tryAsPlayer() const; /** * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEAAPEAUIPlayerMovementProxy\@\@XZ */ MCVAPI struct IPlayerMovementProxy * tryAsPlayer(); + /** + * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEBAPEBUIPlayerMovementProxy\@\@XZ + */ + MCVAPI struct IPlayerMovementProxy const * tryAsPlayer() const; /** * @symbol ?tryGetPlayerActionComponent\@DirectPlayerMovementProxy\@\@UEAAPEAUPlayerActionComponent\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/DirtBlock.hpp b/LiteLoader/include/llapi/mc/DirtBlock.hpp index 9fd8c60c44..892483379d 100644 --- a/LiteLoader/include/llapi/mc/DirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/DirtBlock.hpp @@ -36,20 +36,10 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DirtBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DirtBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DirtBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,76 +115,86 @@ class DirtBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@DirtBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@DirtBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 94 + * @vftbl 97 * @symbol ?tryToTill\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,92 +206,97 @@ class DirtBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@DirtBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@DirtBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@DirtBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@DirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@DirtBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/DirtPathBlock.hpp b/LiteLoader/include/llapi/mc/DirtPathBlock.hpp index f94a47e8b5..dd0b93f63a 100644 --- a/LiteLoader/include/llapi/mc/DirtPathBlock.hpp +++ b/LiteLoader/include/llapi/mc/DirtPathBlock.hpp @@ -31,30 +31,20 @@ class DirtPathBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@DirtPathBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@DirtPathBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class DirtPathBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class DirtPathBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class DirtPathBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class DirtPathBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,61 +120,71 @@ class DirtPathBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@DirtPathBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@DirtPathBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 94 + * @vftbl 97 * @symbol ?tryToTill\@DirtPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@DirtPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,72 +196,77 @@ class DirtPathBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 170 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 * @symbol ?tick\@DirtPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@DirtPathBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@DirtPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DirtPathBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp b/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp index 80a3ae7a7a..3a63ccb378 100644 --- a/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp +++ b/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp @@ -50,10 +50,10 @@ class DiscFragmentItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp index 3dca279029..908537f12c 100644 --- a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class DisconnectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@DisconnectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@DisconnectPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DISCONNECTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/DispenserBlock.hpp b/LiteLoader/include/llapi/mc/DispenserBlock.hpp index 193ffcd872..25a7fc4ac3 100644 --- a/LiteLoader/include/llapi/mc/DispenserBlock.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlock.hpp @@ -36,20 +36,10 @@ class DispenserBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DispenserBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DispenserBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DispenserBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DispenserBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,55 +116,65 @@ class DispenserBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@DispenserBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -192,106 +187,111 @@ class DispenserBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@DispenserBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@DispenserBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@DispenserBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@DispenserBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getTickDelay\@DispenserBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?dispenseFrom\@DispenserBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/Dolphin.hpp b/LiteLoader/include/llapi/mc/Dolphin.hpp index ea90036c22..03c44dda63 100644 --- a/LiteLoader/include/llapi/mc/Dolphin.hpp +++ b/LiteLoader/include/llapi/mc/Dolphin.hpp @@ -42,140 +42,140 @@ class Dolphin : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 188 + * @vftbl 176 * @symbol ?canBePulledIntoVehicle\@Dolphin\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Dolphin\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 323 + * @vftbl 306 * @symbol ?createAIGoals\@Dolphin\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Dolphin\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Dolphin\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DoorBlock.hpp b/LiteLoader/include/llapi/mc/DoorBlock.hpp index 3562892641..3071441fd1 100644 --- a/LiteLoader/include/llapi/mc/DoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoorBlock.hpp @@ -42,30 +42,25 @@ class DoorBlock : public BlockLegacy { */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@DoorBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + /** + * @vftbl 11 + * @symbol ?getVisualShapeInWorld\@DoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z + */ + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** * @vftbl 14 * @symbol ?getLiquidClipVolume\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -77,10 +72,10 @@ class DoorBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -91,11 +86,6 @@ class DoorBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -116,6 +106,11 @@ class DoorBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -126,11 +121,6 @@ class DoorBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -147,90 +137,95 @@ class DoorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 55 + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 58 * @symbol ?canFillAtPos\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 57 + * @vftbl 60 * @symbol ?onFillBlock\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@DoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@DoorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -242,100 +237,105 @@ class DoorBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@DoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@DoorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@DoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@DoorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 188 + * @symbol ?entityInside\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOORBLOCK /** * @symbol ?canBeSilkTouched\@DoorBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/DoorItem.hpp b/LiteLoader/include/llapi/mc/DoorItem.hpp index 63321ff6e7..64299e8e25 100644 --- a/LiteLoader/include/llapi/mc/DoorItem.hpp +++ b/LiteLoader/include/llapi/mc/DoorItem.hpp @@ -53,10 +53,10 @@ class DoorItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -113,7 +113,7 @@ class DoorItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@DoorItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp b/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp index f657ec9fe0..0d1046f046 100644 --- a/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantBaseBlock.hpp @@ -35,36 +35,31 @@ class DoublePlantBaseBlock : public BushBlock { * @symbol ?getNextBlockPermutation\@DoublePlantBaseBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * getNextBlockPermutation(class Block const &) const; - /** - * @vftbl 7 - * @symbol ?randomlyModifyPosition\@DoublePlantBaseBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@DoublePlantBaseBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@DoublePlantBaseBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@DoublePlantBaseBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 16 + * @symbol ?randomlyModifyPosition\@DoublePlantBaseBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@DoublePlantBaseBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; + /** + * @vftbl 22 + * @symbol __unk_vfn_22 + */ + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +71,10 @@ class DoublePlantBaseBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +85,6 @@ class DoublePlantBaseBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class DoublePlantBaseBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class DoublePlantBaseBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,80 +136,90 @@ class DoublePlantBaseBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@DoublePlantBaseBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@DoublePlantBaseBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@DoublePlantBaseBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,87 +231,87 @@ class DoublePlantBaseBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@DoublePlantBaseBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@DoublePlantBaseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@DoublePlantBaseBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?checkAlive\@DoublePlantBaseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?_keepRelevantStateForDropping\@DoublePlantBaseBlock\@\@MEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & _keepRelevantStateForDropping(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp index db7a21519d..ba18c12da5 100644 --- a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp @@ -36,20 +36,10 @@ class DoublePlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DoublePlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DoublePlantBlock : public DoublePlantBaseBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DoublePlantBlock : public DoublePlantBaseBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DoublePlantBlock : public DoublePlantBaseBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,65 +116,75 @@ class DoublePlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 114 + * @vftbl 115 * @symbol ?canBeBuiltOver\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,102 +196,107 @@ class DoublePlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@DoublePlantBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 137 + * @vftbl 138 * @symbol ?getColorForParticle\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@DoublePlantBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@DoublePlantBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?_keepRelevantStateForDropping\@DoublePlantBlock\@\@MEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & _keepRelevantStateForDropping(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/DoubleTag.hpp b/LiteLoader/include/llapi/mc/DoubleTag.hpp index 2b20eaecbe..6f8dc6f106 100644 --- a/LiteLoader/include/llapi/mc/DoubleTag.hpp +++ b/LiteLoader/include/llapi/mc/DoubleTag.hpp @@ -46,9 +46,9 @@ double val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@DoubleTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@DoubleTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,11 +79,5 @@ double val; * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOUBLETAG - /** - * @symbol ?write\@DoubleTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; -#endif }; diff --git a/LiteLoader/include/llapi/mc/DragonEggBlock.hpp b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp index 55ccf857e3..06902e358b 100644 --- a/LiteLoader/include/llapi/mc/DragonEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp @@ -36,20 +36,10 @@ class DragonEggBlock : public FallingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DragonEggBlock : public FallingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DragonEggBlock : public FallingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DragonEggBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DragonEggBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,55 +116,65 @@ class DragonEggBlock : public FallingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@DragonEggBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@DragonEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@DragonEggBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,75 +186,80 @@ class DragonEggBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@DragonEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** * @symbol ??0DragonEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ @@ -267,9 +267,9 @@ class DragonEggBlock : public FallingBlock { //private: /** - * @symbol ?_teleport\@DragonEggBlock\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_attemptTeleport\@DragonEggBlock\@\@CAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@\@Z */ - MCAPI void _teleport(class BlockSource &, class Random &, class BlockPos const &) const; + MCAPI static void _attemptTeleport(class BlockSource &, class Random &, class BlockPos const &); private: diff --git a/LiteLoader/include/llapi/mc/DragonFireball.hpp b/LiteLoader/include/llapi/mc/DragonFireball.hpp index 81918ef142..b23745520c 100644 --- a/LiteLoader/include/llapi/mc/DragonFireball.hpp +++ b/LiteLoader/include/llapi/mc/DragonFireball.hpp @@ -37,122 +37,122 @@ class DragonFireball : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@DragonFireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@DragonFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getTrailParticle\@DragonFireball\@\@MEAA?AW4ParticleType\@\@XZ */ virtual enum class ParticleType getTrailParticle(); diff --git a/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp index 93f25e05aa..1db804e99e 100644 --- a/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp @@ -36,20 +36,10 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DriedKelpBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DriedKelpBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DriedKelpBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class DriedKelpBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0DriedKelpBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/DropperBlock.hpp b/LiteLoader/include/llapi/mc/DropperBlock.hpp index 4316b9d6a2..d82d6bbd2e 100644 --- a/LiteLoader/include/llapi/mc/DropperBlock.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlock.hpp @@ -36,20 +36,10 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class DropperBlock : public DispenserBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class DropperBlock : public DispenserBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class DropperBlock : public DispenserBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class DropperBlock : public DispenserBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?dispenseFrom\@DropperBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/DyePowderItem.hpp b/LiteLoader/include/llapi/mc/DyePowderItem.hpp index d78f76654f..6e07150c2e 100644 --- a/LiteLoader/include/llapi/mc/DyePowderItem.hpp +++ b/LiteLoader/include/llapi/mc/DyePowderItem.hpp @@ -6,7 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "FertilizerItem.hpp" +#include "Item.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +17,7 @@ * @brief MC class DyePowderItem. * */ -class DyePowderItem : public FertilizerItem { +class DyePowderItem : public Item { #define AFTER_EXTRA // Add Member There @@ -53,9 +53,9 @@ class DyePowderItem : public FertilizerItem { virtual void __unk_vfn_16(); /** * @vftbl 19 - * @symbol __unk_vfn_19 + * @symbol ?isDye\@DyePowderItem\@\@UEBA_NXZ */ - virtual void __unk_vfn_19(); + virtual bool isDye() const; /** * @vftbl 20 * @symbol ?getItemColor\@DyePowderItem\@\@UEBA?AW4ItemColor\@\@XZ @@ -63,9 +63,9 @@ class DyePowderItem : public FertilizerItem { virtual enum class ItemColor getItemColor() const; /** * @vftbl 21 - * @symbol ?isFertilizer\@DyePowderItem\@\@UEBA_NXZ + * @symbol __unk_vfn_21 */ - virtual bool isFertilizer() const; + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -116,11 +116,6 @@ class DyePowderItem : public FertilizerItem { * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); - /** - * @vftbl 85 - * @symbol ?dispense\@DyePowderItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z - */ - virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** * @vftbl 95 * @symbol ?buildDescriptionId\@DyePowderItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z @@ -142,19 +137,8 @@ class DyePowderItem : public FertilizerItem { */ virtual class Item & setIconInfo(std::string const &, int); /** - * @vftbl 134 - * @symbol ?_useOn\@DyePowderItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z - */ - virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DYEPOWDERITEM - /** - * @symbol ?isDye\@DyePowderItem\@\@UEBA_NXZ - */ - MCVAPI bool isDye() const; -#endif - /** - * @symbol ??0DyePowderItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemColor\@\@_N2\@Z + * @symbol ??0DyePowderItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemColor\@\@\@Z */ - MCAPI DyePowderItem(std::string const &, int, enum class ItemColor, bool, bool); + MCAPI DyePowderItem(std::string const &, int, enum class ItemColor); }; diff --git a/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp b/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp index 779ec0ef1b..9238f32681 100644 --- a/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp @@ -32,21 +32,33 @@ class DynamicPropertiesDefinition { */ MCAPI void clear(); /** - * @symbol ?defineProperty\@DynamicPropertiesDefinition\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UDynamicPropertyDefinition\@\@_K\@Z + * @symbol ?defineProperty\@DynamicPropertiesDefinition\@\@QEAA?AV?$optional\@W4DynamicPropertyDefinePropertyError\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@UDynamicPropertyDefinition\@\@\@Z */ - MCAPI bool defineProperty(std::string const &, struct DynamicPropertyDefinition, unsigned __int64); + MCAPI class std::optional defineProperty(std::string const &, struct DynamicPropertyDefinition); /** * @symbol ?tryGetPropertyDefinition\@DynamicPropertiesDefinition\@\@QEBAPEBUDynamicPropertyDefinition\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct DynamicPropertyDefinition const * tryGetPropertyDefinition(std::string const &) const; /** - * @symbol ?tryMergeDefinitions\@DynamicPropertiesDefinition\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV1\@AEBV23\@_K\@Z + * @symbol ?tryMergeDefinitions\@DynamicPropertiesDefinition\@\@QEAA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@_K\@Z */ - MCAPI std::string tryMergeDefinitions(class DynamicPropertiesDefinition const &, std::string const &, unsigned __int64); + MCAPI class std::optional tryMergeDefinitions(class DynamicPropertiesDefinition const &, std::string const &, unsigned __int64); /** * @symbol ??1DynamicPropertiesDefinition\@\@QEAA\@XZ */ MCAPI ~DynamicPropertiesDefinition(); + /** + * @symbol ?ACTOR_TOTAL_DYNAMIC_PROPERTY_SIZE_LIMIT\@DynamicPropertiesDefinition\@\@2_KB + */ + MCAPI static unsigned __int64 const ACTOR_TOTAL_DYNAMIC_PROPERTY_SIZE_LIMIT; + /** + * @symbol ?IDENTIFIER_SIZE_LIMIT\@DynamicPropertiesDefinition\@\@2_KB + */ + MCAPI static unsigned __int64 const IDENTIFIER_SIZE_LIMIT; + /** + * @symbol ?WORLD_TOTAL_DYNAMIC_PROPERTY_SIZE_LIMIT\@DynamicPropertiesDefinition\@\@2_KB + */ + MCAPI static unsigned __int64 const WORLD_TOTAL_DYNAMIC_PROPERTY_SIZE_LIMIT; /** * @symbol ?clearAll\@DynamicPropertiesDefinition\@\@SAXAEBV?$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\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp index 3b138ec669..5ddfb16474 100644 --- a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp +++ b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class EditorNetworkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EditorNetworkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EditorNetworkPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0EditorNetworkPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp b/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp index 80ba5a52d7..c7976cecb7 100644 --- a/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp +++ b/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp @@ -28,6 +28,10 @@ struct EduSharedUriResource { #endif public: + /** + * @symbol ??0EduSharedUriResource\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI EduSharedUriResource(struct EduSharedUriResource &&); /** * @symbol ??0EduSharedUriResource\@\@QEAA\@AEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp index 23e4ba963e..b65c70f94e 100644 --- a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp +++ b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class EduUriResourcePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EduUriResourcePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EduUriResourcePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUURIRESOURCEPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~EduUriResourcePacket(); #endif - /** - * @symbol ??0EduUriResourcePacket\@\@QEAA\@AEBUEduSharedUriResource\@\@\@Z - */ - MCAPI EduUriResourcePacket(struct EduSharedUriResource const &); /** * @symbol ??0EduUriResourcePacket\@\@QEAA\@XZ */ MCAPI EduUriResourcePacket(); + /** + * @symbol ??0EduUriResourcePacket\@\@QEAA\@AEBUEduSharedUriResource\@\@\@Z + */ + MCAPI EduUriResourcePacket(struct EduSharedUriResource const &); }; diff --git a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp index bcc403e9de..879bad9e93 100644 --- a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp @@ -38,10 +38,6 @@ struct EducationLevelSettings { * @symbol ??4EducationLevelSettings\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct EducationLevelSettings & operator=(struct EducationLevelSettings const &); - /** - * @symbol ?save\@EducationLevelSettings\@\@QEAAXAEBVLevelLooseFileStorage\@\@\@Z - */ - MCAPI void save(class LevelLooseFileStorage const &); /** * @symbol ??1EducationLevelSettings\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp index d7c0e4ded6..e385f6ac34 100644 --- a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class EducationSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EducationSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EducationSettingsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUCATIONSETTINGSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EffectCommand.hpp b/LiteLoader/include/llapi/mc/EffectCommand.hpp index f95735c845..a51c75865d 100644 --- a/LiteLoader/include/llapi/mc/EffectCommand.hpp +++ b/LiteLoader/include/llapi/mc/EffectCommand.hpp @@ -36,7 +36,7 @@ class EffectCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@EffectCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/EggItem.hpp b/LiteLoader/include/llapi/mc/EggItem.hpp index 4c49fa4c49..b76aa09085 100644 --- a/LiteLoader/include/llapi/mc/EggItem.hpp +++ b/LiteLoader/include/llapi/mc/EggItem.hpp @@ -52,10 +52,10 @@ class EggItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@EggItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ElementBlock.hpp b/LiteLoader/include/llapi/mc/ElementBlock.hpp index 3583c255ef..fcfaf42c70 100644 --- a/LiteLoader/include/llapi/mc/ElementBlock.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlock.hpp @@ -36,20 +36,10 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ElementBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ElementBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ElementBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 65 - * @symbol ?canBeUsedInCommands\@ElementBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 68 + * @symbol ?canBeUsedInCommands\@ElementBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ - virtual void __unk_vfn_81(); + virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,70 +176,75 @@ class ElementBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 156 + * @vftbl 154 * @symbol ?tryLegacyUpgrade\@ElementBlock\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@ElementBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0ElementBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ElementType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ElementBlockItem.hpp b/LiteLoader/include/llapi/mc/ElementBlockItem.hpp index 687093e2a7..f232206a5e 100644 --- a/LiteLoader/include/llapi/mc/ElementBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlockItem.hpp @@ -52,10 +52,10 @@ class ElementBlockItem : public AuxDataBlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/EmitJumpPreventedEventSystemImpl.hpp b/LiteLoader/include/llapi/mc/EmitJumpPreventedEventSystemImpl.hpp new file mode 100644 index 0000000000..94d7a63406 --- /dev/null +++ b/LiteLoader/include/llapi/mc/EmitJumpPreventedEventSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file EmitJumpPreventedEventSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace EmitJumpPreventedEventSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doEmitJumpPreventedEventSystem\@EmitJumpPreventedEventSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUTriggerJumpRequestComponent\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void doEmitJumpPreventedEventSystem(class StrictEntityContext &, struct TriggerJumpRequestComponent const &, class ActorOwnerComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp index c5d3304b04..3c42992d60 100644 --- a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp +++ b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class EmoteListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EmoteListPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EmoteListPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EMOTELISTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EmotePacket.hpp b/LiteLoader/include/llapi/mc/EmotePacket.hpp index 206a9be0ec..74b7d04d26 100644 --- a/LiteLoader/include/llapi/mc/EmotePacket.hpp +++ b/LiteLoader/include/llapi/mc/EmotePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class EmotePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EmotePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EmotePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EMOTEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EmotePlayedTelemetryDataComponent.hpp b/LiteLoader/include/llapi/mc/EmotePlayedTelemetryDataComponent.hpp deleted file mode 100644 index 58cf97dc68..0000000000 --- a/LiteLoader/include/llapi/mc/EmotePlayedTelemetryDataComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file EmotePlayedTelemetryDataComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure EmotePlayedTelemetryDataComponent. - * - */ -struct EmotePlayedTelemetryDataComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EMOTEPLAYEDTELEMETRYDATACOMPONENT -public: - struct EmotePlayedTelemetryDataComponent& operator=(struct EmotePlayedTelemetryDataComponent const &) = delete; - EmotePlayedTelemetryDataComponent(struct EmotePlayedTelemetryDataComponent const &) = delete; - EmotePlayedTelemetryDataComponent() = delete; -#endif - -public: - /** - * @symbol ??1EmotePlayedTelemetryDataComponent\@\@QEAA\@XZ - */ - MCAPI ~EmotePlayedTelemetryDataComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EmptyMapItem.hpp b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp index ad13c57df4..d4b39bc394 100644 --- a/LiteLoader/include/llapi/mc/EmptyMapItem.hpp +++ b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp @@ -52,10 +52,10 @@ class EmptyMapItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -132,7 +132,7 @@ class EmptyMapItem : public Item { */ virtual std::string getInteractText(class Player const &) const; /** - * @vftbl 135 + * @vftbl 136 * @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 &, class Level &, class Actor &) const; diff --git a/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp index a78e9455d6..764e418e69 100644 --- a/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp @@ -36,7 +36,7 @@ class EnableEncryptionCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@EnableEncryptionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/EnchantCommand.hpp b/LiteLoader/include/llapi/mc/EnchantCommand.hpp index 2a5a050407..3016fd08de 100644 --- a/LiteLoader/include/llapi/mc/EnchantCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnchantCommand.hpp @@ -36,7 +36,7 @@ class EnchantCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@EnchantCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/EnchantUtils.hpp b/LiteLoader/include/llapi/mc/EnchantUtils.hpp index 8b9b443964..ca62b37863 100644 --- a/LiteLoader/include/llapi/mc/EnchantUtils.hpp +++ b/LiteLoader/include/llapi/mc/EnchantUtils.hpp @@ -47,25 +47,25 @@ class EnchantUtils { */ MCAPI static void appendEnchantToFormattedText(enum class Enchant::Type, class std::basic_string_view>, std::string &); /** - * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z + * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z */ - MCAPI static bool applyEnchant(class ItemStackBase &, enum class Enchant::Type, int, bool); + MCAPI static bool applyEnchant(class ItemStackBase &, class EnchantmentInstance const &, bool); /** * @symbol ?applyEnchant\@EnchantUtils\@\@SAHAEAVItemStackBase\@\@AEBVItemEnchants\@\@_N\@Z */ MCAPI static int applyEnchant(class ItemStackBase &, class ItemEnchants const &, bool); /** - * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z - */ - MCAPI static bool applyEnchant(class ItemStackBase &, class EnchantmentInstance const &, bool); - /** - * @symbol ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z + * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z */ - MCAPI static struct EnchantResult canEnchant(class ItemStackBase const &, class EnchantmentInstance const &, bool); + MCAPI static bool applyEnchant(class ItemStackBase &, enum class Enchant::Type, int, bool); /** * @symbol ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z */ MCAPI static struct EnchantResult canEnchant(class ItemStackBase const &, enum class Enchant::Type, int, bool); + /** + * @symbol ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z + */ + MCAPI static struct EnchantResult canEnchant(class ItemStackBase const &, class EnchantmentInstance const &, bool); /** * @symbol ?combineEnchantedItems\@EnchantUtils\@\@SAHAEBVItemStack\@\@0AEAV2\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp index 54ea1321b0..7b968f1959 100644 --- a/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp +++ b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp @@ -52,10 +52,10 @@ class EnchantedBookItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 50 * @symbol ?isGlint\@EnchantedBookItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp index b11a7b52f6..b3e95e1a57 100644 --- a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp @@ -36,25 +36,15 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@EnchantingTableBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class EnchantingTableBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class EnchantingTableBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class EnchantingTableBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +121,55 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 68 - * @symbol ?checkIsPathable\@EnchantingTableBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 71 + * @symbol ?checkIsPathable\@EnchantingTableBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ - virtual void __unk_vfn_74(); + virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,60 +181,65 @@ class EnchantingTableBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 176 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?use\@EnchantingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCHANTINGTABLEBLOCK /** * @symbol ?isCraftingBlock\@EnchantingTableBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp index 1e410aaf3c..859f4e4289 100644 --- a/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp @@ -65,6 +65,11 @@ class EnchantingTableBlockActor : public BlockActor { * @symbol ?getName\@EnchantingTableBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -91,17 +96,22 @@ class EnchantingTableBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@EnchantingTableBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@EnchantingTableBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/EndCrystalItem.hpp b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp index 09518c74be..7bd869a279 100644 --- a/LiteLoader/include/llapi/mc/EndCrystalItem.hpp +++ b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp @@ -52,10 +52,10 @@ class EndCrystalItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 50 * @symbol ?isGlint\@EndCrystalItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z @@ -122,7 +122,7 @@ class EndCrystalItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@EndCrystalItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp index 5f38bef9ed..c100d0d712 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp @@ -41,25 +41,15 @@ class EndGatewayBlock : public ActorBlock { */ virtual class std::shared_ptr newBlockEntity(class BlockPos const &, class Block const &) const; /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@EndGatewayBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +60,11 @@ class EndGatewayBlock : public ActorBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@EndGatewayBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +77,9 @@ class EndGatewayBlock : public ActorBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@EndGatewayBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class EndGatewayBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class EndGatewayBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,55 +131,65 @@ class EndGatewayBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@EndGatewayBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@EndGatewayBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,62 +201,67 @@ class EndGatewayBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@EndGatewayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp index d49fcebacd..f27226d189 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp @@ -75,6 +75,11 @@ class EndGatewayBlockActor : public BlockActor { * @symbol ?hasAlphaLayer\@EndGatewayBlockActor\@\@UEBA_NXZ */ virtual bool hasAlphaLayer() const; + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -101,12 +106,17 @@ class EndGatewayBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@EndGatewayBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/EndPortalBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp index 50fe28edd6..3c009acc6b 100644 --- a/LiteLoader/include/llapi/mc/EndPortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp @@ -36,35 +36,25 @@ class EndPortalBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@EndPortalBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@EndPortalBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; - /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@EndPortalBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 8 + * @symbol ?getAABB\@EndPortalBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_28(); + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -75,16 +65,11 @@ class EndPortalBlock : public ActorBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@EndPortalBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -97,9 +82,9 @@ class EndPortalBlock : public ActorBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@EndPortalBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -120,6 +105,11 @@ class EndPortalBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -130,11 +120,6 @@ class EndPortalBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -151,60 +136,65 @@ class EndPortalBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@EndPortalBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@EndPortalBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,72 +206,82 @@ class EndPortalBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@EndPortalBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 188 + * @symbol ?entityInside\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + /** + * @vftbl 192 * @symbol ?getEntityResourceItem\@EndPortalBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp b/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp index b51e97b945..93d5270aa2 100644 --- a/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp @@ -45,6 +45,11 @@ class EndPortalBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +76,15 @@ class EndPortalBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0EndPortalBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp index 06a0f23250..8e8223b1f4 100644 --- a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp @@ -36,35 +36,25 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@EndPortalFrameBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z - */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; - /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@EndPortalFrameBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 9 + * @symbol ?addAABBs\@EndPortalFrameBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ - virtual void __unk_vfn_19(); + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@EndPortalFrameBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@EndPortalFrameBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +66,10 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +80,6 @@ class EndPortalFrameBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class EndPortalFrameBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class EndPortalFrameBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,45 +131,55 @@ class EndPortalFrameBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_63(); /** - * @vftbl 105 - * @symbol ?getPlacementBlock\@EndPortalFrameBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 108 + * @symbol ?getPlacementBlock\@EndPortalFrameBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ - virtual void __unk_vfn_122(); + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -197,76 +192,81 @@ class EndPortalFrameBlock : public BlockLegacy { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@EndPortalFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@EndPortalFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@EndPortalFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@EndPortalFrameBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@EndPortalFrameBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/EndRodBlock.hpp b/LiteLoader/include/llapi/mc/EndRodBlock.hpp index 89ad118f94..f75292287e 100644 --- a/LiteLoader/include/llapi/mc/EndRodBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndRodBlock.hpp @@ -41,25 +41,20 @@ class EndRodBlock : public BlockLegacy { */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@EndRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +66,10 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +80,6 @@ class EndRodBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class EndRodBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class EndRodBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,70 +131,80 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 68 + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@EndRodBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@EndRodBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,80 +216,80 @@ class EndRodBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@EndRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@EndRodBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@EndRodBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0EndRodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/EndTag.hpp b/LiteLoader/include/llapi/mc/EndTag.hpp index 5e74195fed..a96452f77d 100644 --- a/LiteLoader/include/llapi/mc/EndTag.hpp +++ b/LiteLoader/include/llapi/mc/EndTag.hpp @@ -42,9 +42,9 @@ class EndTag : public Tag { virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@EndTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@EndTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -75,11 +75,5 @@ class EndTag : public Tag { * @symbol ?hash\@EndTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDTAG - /** - * @symbol ?write\@EndTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; -#endif }; diff --git a/LiteLoader/include/llapi/mc/EnderChestBlock.hpp b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp index 8a710afb02..0f0a46519b 100644 --- a/LiteLoader/include/llapi/mc/EnderChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp @@ -36,20 +36,10 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class EnderChestBlock : public ChestBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class EnderChestBlock : public ChestBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class EnderChestBlock : public ChestBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class EnderChestBlock : public ChestBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@EnderChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@EnderChestBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@EnderChestBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/EnderCrystal.hpp b/LiteLoader/include/llapi/mc/EnderCrystal.hpp index c47eaa14c0..0a11e2a939 100644 --- a/LiteLoader/include/llapi/mc/EnderCrystal.hpp +++ b/LiteLoader/include/llapi/mc/EnderCrystal.hpp @@ -36,135 +36,135 @@ class EnderCrystal : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@EnderCrystal\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@EnderCrystal\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@EnderCrystal\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@EnderCrystal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@EnderCrystal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@EnderCrystal\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@EnderCrystal\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0EnderCrystal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnderDragon.hpp b/LiteLoader/include/llapi/mc/EnderDragon.hpp index b232dada6e..cd476f5bf7 100644 --- a/LiteLoader/include/llapi/mc/EnderDragon.hpp +++ b/LiteLoader/include/llapi/mc/EnderDragon.hpp @@ -47,190 +47,190 @@ class EnderDragon : public Monster { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@EnderDragon\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 79 + * @vftbl 70 * @symbol ?getHeadLookVector\@EnderDragon\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getHeadLookVector(float) const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 90 + * @vftbl 79 * @symbol ?isImmobile\@EnderDragon\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 118 + * @vftbl 107 * @symbol ?setSitting\@EnderDragon\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@EnderDragon\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@EnderDragon\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@EnderDragon\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 188 + * @vftbl 176 * @symbol ?canBePulledIntoVehicle\@EnderDragon\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 205 + * @vftbl 192 * @symbol ?canBeAffected\@EnderDragon\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@EnderDragon\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@EnderDragon\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@EnderDragon\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@EnderDragon\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 341 + * @vftbl 321 * @symbol ?tickDeath\@EnderDragon\@\@MEAAXXZ */ virtual void tickDeath(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDERDRAGON /** * @symbol ?canExistInPeaceful\@EnderDragon\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/EnderEyeItem.hpp b/LiteLoader/include/llapi/mc/EnderEyeItem.hpp index c2767708d9..4e61364603 100644 --- a/LiteLoader/include/llapi/mc/EnderEyeItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderEyeItem.hpp @@ -52,10 +52,10 @@ class EnderEyeItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@EnderEyeItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/EnderMan.hpp b/LiteLoader/include/llapi/mc/EnderMan.hpp index e9dbc533e8..aa3e9bcdcc 100644 --- a/LiteLoader/include/llapi/mc/EnderMan.hpp +++ b/LiteLoader/include/llapi/mc/EnderMan.hpp @@ -37,165 +37,165 @@ class EnderMan : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@EnderMan\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 129 + * @vftbl 117 * @symbol ?shouldRender\@EnderMan\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@EnderMan\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 206 + * @vftbl 193 * @symbol ?canBeAffectedByArrow\@EnderMan\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@EnderMan\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@EnderMan\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@EnderMan\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 275 + * @vftbl 261 * @symbol ?hurtEffects\@EnderMan\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 338 + * @vftbl 318 * @symbol ?newServerAiStep\@EnderMan\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0EnderMan\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Endermite.hpp b/LiteLoader/include/llapi/mc/Endermite.hpp index ef40defe41..e25fd4ba4b 100644 --- a/LiteLoader/include/llapi/mc/Endermite.hpp +++ b/LiteLoader/include/llapi/mc/Endermite.hpp @@ -37,150 +37,150 @@ class Endermite : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Endermite\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Endermite\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Endermite\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Endermite\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Endermite\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Endermite\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Endermite\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EnderpearlItem.hpp b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp index 476a55c350..e4bd6c0b30 100644 --- a/LiteLoader/include/llapi/mc/EnderpearlItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp @@ -52,10 +52,10 @@ class EnderpearlItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@EnderpearlItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/EntityFactory.hpp b/LiteLoader/include/llapi/mc/EntityFactory.hpp deleted file mode 100644 index dc3a713b60..0000000000 --- a/LiteLoader/include/llapi/mc/EntityFactory.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file EntityFactory.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class EntityFactory. - * - */ -class EntityFactory { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITYFACTORY -public: - class EntityFactory& operator=(class EntityFactory const &) = delete; - EntityFactory(class EntityFactory const &) = delete; - EntityFactory() = delete; -#endif - -public: - /** - * @symbol ??0EntityFactory\@\@QEAA\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@\@Z - */ - MCAPI EntityFactory(class gsl::not_null); - /** - * @symbol ?create\@EntityFactory\@\@QEAA?AVStrictEntityContextOwner\@\@XZ - */ - MCAPI class StrictEntityContextOwner create(); - /** - * @symbol ?destroy\@EntityFactory\@\@QEAAX$$QEAVStrictEntityContextOwner\@\@\@Z - */ - MCAPI void destroy(class StrictEntityContextOwner &&); - -}; diff --git a/LiteLoader/include/llapi/mc/EntityInsideSystem.hpp b/LiteLoader/include/llapi/mc/EntityInsideSystem.hpp new file mode 100644 index 0000000000..cb2a3f9c32 --- /dev/null +++ b/LiteLoader/include/llapi/mc/EntityInsideSystem.hpp @@ -0,0 +1,72 @@ +/** + * @file EntityInsideSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace EntityInsideSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createCleanupSystem\@EntityInsideSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createCleanupSystem(); + /** + * @symbol ?createSystem\@EntityInsideSystem\@\@YA?AUTickingSystemWithInfo\@\@_N\@Z + */ + MCAPI struct TickingSystemWithInfo createSystem(bool); + /** + * @symbol ?isSlidingDown\@EntityInsideSystem\@\@YA_NAEBVBlockPos\@\@AEBVVec3\@\@1AEBVVec2\@\@\@Z + */ + MCAPI bool isSlidingDown(class BlockPos const &, class Vec3 const &, class Vec3 const &, class Vec2 const &); + /** + * @symbol ?onBoatAboveBubbleColumn\@EntityInsideSystem\@\@YAXAEAVActor\@\@\@Z + */ + MCAPI void onBoatAboveBubbleColumn(class Actor &); + /** + * @symbol ?tickBoatInsideBubbleColumnBlock\@EntityInsideSystem\@\@YAXAEBUInsideBubbleColumnBlockComponent\@\@AEAUFallDistanceComponent\@\@AEAUStateVectorComponent\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void tickBoatInsideBubbleColumnBlock(struct InsideBubbleColumnBlockComponent const &, struct FallDistanceComponent &, struct StateVectorComponent &, class ActorOwnerComponent &); + /** + * @symbol ?tickInsideBubbleColumnBlock\@EntityInsideSystem\@\@YAXAEBUInsideBubbleColumnBlockComponent\@\@AEAUFallDistanceComponent\@\@AEAUStateVectorComponent\@\@V?$optional_ref\@$$CBUAbilitiesComponent\@\@\@\@\@Z + */ + MCAPI void tickInsideBubbleColumnBlock(struct InsideBubbleColumnBlockComponent const &, struct FallDistanceComponent &, struct StateVectorComponent &, class optional_ref); + /** + * @symbol ?tickInsideCactusBlock\@EntityInsideSystem\@\@YAXAEBU?$InsideBlockWithPosAndBlockComponent\@UCactusBlockFlag\@\@\@\@AEAUInsideBlockComponent\@\@\@Z + */ + MCAPI void tickInsideCactusBlock(struct InsideBlockWithPosAndBlockComponent const &, struct InsideBlockComponent &); + /** + * @symbol ?tickInsideHoneyBlock\@EntityInsideSystem\@\@YAXAEBU?$InsideBlockWithPosAndBlockComponent\@UHoneyBlockFlag\@\@\@\@AEBUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@\@Z + */ + MCAPI void tickInsideHoneyBlock(struct InsideBlockWithPosAndBlockComponent const &, struct AABBShapeComponent const &, struct StateVectorComponent &, struct FallDistanceComponent &); + /** + * @symbol ?tickInsidePowderSnowBlock\@EntityInsideSystem\@\@YAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@\@\@\@\@\@\@Z + */ + MCAPI void tickInsidePowderSnowBlock(class StrictEntityContext const &, class EntityModifierT, struct InsideBlockWithPosAndBlockComponent, struct InsideGenericBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosComponent, class FlagComponent>); + /** + * @symbol ?tickInsideWaterLilyBlock\@EntityInsideSystem\@\@YAXAEBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@AEAUStateVectorComponent\@\@\@Z + */ + MCAPI void tickInsideWaterLilyBlock(struct InsideBlockWithPosComponent const &, struct StateVectorComponent &); + /** + * @symbol ?tickMovementSlowdown\@EntityInsideSystem\@\@YAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@\@\@\@\@\@VVec3\@\@\@Z + */ + MCAPI void tickMovementSlowdown(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, class EntityModifierT, struct InsideBlockWithPosAndBlockComponent, struct InsideGenericBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosComponent, class FlagComponent>, class Vec3); + /** + * @symbol ?tickSetEntityInside\@EntityInsideSystem\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@AEAUInsideBlockComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@\@\@\@\@\@AEBULocalConstBlockSourceFactoryComponent\@\@AEAVLocalConstBlockSource\@\@\@Z + */ + MCAPI void tickSetEntityInside(class StrictEntityContext const &, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, struct InsideBlockComponent &, class EntityModifierT, struct InsideBlockWithPosAndBlockComponent, struct InsideGenericBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosComponent, class FlagComponent>, struct LocalConstBlockSourceFactoryComponent const &, class LocalConstBlockSource &); + /** + * @symbol ?tickSpectatorSkipEntityInside\@EntityInsideSystem\@\@YAXAEBVStrictEntityContext\@\@AEBUActorGameTypeComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@\@\@\@\@\@AEBUExternalDataInterface\@\@\@Z + */ + MCAPI void tickSpectatorSkipEntityInside(class StrictEntityContext const &, struct ActorGameTypeComponent const &, class EntityModifierT, struct InsideBlockWithPosAndBlockComponent, struct InsideGenericBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosComponent, class FlagComponent>, struct ExternalDataInterface const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EntityInsideSystemImpl.hpp b/LiteLoader/include/llapi/mc/EntityInsideSystemImpl.hpp new file mode 100644 index 0000000000..b0628e3651 --- /dev/null +++ b/LiteLoader/include/llapi/mc/EntityInsideSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file EntityInsideSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace EntityInsideSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?blockProcess\@EntityInsideSystemImpl\@\@YAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@\@\@\@\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAUInsideGenericBlockComponent\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI void blockProcess(class StrictEntityContext const &, class EntityModifierT, struct InsideBlockWithPosAndBlockComponent, struct InsideGenericBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosComponent, class FlagComponent>, class Block const &, class BlockPos const &, struct InsideGenericBlockComponent &, class IConstBlockSource const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EntityNetId.hpp b/LiteLoader/include/llapi/mc/EntityNetId.hpp index 2f319dacb9..203c093e2f 100644 --- a/LiteLoader/include/llapi/mc/EntityNetId.hpp +++ b/LiteLoader/include/llapi/mc/EntityNetId.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -33,5 +34,9 @@ class EntityNetId { * @symbol ?_serverGetEntityNetId\@EntityNetId\@\@SA?AV1\@AEBVEntityContext\@\@\@Z */ MCAPI static class EntityNetId _serverGetEntityNetId(class EntityContext const &); + /** + * @symbol ?deserialize\@EntityNetId\@\@SA?AV?$Result\@VEntityNetId\@\@Verror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI static class Bedrock::Result deserialize(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp index 4cbc06df36..034696a58e 100644 --- a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp @@ -71,6 +71,11 @@ class EntityPlacerItemComponent { virtual void __unk_vfn_7(); /** * @vftbl 8 + * @symbol __unk_vfn_8 + */ + virtual void __unk_vfn_8(); + /** + * @vftbl 9 * @symbol ?_useOn\@EntityPlacerItemComponent\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp index 14d8385a50..658cd88d92 100644 --- a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp +++ b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -41,9 +42,9 @@ class EntityServerPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@EntityServerPacket\@\@MEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@EntityServerPacket\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYSERVERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/EntitySet.hpp b/LiteLoader/include/llapi/mc/EntitySet.hpp index 79bd8b2f2f..c12b6d506e 100644 --- a/LiteLoader/include/llapi/mc/EntitySet.hpp +++ b/LiteLoader/include/llapi/mc/EntitySet.hpp @@ -31,14 +31,14 @@ class EntitySet { * @symbol ??0EntitySet\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI EntitySet(class EntitySet &&); - /** - * @symbol ??0EntitySet\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI EntitySet(class EntitySet const &); /** * @symbol ??0EntitySet\@\@QEAA\@XZ */ MCAPI EntitySet(); + /** + * @symbol ??0EntitySet\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI EntitySet(class EntitySet const &); /** * @symbol ?add\@EntitySet\@\@QEAA_NAEBVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntitySystems.hpp b/LiteLoader/include/llapi/mc/EntitySystems.hpp index c262899742..cdf3d3d38b 100644 --- a/LiteLoader/include/llapi/mc/EntitySystems.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystems.hpp @@ -32,13 +32,9 @@ class EntitySystems { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYSYSTEMS /** - * @symbol ?registerSingleTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z + * @symbol ?registerTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@UEntitySystemTickingMode\@\@\@Z */ - MCVAPI void registerSingleTickingSystem(class gsl::span const, -1>, std::unique_ptr, struct SystemInfo const &); - /** - * @symbol ?registerTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z - */ - MCVAPI void registerTickingSystem(class gsl::span const, -1>, std::unique_ptr, struct SystemInfo const &); + MCVAPI void registerTickingSystem(class gsl::span const, -1>, std::unique_ptr, struct SystemInfo const &, struct EntitySystemTickingMode); /** * @symbol ?tickMovementCatchup\@EntitySystems\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ @@ -76,10 +72,6 @@ class EntitySystems { * @symbol ?registerMovementTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z */ MCAPI void registerMovementTickingSystem(struct TickingSystemWithInfo &&); - /** - * @symbol ?registerSystem\@EntitySystems\@\@QEAAXV?$unique_ptr\@UISystem\@\@U?$default_delete\@UISystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z - */ - MCAPI void registerSystem(std::unique_ptr, struct SystemInfo const &); /** * @symbol ?registerTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z */ @@ -94,6 +86,10 @@ class EntitySystems { MCAPI void tickEditor(class EntityRegistry &); //private: + /** + * @symbol ?_hasSingleTickCategory\@EntitySystems\@\@AEBA_NV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@\@Z + */ + MCAPI bool _hasSingleTickCategory(class Bedrock::typeid_t) const; /** * @symbol ?_singleTickCategory\@EntitySystems\@\@AEAAXV?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp b/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp index 0122c3d22f..871386607b 100644 --- a/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp @@ -27,10 +27,6 @@ struct EntitySystemsInfo { #endif public: - /** - * @symbol ??1EntitySystemsInfo\@\@QEAA\@XZ - */ - MCAPI ~EntitySystemsInfo(); /** * @symbol ?bindType\@EntitySystemsInfo\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/EventCommand.hpp b/LiteLoader/include/llapi/mc/EventCommand.hpp index cec0d4835d..a4cf6584e8 100644 --- a/LiteLoader/include/llapi/mc/EventCommand.hpp +++ b/LiteLoader/include/llapi/mc/EventCommand.hpp @@ -36,7 +36,7 @@ class EventCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@EventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/EventPacket.hpp b/LiteLoader/include/llapi/mc/EventPacket.hpp deleted file mode 100644 index ba3795c741..0000000000 --- a/LiteLoader/include/llapi/mc/EventPacket.hpp +++ /dev/null @@ -1,189 +0,0 @@ -/** - * @file EventPacket.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "MinecraftEventing.hpp" -#include "Packet.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here -#include "Level.hpp" -#include "Player.hpp" - -enum class EventType : int { - ACHIEVEMENT_AWARDED, - ENTITY_INTERACT, - PORTAL_BUILT, - PORTAL_USED, - MOB_KILLED, - CAULDRON_USED, - PLAYER_DEATH, - BOSS_KILLED, - AGENT_COMMAND, - AGENT_CREATED, - PATTERN_REMOVED, - SLASH_COMMAND_EXECUTED, - FISH_BUCKETED, - MOB_BORN, - PET_DIED, - CAULDRON_BLOCK_USED, - COMPOSTER_BLOCK_USED, - BELL_BLOCK_USED, -}; - -#undef BEFORE_EXTRA - -/** - * @brief MC class EventPacket. - * - */ -class EventPacket : public Packet { - -#define AFTER_EXTRA -// Add Member There -public: - struct Data { - EventType type; - unsigned char usePlayerId; // whether uniqueId is set - int int_8;//fromDimensionID in PORTAL_USED Event - int int_12;//toDimensionID in PORTAL_USED Event - char filler16[40 - 16]; - std::string unk40; - std::string unk72; - std::string unk104; - std::string unk136; - std::string unk168; - std::string unk200; - std::string unk232; - };//size: 264 - enum class AgentResult; - - ActorUniqueID uniqueId; - Data data; - - inline std::string toDebugString() { - std::string name = data.usePlayerId ? Global->getPlayer(uniqueId)->getNameTag() : "Null"; - std::string debugString = fmt::format("{}: type: {}, player: {}", - __super::toDebugString(), (int)data.type, name); - if (data.type == EventType::PORTAL_USED) { - debugString.append(", dimension: {}->{}", data.int_8, data.int_12); - } - return debugString; - } - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EVENTPACKET -public: - class EventPacket& operator=(class EventPacket const &) = delete; - EventPacket(class EventPacket const &) = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getId\@EventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ - */ - virtual enum class MinecraftPacketIds getId() const; - /** - * @vftbl 2 - * @symbol ?getName\@EventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - virtual std::string getName() const; - /** - * @vftbl 3 - * @symbol ?write\@EventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z - */ - virtual void write(class BinaryStream &) const; - /** - * @vftbl 7 - * @symbol ?_read\@EventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z - */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EVENTPACKET - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~EventPacket(); -#endif - /** - * @symbol ??0EventPacket\@\@QEAA\@XZ - */ - MCAPI EventPacket(); - /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@W4MovementEventType\@\@MMMMM\@Z - */ - MCAPI EventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@W4ActorType\@\@\@Z - */ - MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, enum class ActorType); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z - */ - MCAPI EventPacket(class Player const *, class gsl::not_null); - /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z - */ - MCAPI EventPacket(class Player const &, std::string const &, int); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z - */ - MCAPI EventPacket(class Player const *, class AutomaticID); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z - */ - MCAPI EventPacket(class Player const *, int, class gsl::not_null); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@FIF\@Z - */ - MCAPI EventPacket(class Player const *, short, unsigned int, short); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z - */ - MCAPI EventPacket(class Player const *, std::string const &, int, int, std::string const &); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@_N\@Z - */ - MCAPI EventPacket(class Player const *, enum class MinecraftEventing::AchievementIds, bool); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HHW4ActorDamageCause\@\@_N\@Z - */ - MCAPI EventPacket(class Player const *, int, int, enum class ActorDamageCause, bool); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBVRaid\@\@_N\@Z - */ - MCAPI EventPacket(class Player const *, class Raid const &, bool); - /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI EventPacket(class Player const &, std::string const &); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z - */ - MCAPI EventPacket(class Player const *, class AutomaticID, class AutomaticID); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ActorType\@\@\@Z - */ - MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, std::string, int, enum class ActorType); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBUData\@0\@\@Z - */ - MCAPI EventPacket(class Player const *, struct EventPacket::Data const &); - /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVActor\@\@\@gsl\@\@W4InteractionType\@MinecraftEventing\@\@\@Z - */ - MCAPI EventPacket(class Player const *, class gsl::not_null, enum class MinecraftEventing::InteractionType); - /** - * @symbol ??4EventPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class EventPacket & operator=(class EventPacket &&); - -}; diff --git a/LiteLoader/include/llapi/mc/EvocationFang.hpp b/LiteLoader/include/llapi/mc/EvocationFang.hpp index 87bd4761b5..ed85dfd89d 100644 --- a/LiteLoader/include/llapi/mc/EvocationFang.hpp +++ b/LiteLoader/include/llapi/mc/EvocationFang.hpp @@ -36,120 +36,120 @@ class EvocationFang : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@EvocationFang\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@EvocationFang\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@EvocationFang\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@EvocationFang\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0EvocationFang\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EvocationIllager.hpp b/LiteLoader/include/llapi/mc/EvocationIllager.hpp index 8a719846e2..3f5b0cbf56 100644 --- a/LiteLoader/include/llapi/mc/EvocationIllager.hpp +++ b/LiteLoader/include/llapi/mc/EvocationIllager.hpp @@ -42,140 +42,140 @@ class EvocationIllager : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@EvocationIllager\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@EvocationIllager\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 295 + * @vftbl 278 * @symbol ?isAlliedTo\@EvocationIllager\@\@UEAA_NPEAVMob\@\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@EvocationIllager\@\@MEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EVOCATIONILLAGER /** * @symbol ?canExistInPeaceful\@EvocationIllager\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ExecuteCommand.hpp b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp index 8540b2cf4a..7e883a8965 100644 --- a/LiteLoader/include/llapi/mc/ExecuteCommand.hpp +++ b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp @@ -36,7 +36,7 @@ class ExecuteCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp index b067351aef..ff2d40ab8b 100644 --- a/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp @@ -110,9 +110,9 @@ class ExecuteContextCommandOrigin : public CommandOrigin { */ virtual bool isValid() const; /** - * @symbol ??0ExecuteContextCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEBVVec3\@\@AEBV?$optional\@VVec2\@\@\@std\@\@00W4ActorLocation\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVLevel\@\@\@Z + * @symbol ??0ExecuteContextCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEBVVec3\@\@AEBV?$optional\@VVec2\@\@\@std\@\@00W4ActorLocation\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVLevel\@\@H\@Z */ - MCAPI ExecuteContextCommandOrigin(struct ActorUniqueID, class Vec3 const &, class std::optional const &, struct ActorUniqueID, struct ActorUniqueID, enum class ActorLocation, class AutomaticID, class Level &); + MCAPI ExecuteContextCommandOrigin(struct ActorUniqueID, class Vec3 const &, class std::optional const &, struct ActorUniqueID, struct ActorUniqueID, enum class ActorLocation, class AutomaticID, class Level &, int); /** * @symbol ?getPositionEntity\@ExecuteContextCommandOrigin\@\@QEAAPEBVActor\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp b/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp index 0f9c7cbf26..062fd60919 100644 --- a/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp @@ -46,21 +46,21 @@ struct ExitVehicleSystemImpl { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@UOffsetsComponent\@\@V?$FlagComponent\@UEjectedByActivatorRailFlag\@\@\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@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 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct DimensionTypeComponent, struct PassengerComponent, struct VehicleComponent, struct OffsetsComponent, class FlagComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @vftbl 5 - * @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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@UOffsetsComponent\@\@V?$FlagComponent\@UEjectedByActivatorRailFlag\@\@\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEAVStrictEntityContext\@\@\@Z + * @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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@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, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class StrictEntityContext &); + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct DimensionTypeComponent, struct PassengerComponent, struct VehicleComponent, struct OffsetsComponent, class FlagComponent>, 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\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUStateVectorComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@UOffsetsComponent\@\@V?$FlagComponent\@UEjectedByActivatorRailFlag\@\@\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @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\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUStateVectorComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@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 &, 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 EntityModifierT &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); + 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 EntityModifierT &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct DimensionTypeComponent, struct PassengerComponent, struct VehicleComponent, struct OffsetsComponent, class FlagComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, 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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UPassengerComponent\@\@UVehicleComponent\@\@UOffsetsComponent\@\@V?$FlagComponent\@UEjectedByActivatorRailFlag\@\@\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UActorSetPositionRequestComponent\@\@\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UMobBodyRotationComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@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 */ - MCAPI static createViews(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + MCAPI static createViews(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct DimensionTypeComponent, struct PassengerComponent, struct VehicleComponent, struct OffsetsComponent, class FlagComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp deleted file mode 100644 index c0ebf48a30..0000000000 --- a/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file ExpectedAnywhereConsume.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct ExpectedAnywhereConsume { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXPECTEDANYWHERECONSUME -public: - struct ExpectedAnywhereConsume& operator=(struct ExpectedAnywhereConsume const &) = delete; - ExpectedAnywhereConsume(struct ExpectedAnywhereConsume const &) = delete; - ExpectedAnywhereConsume() = delete; -#endif - -public: - /** - * @symbol ??0ExpectedAnywhereConsume\@\@QEAA\@AEBVItemStack\@\@I\@Z - */ - MCAPI ExpectedAnywhereConsume(class ItemStack const &, unsigned int); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp b/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp index 4eb5e86461..a4d91841c8 100644 --- a/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp @@ -47,5 +47,9 @@ class ExperienceCostCommitObject { * @symbol ?commit\@ExperienceCostCommitObject\@\@UEAAXAEBVContainerScreenContext\@\@\@Z */ virtual void commit(class ContainerScreenContext const &); + /** + * @symbol ??0ExperienceCostCommitObject\@\@QEAA\@H\@Z + */ + MCAPI ExperienceCostCommitObject(int); }; diff --git a/LiteLoader/include/llapi/mc/ExperienceOrb.hpp b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp index 4efa568542..fe0929d325 100644 --- a/LiteLoader/include/llapi/mc/ExperienceOrb.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp @@ -43,140 +43,140 @@ enum class DropType; */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@ExperienceOrb\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 87 + * @vftbl 78 * @symbol ?playerTouch\@ExperienceOrb\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@ExperienceOrb\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 247 + * @vftbl 234 * @symbol ?doWaterSplashEffect\@ExperienceOrb\@\@MEAAXXZ */ virtual void doWaterSplashEffect(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@ExperienceOrb\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@ExperienceOrb\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@ExperienceOrb\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@ExperienceOrb\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0ExperienceOrb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ExperiencePotion.hpp b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp index 82f8576f51..582c78ebb7 100644 --- a/LiteLoader/include/llapi/mc/ExperiencePotion.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp @@ -37,122 +37,122 @@ class ExperiencePotion : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?getThrowPower\@ExperiencePotion\@\@MEAAMXZ */ virtual float getThrowPower(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getThrowUpAngleOffset\@ExperiencePotion\@\@MEAAMXZ */ virtual float getThrowUpAngleOffset(); /** - * @vftbl 271 + * @vftbl 257 * @symbol ?getGravity\@ExperiencePotion\@\@MEAAMXZ */ virtual float getGravity(); diff --git a/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp index 1bcf656cc1..873126f570 100644 --- a/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp @@ -52,10 +52,10 @@ class ExperiencePotionItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@ExperiencePotionItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/Experiments.hpp b/LiteLoader/include/llapi/mc/Experiments.hpp index ce8c678eb9..6bf3af28e5 100644 --- a/LiteLoader/include/llapi/mc/Experiments.hpp +++ b/LiteLoader/include/llapi/mc/Experiments.hpp @@ -48,6 +48,10 @@ class Experiments { * @symbol ?Gametest\@Experiments\@\@QEBA_NXZ */ MCAPI bool Gametest() const; + /** + * @symbol ?RecipeUnlocking\@Experiments\@\@QEBA_NXZ + */ + MCAPI bool RecipeUnlocking() const; /** * @symbol ?ShortSneaking\@Experiments\@\@QEBA_NXZ */ @@ -72,6 +76,10 @@ class Experiments { * @symbol ?isExperimentEnabled\@Experiments\@\@QEBA_NW4AllExperiments\@\@\@Z */ MCAPI bool isExperimentEnabled(enum class AllExperiments) const; + /** + * @symbol ?setExperimentByToggleIndex\@Experiments\@\@QEAAX_K_N\@Z + */ + MCAPI void setExperimentByToggleIndex(unsigned __int64, bool); /** * @symbol ?setExperimentEnabled\@Experiments\@\@QEAAXW4AllExperiments\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/ExpressionNode.hpp b/LiteLoader/include/llapi/mc/ExpressionNode.hpp index 610c1d9042..b6e3282ece 100644 --- a/LiteLoader/include/llapi/mc/ExpressionNode.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionNode.hpp @@ -57,10 +57,18 @@ class ExpressionNode { * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z */ MCAPI ExpressionNode(class ExpressionNode const &); + /** + * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + */ + MCAPI ExpressionNode(class Json::Value const &, enum class MolangVersion, class gsl::span); /** * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ MCAPI ExpressionNode(std::string const &, class SemVersion const &, class gsl::span); + /** + * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z + */ + MCAPI ExpressionNode(float); /** * @symbol ??0ExpressionNode\@\@QEAA\@AEAUMolangScriptArg\@\@W4ExpressionOp\@\@\@Z */ @@ -69,18 +77,10 @@ class ExpressionNode { * @symbol ??0ExpressionNode\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ExpressionNode(class ExpressionNode &&); - /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z - */ - MCAPI ExpressionNode(class Json::Value const &, enum class MolangVersion, class gsl::span); /** * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ MCAPI ExpressionNode(class Json::Value const &, class SemVersion const &, class gsl::span); - /** - * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z - */ - MCAPI ExpressionNode(float); /** * @symbol ?clear\@ExpressionNode\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ExpressionNodeCerealConstraint.hpp b/LiteLoader/include/llapi/mc/ExpressionNodeCerealConstraint.hpp new file mode 100644 index 0000000000..9e2a070590 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ExpressionNodeCerealConstraint.hpp @@ -0,0 +1,47 @@ +/** + * @file ExpressionNodeCerealConstraint.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ExpressionNodeCerealConstraint { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXPRESSIONNODECEREALCONSTRAINT +public: + class ExpressionNodeCerealConstraint& operator=(class ExpressionNodeCerealConstraint const &) = delete; + ExpressionNodeCerealConstraint(class ExpressionNodeCerealConstraint const &) = delete; + ExpressionNodeCerealConstraint() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol ?doValidate\@ExpressionNodeCerealConstraint\@\@EEBA_NAEBVmeta_any\@entt\@\@AEAVSerializerContext\@cereal\@\@\@Z + */ + virtual bool doValidate(class entt::meta_any const &, class cereal::SerializerContext &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EXPRESSIONNODECEREALCONSTRAINT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ExpressionNodeCerealConstraint(); +#endif + /** + * @symbol ?disallowSideEffects\@ExpressionNodeCerealConstraint\@\@QEAAAEAV1\@_N\@Z + */ + MCAPI class ExpressionNodeCerealConstraint & disallowSideEffects(bool); + /** + * @symbol ?onlyAllowQueries\@ExpressionNodeCerealConstraint\@\@QEAAAEAV1\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI class ExpressionNodeCerealConstraint & onlyAllowQueries(std::vector const &); + +}; diff --git a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp deleted file mode 100644 index 52b85e4afe..0000000000 --- a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file ExtendedStreamReadResult.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure ExtendedStreamReadResult. - * - */ -struct ExtendedStreamReadResult { - -#define AFTER_EXTRA - ExtendedStreamReadResult(StreamReadResult result, std::string resultContext) { - this->result = result; - this->resultContext = resultContext; - } - StreamReadResult result; - std::string resultContext; -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXTENDEDSTREAMREADRESULT -public: - struct ExtendedStreamReadResult& operator=(struct ExtendedStreamReadResult const &) = delete; - ExtendedStreamReadResult(struct ExtendedStreamReadResult const &) = delete; - ExtendedStreamReadResult() = delete; -#endif - -public: - /** - * @symbol ??1ExtendedStreamReadResult\@\@QEAA\@XZ - */ - MCAPI ~ExtendedStreamReadResult(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp index 2d8e405628..da2b829c7e 100644 --- a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp +++ b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp @@ -63,9 +63,9 @@ class ExternalFileLevelStorageSource { virtual void getLevelList(std::vector> &); /** * @vftbl 6 - * @symbol ?createLevelStorage\@ExternalFileLevelStorageSource\@\@UEAA?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@8\@V?$unique_ptr\@VLevelStorageEventing\@\@U?$default_delete\@VLevelStorageEventing\@\@\@std\@\@\@3\@\@Z + * @symbol ?createLevelStorage\@ExternalFileLevelStorageSource\@\@UEAA?AV?$OwnerPtrT\@U?$SharePtrRefTraits\@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 std::unique_ptr createLevelStorage(class Scheduler &, std::string const &, class ContentIdentity const &, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &, class gsl::not_null>, std::unique_ptr); + virtual class OwnerPtrT> createLevelStorage(class Scheduler &, std::string const &, class ContentIdentity const &, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &, class gsl::not_null>, std::unique_ptr); /** * @vftbl 7 * @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 diff --git a/LiteLoader/include/llapi/mc/EyeOfEnder.hpp b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp index 7cda08f6eb..a8907219b0 100644 --- a/LiteLoader/include/llapi/mc/EyeOfEnder.hpp +++ b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp @@ -41,115 +41,115 @@ class EyeOfEnder : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 46 + * @vftbl 41 * @symbol ?lerpMotion\@EyeOfEnder\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@EyeOfEnder\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@EyeOfEnder\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0EyeOfEnder\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp index c241554536..2941027717 100644 --- a/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp @@ -37,10 +37,6 @@ class EyeOfEnderPreNormalTickSystem { * @symbol ?_doEyeOfEnderPreNormalTickSystem\@EyeOfEnderPreNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doEyeOfEnderPreNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - /** - * @symbol ?_tickEyeOfEnderPreNormalTickSystem\@EyeOfEnderPreNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UEyeOfEnderFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickEyeOfEnderPreNormalTickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp index 8691c8b860..b6f934e724 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp @@ -36,20 +36,10 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class FaceDirectionalActorBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class FaceDirectionalActorBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class FaceDirectionalActorBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_63(); /** - * @vftbl 105 - * @symbol ?getPlacementBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); + /** + * @vftbl 108 + * @symbol ?getPlacementBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + */ + virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,70 +176,75 @@ class FaceDirectionalActorBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 147 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 145 * @symbol ?getRenderBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@FaceDirectionalActorBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getFaceFlip\@FaceDirectionalActorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FACEDIRECTIONALACTORBLOCK /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp index 8bc34d9d1d..e6ec5c801f 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp @@ -36,20 +36,10 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class FaceDirectionalBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class FaceDirectionalBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class FaceDirectionalBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 54 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 57 * @symbol ?isValidAuxValue\@FaceDirectionalBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,70 +181,75 @@ class FaceDirectionalBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 147 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 145 * @symbol ?getRenderBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@FaceDirectionalBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getFaceFlip\@FaceDirectionalBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FACEDIRECTIONALBLOCK /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FallingBlock.hpp b/LiteLoader/include/llapi/mc/FallingBlock.hpp index 8840777bce..5a7092d27a 100644 --- a/LiteLoader/include/llapi/mc/FallingBlock.hpp +++ b/LiteLoader/include/llapi/mc/FallingBlock.hpp @@ -36,20 +36,10 @@ class FallingBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class FallingBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class FallingBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class FallingBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class FallingBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class FallingBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 98 - * @symbol ?neighborChanged\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 101 + * @symbol ?neighborChanged\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + */ + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,97 +176,102 @@ class FallingBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const = 0; /** - * @vftbl 195 + * @vftbl 193 * @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 = 0; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** - * @vftbl 197 + * @vftbl 195 * @symbol ?onLand\@FallingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 198 + * @vftbl 196 * @symbol ?isFreeToFall\@FallingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?startFalling\@FallingBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; diff --git a/LiteLoader/include/llapi/mc/FallingBlockActor.hpp b/LiteLoader/include/llapi/mc/FallingBlockActor.hpp index 42ff5c3e7e..2be7ca6fef 100644 --- a/LiteLoader/include/llapi/mc/FallingBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FallingBlockActor.hpp @@ -37,155 +37,155 @@ class FallingBlockActor : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@FallingBlockActor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@FallingBlockActor\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@FallingBlockActor\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@FallingBlockActor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@FallingBlockActor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@FallingBlockActor\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@FallingBlockActor\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@FallingBlockActor\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@FallingBlockActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@FallingBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@FallingBlockActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FALLINGBLOCKACTOR /** * @symbol ?getDeletionDelayTimeSeconds\@FallingBlockActor\@\@UEBAMXZ diff --git a/LiteLoader/include/llapi/mc/FarmBlock.hpp b/LiteLoader/include/llapi/mc/FarmBlock.hpp index 738104fd97..5981e62fac 100644 --- a/LiteLoader/include/llapi/mc/FarmBlock.hpp +++ b/LiteLoader/include/llapi/mc/FarmBlock.hpp @@ -36,30 +36,20 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@FarmBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@FarmBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class FarmBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class FarmBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class FarmBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,55 +126,65 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@FarmBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 71 + * @vftbl 74 * @symbol ?transformOnFall\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ virtual void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,82 +196,87 @@ class FarmBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@FarmBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@FarmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@FarmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -295,4 +295,12 @@ class FarmBlock : public BlockLegacy { */ MCAPI static class AABB BLOCK_AABB; +//private: + /** + * @symbol ?_becomeDirt\@FarmBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + */ + MCAPI void _becomeDirt(class BlockSource &, class BlockPos const &, class Actor *) const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp index 179f44af1e..578398862a 100644 --- a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp +++ b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "FeatureRegistry.hpp" #include "Packet.hpp" @@ -51,9 +52,9 @@ class FeatureRegistryPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@FeatureRegistryPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@FeatureRegistryPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FEATUREREGISTRYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FeedItem.hpp b/LiteLoader/include/llapi/mc/FeedItem.hpp index e95cba5229..a548dbcb9b 100644 --- a/LiteLoader/include/llapi/mc/FeedItem.hpp +++ b/LiteLoader/include/llapi/mc/FeedItem.hpp @@ -28,6 +28,7 @@ struct Effect { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_FEEDITEM public: + struct FeedItem& operator=(struct FeedItem const &) = delete; FeedItem() = delete; #endif @@ -44,10 +45,6 @@ struct Effect { * @symbol ??4FeedItem\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct FeedItem & operator=(struct FeedItem &&); - /** - * @symbol ??4FeedItem\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct FeedItem & operator=(struct FeedItem const &); /** * @symbol ??1FeedItem\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/FenceBlock.hpp b/LiteLoader/include/llapi/mc/FenceBlock.hpp index 1c507f8788..e7f8afa9e3 100644 --- a/LiteLoader/include/llapi/mc/FenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceBlock.hpp @@ -36,45 +36,45 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 5 + * @symbol ?clip\@FenceBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + */ + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + /** + * @vftbl 7 + * @symbol ?addCollisionShapes\@FenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + */ + virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; + /** + * @vftbl 8 * @symbol ?getAABB\@FenceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** * @vftbl 11 - * @symbol ?addCollisionShapes\@FenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?getVisualShapeInWorld\@FenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** * @vftbl 14 * @symbol ?getLiquidClipVolume\@FenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@FenceBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@FenceBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -86,10 +86,10 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -100,11 +100,6 @@ class FenceBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -125,6 +120,11 @@ class FenceBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -135,11 +135,6 @@ class FenceBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -156,60 +151,70 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@FenceBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@FenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@FenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@FenceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,75 +226,70 @@ class FenceBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@FenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_153(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_162(); + /** + * @vftbl 163 + * @symbol __unk_vfn_163 + */ + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 */ virtual void __unk_vfn_164(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_171(); /** * @vftbl 173 - * @symbol __unk_vfn_173 - */ - virtual void __unk_vfn_173(); - /** - * @vftbl 174 - * @symbol ?clip\@FenceBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z - */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; - /** - * @vftbl 176 * @symbol ?use\@FenceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FENCEBLOCK /** * @symbol ?canBeSilkTouched\@FenceBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FenceGateBlock.hpp b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp index 5bcd509d31..53884368f1 100644 --- a/LiteLoader/include/llapi/mc/FenceGateBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp @@ -36,7 +36,7 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@FenceGateBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; @@ -46,25 +46,15 @@ class FenceGateBlock : public BlockLegacy { */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@FenceGateBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +66,10 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +80,6 @@ class FenceGateBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class FenceGateBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class FenceGateBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,70 +131,80 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@FenceGateBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 84 + * @vftbl 87 * @symbol ?ignoreEntitiesOnPistonMove\@FenceGateBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool ignoreEntitiesOnPistonMove(class Block const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@FenceGateBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,70 +216,75 @@ class FenceGateBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@FenceGateBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FENCEGATEBLOCK /** * @symbol ?isFenceGateBlock\@FenceGateBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FertilizerItem.hpp b/LiteLoader/include/llapi/mc/FertilizerItem.hpp index 38490ee4d4..b1c3897a1f 100644 --- a/LiteLoader/include/llapi/mc/FertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/FertilizerItem.hpp @@ -56,16 +56,11 @@ class FertilizerItem : public Item { * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); /** * @vftbl 21 - * @symbol ?isFertilizer\@FertilizerItem\@\@UEBA_NXZ + * @symbol __unk_vfn_21 */ - virtual bool isFertilizer() const; + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -127,11 +122,15 @@ class FertilizerItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@FertilizerItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FERTILIZERITEM + /** + * @symbol ?isFertilizer\@FertilizerItem\@\@UEBA_NXZ + */ + MCVAPI bool isFertilizer() const; /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/FillCommand.hpp b/LiteLoader/include/llapi/mc/FillCommand.hpp index ca8671aede..56d6d576cb 100644 --- a/LiteLoader/include/llapi/mc/FillCommand.hpp +++ b/LiteLoader/include/llapi/mc/FillCommand.hpp @@ -36,7 +36,7 @@ class FillCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@FillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/FilterGroup.hpp b/LiteLoader/include/llapi/mc/FilterGroup.hpp index 28bfec98bc..def6e9714b 100644 --- a/LiteLoader/include/llapi/mc/FilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/FilterGroup.hpp @@ -56,14 +56,14 @@ enum class CollectionType; * @symbol ??0FilterGroup\@\@QEAA\@AEBV0\@\@Z */ MCAPI FilterGroup(class FilterGroup const &); - /** - * @symbol ?addFilterTest\@FilterGroup\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUFilterInputs\@\@\@Z - */ - MCAPI bool addFilterTest(std::string const &, struct FilterInputs const &); /** * @symbol ?addFilterTest\@FilterGroup\@\@QEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ MCAPI bool addFilterTest(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @symbol ?addFilterTest\@FilterGroup\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUFilterInputs\@\@\@Z + */ + MCAPI bool addFilterTest(std::string const &, struct FilterInputs const &); /** * @symbol ?empty\@FilterGroup\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/FilterTest.hpp b/LiteLoader/include/llapi/mc/FilterTest.hpp index 665b8df9b0..515b0c066e 100644 --- a/LiteLoader/include/llapi/mc/FilterTest.hpp +++ b/LiteLoader/include/llapi/mc/FilterTest.hpp @@ -48,7 +48,7 @@ struct Definition { virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** * @vftbl 2 - * @symbol ?evaluate\@ActorInactivityTimerTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @symbol ?evaluate\@ActorHealthTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const = 0; /** @@ -58,7 +58,7 @@ struct Definition { virtual void finalizeParsedValue(class IWorldRegistriesProvider &); /** * @vftbl 4 - * @symbol ?getName\@ActorInactivityTimerTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + * @symbol ?getName\@ActorHealthTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ virtual class std::basic_string_view> getName() const = 0; /** diff --git a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp index a5c5c0ce8a..5937a0c560 100644 --- a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp +++ b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class FilterTextPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@FilterTextPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@FilterTextPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTEXTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp b/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp index d37c1a740d..6bd27f2bd4 100644 --- a/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp @@ -32,8 +32,8 @@ class FinalizeMoveSystem { */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?tick\@FinalizeMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUMoveRequestComponent\@\@$$CBUOffsetsComponent\@\@$$CBUSlideOffsetComponent\@\@UStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUAbilitiesComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UCollisionFlag\@\@\@\@V?$FlagComponent\@UHorizontalCollisionFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@\@Z + * @symbol ?tick\@FinalizeMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUMoveRequestComponent\@\@$$CBUOffsetsComponent\@\@UStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUAbilitiesComponent\@\@\@\@V?$Optional\@USlideOffsetComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UCollisionFlag\@\@\@\@V?$FlagComponent\@UHorizontalCollisionFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@\@Z */ - MCAPI static void tick(class ViewT const>, class Optional>, class EntityModifierT, class FlagComponent, class FlagComponent, class FlagComponent>); + MCAPI static void tick(class ViewT const>, class Optional, class Optional>, class EntityModifierT, class FlagComponent, class FlagComponent, class FlagComponent>); }; diff --git a/LiteLoader/include/llapi/mc/FinalizeMoveSystemImpl.hpp b/LiteLoader/include/llapi/mc/FinalizeMoveSystemImpl.hpp new file mode 100644 index 0000000000..ccb61f54ac --- /dev/null +++ b/LiteLoader/include/llapi/mc/FinalizeMoveSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file FinalizeMoveSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace FinalizeMoveSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tickFinalizeMoveSystem\@FinalizeMoveSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUMoveRequestComponent\@\@AEBUOffsetsComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUAbilitiesComponent\@\@\@\@V?$Optional\@USlideOffsetComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UCollisionFlag\@\@\@\@V?$FlagComponent\@UHorizontalCollisionFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@\@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 EntityModifierT, class FlagComponent, class FlagComponent, class FlagComponent> &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FireBlock.hpp b/LiteLoader/include/llapi/mc/FireBlock.hpp index 93b0497b2c..9d06dad651 100644 --- a/LiteLoader/include/llapi/mc/FireBlock.hpp +++ b/LiteLoader/include/llapi/mc/FireBlock.hpp @@ -36,25 +36,15 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@FireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class FireBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class FireBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class FireBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +121,75 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@FireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@FireBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 88 + * @vftbl 91 * @symbol ?mayPick\@FireBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@FireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,70 +201,80 @@ class FireBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FIREBLOCK /** * @symbol ?canBeSilkTouched\@FireBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FireChargeItem.hpp b/LiteLoader/include/llapi/mc/FireChargeItem.hpp index fe2309456b..5bedf6b7b1 100644 --- a/LiteLoader/include/llapi/mc/FireChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireChargeItem.hpp @@ -52,10 +52,10 @@ class FireChargeItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -127,7 +127,7 @@ class FireChargeItem : public Item { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@FireChargeItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/Fireball.hpp b/LiteLoader/include/llapi/mc/Fireball.hpp index 4280d9e0a3..4b15189b73 100644 --- a/LiteLoader/include/llapi/mc/Fireball.hpp +++ b/LiteLoader/include/llapi/mc/Fireball.hpp @@ -37,162 +37,162 @@ class Fireball : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Fireball\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@Fireball\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 85 + * @vftbl 76 * @symbol ?getBrightness\@Fireball\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Fireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 140 + * @vftbl 128 * @symbol ?getPickRadius\@Fireball\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@Fireball\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@Fireball\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Fireball\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Fireball\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?getInertia\@Fireball\@\@MEAAMXZ */ virtual float getInertia(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getTrailParticle\@Fireball\@\@MEAA?AW4ParticleType\@\@XZ */ virtual enum class ParticleType getTrailParticle(); diff --git a/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp b/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp index 5b2022d6bc..d8b3f58c33 100644 --- a/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp @@ -59,10 +59,10 @@ enum class Shape; */ virtual bool isDyeable() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/FireworksItem.hpp b/LiteLoader/include/llapi/mc/FireworksItem.hpp index 4e3dcb59c8..7b2b9cdfcf 100644 --- a/LiteLoader/include/llapi/mc/FireworksItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworksItem.hpp @@ -52,10 +52,10 @@ class FireworksItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -132,7 +132,7 @@ class FireworksItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@FireworksItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp index cc0c026978..1c7f9d8085 100644 --- a/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp @@ -37,130 +37,130 @@ class FireworksRocketActor : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 46 + * @vftbl 41 * @symbol ?lerpMotion\@FireworksRocketActor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@FireworksRocketActor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@FireworksRocketActor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@FireworksRocketActor\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@FireworksRocketActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@FireworksRocketActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0FireworksRocketActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Fish.hpp b/LiteLoader/include/llapi/mc/Fish.hpp index abdb7f34c9..b494bc4eeb 100644 --- a/LiteLoader/include/llapi/mc/Fish.hpp +++ b/LiteLoader/include/llapi/mc/Fish.hpp @@ -42,135 +42,135 @@ class Fish : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 52 + * @vftbl 47 * @symbol ?startRiding\@Fish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Fish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 323 + * @vftbl 306 * @symbol ?createAIGoals\@Fish\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FISH /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/FishingHook.hpp b/LiteLoader/include/llapi/mc/FishingHook.hpp index d9baa39362..40ba8c9a68 100644 --- a/LiteLoader/include/llapi/mc/FishingHook.hpp +++ b/LiteLoader/include/llapi/mc/FishingHook.hpp @@ -46,130 +46,130 @@ class FishingHook : public Actor { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@FishingHook\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@FishingHook\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 161 + * @vftbl 149 * @symbol ?save\@FishingHook\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@FishingHook\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@FishingHook\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 238 + * @vftbl 225 * @symbol ?shouldDropDeathLoot\@FishingHook\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0FishingHook\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FishingRodItem.hpp b/LiteLoader/include/llapi/mc/FishingRodItem.hpp index 4dd5cbd62c..b0e0ce152e 100644 --- a/LiteLoader/include/llapi/mc/FishingRodItem.hpp +++ b/LiteLoader/include/llapi/mc/FishingRodItem.hpp @@ -52,10 +52,10 @@ class FishingRodItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 49 * @symbol ?isHandEquipped\@FishingRodItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp index 460baef33f..51a6f3e7c6 100644 --- a/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp @@ -32,16 +32,8 @@ class FlagPassengerRemovalSystem { */ MCAPI static struct TickingSystemWithInfo createDeferredSystem(); /** - * @symbol ?tickDeferredPassengerRemoval\@FlagPassengerRemovalSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUVehicleComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@\@\@\@Z + * @symbol ?createImmediateSystem\@FlagPassengerRemovalSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void tickDeferredPassengerRemoval(class StrictEntityContext const &, struct VehicleComponent const &, class ViewT>>, class EntityModifierT); - -//private: - /** - * @symbol ?_tickDeferredRemoval\@FlagPassengerRemovalSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@\@\@\@Z - */ - MCAPI static void _tickDeferredRemoval(class ViewT, class ViewT>>, class EntityModifierT); - -private: + MCAPI static struct TickingSystemWithInfo createImmediateSystem(); }; diff --git a/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystemImpl.hpp b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystemImpl.hpp new file mode 100644 index 0000000000..5f65805496 --- /dev/null +++ b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystemImpl.hpp @@ -0,0 +1,36 @@ +/** + * @file FlagPassengerRemovalSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace FlagPassengerRemovalSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?deferredPassengerRemoval\@FlagPassengerRemovalSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUVehicleComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@\@\@\@Z + */ + MCAPI void deferredPassengerRemoval(class StrictEntityContext const &, struct VehicleComponent const &, class ViewT>, struct Exclude, class FlagComponent>, struct PassengerComponent const, struct ActorUniqueIDComponent const>, class EntityModifierT); + /** + * @symbol ?immediatePassengerRemoval\@FlagPassengerRemovalSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUVehicleComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URemovePassengersComponent\@\@\@\@\@Z + */ + MCAPI void immediatePassengerRemoval(class StrictEntityContext const &, struct VehicleComponent const &, class ViewT, class FlagComponent>>, class ViewT, class FlagComponent>>, class EntityModifierT); + /** + * @symbol ?singleImmediatePassengerRemoval\@FlagPassengerRemovalSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URemovePassengersComponent\@\@\@\@\@Z + */ + MCAPI void singleImmediatePassengerRemoval(class StrictEntityContext const &, struct PassengerComponent const &, class ViewT, class FlagComponent>>, class ViewT, class FlagComponent>>, class EntityModifierT); + /** + * @symbol ?singleTickDeferredPassengerRemoval\@FlagPassengerRemovalSystemImpl\@\@YAXAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@\@\@\@Z + */ + MCAPI void singleTickDeferredPassengerRemoval(class StrictEntityContext const &, class ViewT>, struct Exclude, class FlagComponent>, struct PassengerComponent const, struct ActorUniqueIDComponent const>, class EntityModifierT); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp index 82ddcba780..cb4d782d67 100644 --- a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp +++ b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp @@ -52,10 +52,10 @@ class FlintAndSteelItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -137,7 +137,7 @@ class FlintAndSteelItem : public Item { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@FlintAndSteelItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/FloatComponent.hpp b/LiteLoader/include/llapi/mc/FloatComponent.hpp deleted file mode 100644 index 3f7389845b..0000000000 --- a/LiteLoader/include/llapi/mc/FloatComponent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file FloatComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct FloatComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FLOATCOMPONENT -public: - struct FloatComponent& operator=(struct FloatComponent const &) = delete; - FloatComponent(struct FloatComponent const &) = delete; - FloatComponent() = delete; -#endif - -public: - /** - * @symbol ?getDiff\@FloatComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z - */ - MCAPI static class std::optional getDiff(struct FloatComponent const &, struct FloatComponent const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FloatTag.hpp b/LiteLoader/include/llapi/mc/FloatTag.hpp index f979eb6901..d4e7ee60b8 100644 --- a/LiteLoader/include/llapi/mc/FloatTag.hpp +++ b/LiteLoader/include/llapi/mc/FloatTag.hpp @@ -45,9 +45,9 @@ float val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@FloatTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@FloatTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,10 +79,6 @@ float val; */ virtual unsigned __int64 hash() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FLOATTAG - /** - * @symbol ?write\@FloatTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/FlowerBlock.hpp b/LiteLoader/include/llapi/mc/FlowerBlock.hpp index f62f3837b4..c476fc9053 100644 --- a/LiteLoader/include/llapi/mc/FlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerBlock.hpp @@ -37,29 +37,19 @@ class FlowerBlock : public BushBlock { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@FlowerBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@FlowerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@FlowerBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class FlowerBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class FlowerBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class FlowerBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class FlowerBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,70 +126,80 @@ class FlowerBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@FlowerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@FlowerBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,92 +211,97 @@ class FlowerBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@FlowerBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@FlowerBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@FlowerBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp index 5a27a35b95..8eec9a49b0 100644 --- a/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp @@ -36,20 +36,10 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class FlowerPotBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class FlowerPotBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class FlowerPotBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,75 +116,85 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 54 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 57 * @symbol ?isValidAuxValue\@FlowerPotBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@FlowerPotBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@FlowerPotBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,77 +206,82 @@ class FlowerPotBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 161 + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 159 * @symbol ?onRemove\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@FlowerPotBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp b/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp index 1e8357cd2b..543530a0f5 100644 --- a/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp @@ -60,6 +60,11 @@ class FlowerPotBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -86,17 +91,22 @@ class FlowerPotBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@FlowerPotBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@FlowerPotBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp b/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp index b501510bcb..749897993f 100644 --- a/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp @@ -31,10 +31,6 @@ class FlyTravelSystem { * @symbol ?createFlyTravelSystem\@FlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createFlyTravelSystem(); - /** - * @symbol ?getPlayerFlySpeed\@FlyTravelSystem\@\@SAMAEBVLayeredAbilities\@\@VSynchedActorDataReader\@\@\@Z - */ - MCAPI static float getPlayerFlySpeed(class LayeredAbilities const &, class SynchedActorDataReader); /** * @symbol ?tickFlyTravelSystem\@FlyTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@UMobTravelComponent\@\@\@\@$$CBUAbilitiesComponent\@\@$$CBUSynchedActorDataComponent\@\@UFlySpeedComponent\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp b/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp index 244a730518..adac1041d3 100644 --- a/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp @@ -32,8 +32,8 @@ class FlyTriggerSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickEntity\@FlyTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBUMoveInputComponent\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@AEAUAbilitiesComponent\@\@AEAUFallDistanceComponent\@\@AEAUPlayerInputRequestComponent\@\@AEAUSynchedActorDataComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z + * @symbol ?tickEntity\@FlyTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBUMoveInputComponent\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@AEAUAbilitiesComponent\@\@AEAUFallDistanceComponent\@\@AEAUPlayerInputRequestComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z */ - MCAPI static void tickEntity(class StrictEntityContext const &, struct ActorUniqueIDComponent const &, struct MoveInputComponent const &, class Optional, class Optional, struct AbilitiesComponent &, struct FallDistanceComponent &, struct PlayerInputRequestComponent &, struct SynchedActorDataComponent &, struct VanillaClientGameplayComponent &, class ViewT>, class EntityModifierT); + MCAPI static void tickEntity(class StrictEntityContext const &, struct ActorUniqueIDComponent const &, struct MoveInputComponent const &, class Optional, struct AbilitiesComponent &, struct FallDistanceComponent &, struct PlayerInputRequestComponent &, struct VanillaClientGameplayComponent &, class ViewT>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/FogCommand.hpp b/LiteLoader/include/llapi/mc/FogCommand.hpp index bbc6b5d4a4..59e4ef92be 100644 --- a/LiteLoader/include/llapi/mc/FogCommand.hpp +++ b/LiteLoader/include/llapi/mc/FogCommand.hpp @@ -36,7 +36,7 @@ class FogCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@FogCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/FoodExhaustionSystem.hpp b/LiteLoader/include/llapi/mc/FoodExhaustionSystem.hpp new file mode 100644 index 0000000000..8abf57a14c --- /dev/null +++ b/LiteLoader/include/llapi/mc/FoodExhaustionSystem.hpp @@ -0,0 +1,24 @@ +/** + * @file FoodExhaustionSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace FoodExhaustionSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createSystem\@FoodExhaustionSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FoodExhaustionSystemImpl.hpp b/LiteLoader/include/llapi/mc/FoodExhaustionSystemImpl.hpp new file mode 100644 index 0000000000..1cd422992b --- /dev/null +++ b/LiteLoader/include/llapi/mc/FoodExhaustionSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file FoodExhaustionSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace FoodExhaustionSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doFoodExhaustion\@FoodExhaustionSystemImpl\@\@YAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@AEAUAttributesComponent\@\@AEBVExhaustionComponent\@\@AEBUActorGameTypeComponent\@\@AEBUServerPlayerCurrentMovementComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUGetAttachPositionViews\@\@W4GameType\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI void doFoodExhaustion(class StrictEntityContext const &, class Optional const>, class Optional const>, struct AttributesComponent &, class ExhaustionComponent const &, struct ActorGameTypeComponent const &, struct ServerPlayerCurrentMovementComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, struct GetAttachPositionViews const &, enum class GameType, class IConstBlockSource const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FreezingComponent.hpp b/LiteLoader/include/llapi/mc/FreezingComponent.hpp index 109297fab4..b01e240ee9 100644 --- a/LiteLoader/include/llapi/mc/FreezingComponent.hpp +++ b/LiteLoader/include/llapi/mc/FreezingComponent.hpp @@ -53,10 +53,6 @@ class FreezingComponent { * @symbol ?isFullyUnfrozen\@FreezingComponent\@\@QEBA_NXZ */ MCAPI bool isFullyUnfrozen() const; - /** - * @symbol ??8FreezingComponent\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class FreezingComponent const &) const; /** * @symbol ?readAdditionalSaveData\@FreezingComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp index 5daafdd7ea..42a370b4a1 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp @@ -34,30 +34,20 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@FrogSpawnBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@FrogSpawnBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -69,10 +59,10 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -83,11 +73,6 @@ class FrogSpawnBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -108,6 +93,11 @@ class FrogSpawnBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -118,11 +108,6 @@ class FrogSpawnBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -139,65 +124,70 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 68 + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@FrogSpawnBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@FrogSpawnBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -209,75 +199,85 @@ class FrogSpawnBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ - virtual void __unk_vfn_186(); + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FROGSPAWNBLOCK /** * @symbol ?canBeSilkTouched\@FrogSpawnBlock\@\@UEBA_NXZ @@ -289,4 +289,12 @@ class FrogSpawnBlock : public BlockLegacy { */ MCAPI FrogSpawnBlock(std::string const &, int); +//private: + /** + * @symbol ?_destroyEgg\@FrogSpawnBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + MCAPI static void _destroyEgg(class BlockSource &, class BlockPos const &, class Actor &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp index 998a19c40d..f09f86de94 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp @@ -50,10 +50,10 @@ class FrogSpawnBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -120,7 +120,7 @@ class FrogSpawnBlockItem : public BlockItem { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@FrogSpawnBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp b/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp index 46075903a4..32f639f4d9 100644 --- a/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp +++ b/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp @@ -35,9 +35,5 @@ class FrostWalkSystem { * @symbol ?createSystem\@FrostWalkSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tickSystem\@FrostWalkSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void tickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); }; diff --git a/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp index b5347f71c6..0f66bb5b3c 100644 --- a/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp @@ -36,20 +36,10 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class FrostedIceBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class FrostedIceBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class FrostedIceBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,55 +116,65 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@FrostedIceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@FrostedIceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@FrostedIceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,67 +186,72 @@ class FrostedIceBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@FrostedIceBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/FunctionCommand.hpp b/LiteLoader/include/llapi/mc/FunctionCommand.hpp index 9efb71a859..fad06f789f 100644 --- a/LiteLoader/include/llapi/mc/FunctionCommand.hpp +++ b/LiteLoader/include/llapi/mc/FunctionCommand.hpp @@ -36,7 +36,7 @@ class FunctionCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@FunctionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp index 30096fa87b..dda6d7be91 100644 --- a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp @@ -36,20 +36,10 @@ class FurnaceBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class FurnaceBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class FurnaceBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class FurnaceBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class FurnaceBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class FurnaceBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 102 + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 105 * @symbol ?asItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@FurnaceBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -187,91 +182,96 @@ class FurnaceBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@FurnaceBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@FurnaceBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@FurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GameEventRegistry.hpp b/LiteLoader/include/llapi/mc/GameEventRegistry.hpp index 7f24da1b6e..bdb0136553 100644 --- a/LiteLoader/include/llapi/mc/GameEventRegistry.hpp +++ b/LiteLoader/include/llapi/mc/GameEventRegistry.hpp @@ -255,5 +255,9 @@ namespace GameEventRegistry { * @symbol ?swim\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const swim; + /** + * @symbol ?teleport\@GameEventRegistry\@\@3VGameEvent\@\@B + */ + MCAPI extern class GameEvent const teleport; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GameModeCommand.hpp b/LiteLoader/include/llapi/mc/GameModeCommand.hpp index e07bf28018..58e2e88190 100644 --- a/LiteLoader/include/llapi/mc/GameModeCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameModeCommand.hpp @@ -36,7 +36,7 @@ class GameModeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GameModeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GameModeExt.hpp b/LiteLoader/include/llapi/mc/GameModeExt.hpp index b960434172..11c2c098f3 100644 --- a/LiteLoader/include/llapi/mc/GameModeExt.hpp +++ b/LiteLoader/include/llapi/mc/GameModeExt.hpp @@ -25,9 +25,5 @@ namespace GameModeExt { * @symbol ?createDefaultMessenger\@GameModeExt\@\@YA?AV?$unique_ptr\@UIGameModeMessenger\@\@U?$default_delete\@UIGameModeMessenger\@\@\@std\@\@\@std\@\@AEAVPlayer\@\@\@Z */ MCAPI std::unique_ptr createDefaultMessenger(class Player &); - /** - * @symbol ?createDefaultTimer\@GameModeExt\@\@YA?AV?$unique_ptr\@UIGameModeTimer\@\@U?$default_delete\@UIGameModeTimer\@\@\@std\@\@\@std\@\@AEBVPlayer\@\@\@Z - */ - MCAPI std::unique_ptr createDefaultTimer(class Player const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GameRule.hpp b/LiteLoader/include/llapi/mc/GameRule.hpp index 842fda1b77..e0491b1275 100644 --- a/LiteLoader/include/llapi/mc/GameRule.hpp +++ b/LiteLoader/include/llapi/mc/GameRule.hpp @@ -23,6 +23,10 @@ class GameRule { union Value; class ValidationError { public: + bool mSuccess; + std::string mErrorDescription; + std::vector mErrorParameters; + ValidationError() = delete; ValidationError(ValidationError const&) = delete; ValidationError(ValidationError const&&) = delete; diff --git a/LiteLoader/include/llapi/mc/GameRuleCommand.hpp b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp index 36a27cefae..50abb0de71 100644 --- a/LiteLoader/include/llapi/mc/GameRuleCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp @@ -43,7 +43,7 @@ struct InitProxy { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GameRuleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GameRules.hpp b/LiteLoader/include/llapi/mc/GameRules.hpp index 10f738e14c..bbfc7f5c16 100644 --- a/LiteLoader/include/llapi/mc/GameRules.hpp +++ b/LiteLoader/include/llapi/mc/GameRules.hpp @@ -9,6 +9,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "HashedString.hpp" #undef BEFORE_EXTRA @@ -20,6 +21,50 @@ class GameRules { #define AFTER_EXTRA // Add Member There +public: + std::vector mGameRules; + std::map> mWorldPolicies; + + enum class GameRulesIndex : int + { + INVALID_GAME_RULE = -1, + COMMAND_BLOCK_OUTPUT = 0x0, + DO_DAYLIGHT_CYCLE = 0x1, + DO_ENTITY_DROPS = 0x2, + DO_FIRE_TICK = 0x3, + DO_MOB_LOOT = 0x4, + DO_MOB_SPAWNING = 0x5, + DO_TILE_DROPS = 0x6, + DO_WEATHER_CYCLE = 0x7, + DROWNING_DAMAGE = 0x8, + FALL_DAMAGE = 0x9, + FIRE_DAMAGE = 0xA, + KEEP_INVENTORY = 0xB, + MOB_GRIEFING = 0xC, + PVP = 0xD, + SHOW_COORDINATES = 0xE, + DO_NATURAL_REGENERATION = 0xF, + DO_TNT_EXPLODE = 0x10, + SEND_COMMAND_FEEDBACK = 0x11, + MAX_COMMAND_CHAIN_LENGTH = 0x12, + DO_INSOMNIA = 0x13, + COMMAND_BLOCKS_ENABLED = 0x14, + RANDOM_TICK_SPEED = 0x15, + DO_IMMEDIATE_RESPAWN = 0x16, + SHOW_DEATH_MESSAGES = 0x17, + FUNCTION_COMMAND_LIMIT = 0x18, + PLAYER_SPAWN_RADIUS = 0x19, + SHOW_TAGS = 0x1A, + FREEZE_DAMAGE = 0x1B, + RESPAWN_BLOCKS_EXPLODE = 0x1C, + SHOW_BORDER_EFFECT = 0x1D, + VANILLA_GAME_RULE_COUNT = 0x1E, + GLOBAL_MUTE = 0x1E, + ALLOW_DESTRUCTIVE_OBJECTS = 0x1F, + ALLOW_MOBS = 0x20, + CODE_BUILDER = 0x21, + EDU_GAME_RULE_COUNT = 0x22, + }; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMERULES @@ -76,14 +121,14 @@ class GameRules { * @symbol ?setMarketplaceOverrides\@GameRules\@\@QEAAXXZ */ MCAPI void setMarketplaceOverrides(); - /** - * @symbol ?setRule\@GameRules\@\@QEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@M_NPEA_N2PEAVValidationError\@GameRule\@\@\@Z - */ - MCAPI std::unique_ptr setRule(struct GameRuleId, float, bool, bool *, bool *, class GameRule::ValidationError *); /** * @symbol ?setRule\@GameRules\@\@QEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@_N1PEA_N2PEAVValidationError\@GameRule\@\@\@Z */ MCAPI std::unique_ptr setRule(struct GameRuleId, bool, bool, bool *, bool *, class GameRule::ValidationError *); + /** + * @symbol ?setRule\@GameRules\@\@QEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@M_NPEA_N2PEAVValidationError\@GameRule\@\@\@Z + */ + MCAPI std::unique_ptr setRule(struct GameRuleId, float, bool, bool *, bool *, class GameRule::ValidationError *); /** * @symbol ?setRule\@GameRules\@\@QEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@H_NPEA_N2PEAVValidationError\@GameRule\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp index c9ab6b9b47..e0a24dd3c7 100644 --- a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp @@ -5,10 +5,12 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "GameRulesChangedPacketData.hpp" #undef BEFORE_EXTRA @@ -20,6 +22,8 @@ class GameRulesChangedPacket : public Packet { #define AFTER_EXTRA // Add Member There +public: + GameRulesChangedPacketData mRuleData; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMERULESCHANGEDPACKET @@ -52,8 +56,8 @@ class GameRulesChangedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GameRulesChangedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GameRulesChangedPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp index be2d27371b..31acce8c59 100644 --- a/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp +++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp @@ -8,6 +8,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "GameRule.hpp" #undef BEFORE_EXTRA @@ -19,6 +20,8 @@ class GameRulesChangedPacketData { #define AFTER_EXTRA // Add Member There +public: + std::vector mRules; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMERULESCHANGEDPACKETDATA diff --git a/LiteLoader/include/llapi/mc/GameTestCommand.hpp b/LiteLoader/include/llapi/mc/GameTestCommand.hpp index 50a4faffd8..241ef9d1cf 100644 --- a/LiteLoader/include/llapi/mc/GameTestCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameTestCommand.hpp @@ -37,7 +37,7 @@ class GameTestCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GameTestCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp index 1b8dbe3ff1..8c78a16752 100644 --- a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "gametest.hpp" #include "Packet.hpp" @@ -50,9 +51,9 @@ class GameTestRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GameTestRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GameTestRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0GameTestRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp index 73c4622dc5..1b4d28a72e 100644 --- a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class GameTestResultsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GameTestResultsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GameTestResultsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMETESTRESULTSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/GameVersion.hpp b/LiteLoader/include/llapi/mc/GameVersion.hpp index 783a216282..8f06a4363c 100644 --- a/LiteLoader/include/llapi/mc/GameVersion.hpp +++ b/LiteLoader/include/llapi/mc/GameVersion.hpp @@ -31,14 +31,14 @@ class GameVersion { * @symbol ??0GameVersion\@\@QEAA\@XZ */ MCAPI GameVersion(); - /** - * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z - */ - MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); /** * @symbol ??0GameVersion\@\@QEAA\@AEBV0\@\@Z */ MCAPI GameVersion(class GameVersion const &); + /** + * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z + */ + MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); /** * @symbol ??0GameVersion\@\@QEAA\@AEBVListTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GameplayUserManager.hpp b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp index f54d704e1f..05b0abe7fa 100644 --- a/LiteLoader/include/llapi/mc/GameplayUserManager.hpp +++ b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp @@ -118,6 +118,10 @@ class GameplayUserManager { * @symbol ?registerLevelStorageManagerListener\@GameplayUserManager\@\@QEAAXAEAVLevelStorageManager\@\@\@Z */ MCAPI void registerLevelStorageManagerListener(class LevelStorageManager &); + /** + * @symbol ?shouldStartGameSaveTimer\@GameplayUserManager\@\@QEBA_NXZ + */ + MCAPI bool shouldStartGameSaveTimer() const; /** * @symbol ?shuffleActiveUsers\@GameplayUserManager\@\@QEAAXAEAVRandom\@\@\@Z */ @@ -133,9 +137,9 @@ class GameplayUserManager { //private: /** - * @symbol ?_forActiveEachPlayer\@GameplayUserManager\@\@AEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@_N\@Z + * @symbol ?_forEachActivePlayer\@GameplayUserManager\@\@AEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@_N\@Z */ - MCAPI void _forActiveEachPlayer(class std::function, bool) const; + MCAPI void _forEachActivePlayer(class std::function, bool) const; /** * @symbol ?_getGameplayUserManagerProxy\@GameplayUserManager\@\@AEAAAEAVGameplayUserManagerProxy\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp b/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp index c1cd602c57..ee64fd5fd6 100644 --- a/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp +++ b/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp @@ -21,8 +21,8 @@ namespace GetAttachPosSystem { */ MCAPI struct TickingSystemWithInfo createSystem(); /** - * @symbol ?getAttachPos\@GetAttachPosSystem\@\@YA?AV?$optional\@VVec3\@\@\@std\@\@AEBVStrictEntityContext\@\@W4ActorLocation\@\@AEBVVec3\@\@AEBUAABBShapeComponent\@\@AEBUActorRotationComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@M\@Z + * @symbol ?getAttachPos\@GetAttachPosSystem\@\@YA?AVVec3\@\@W4ActorLocation\@\@AEBV2\@AEBUAABBShapeComponent\@\@AEBUActorRotationComponent\@\@AEBUOffsetsComponent\@\@V?$optional_ref\@$$CBUPassengerRenderingRidingOffsetComponent\@\@\@\@V?$optional_ref\@$$CBUVanillaOffsetComponent\@\@\@\@M\@Z */ - MCAPI class std::optional getAttachPos(class StrictEntityContext const &, enum class ActorLocation, class Vec3 const &, struct AABBShapeComponent const &, struct ActorRotationComponent const &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class ViewT>> const &, float); + MCAPI class Vec3 getAttachPos(enum class ActorLocation, class Vec3 const &, struct AABBShapeComponent const &, struct ActorRotationComponent const &, struct OffsetsComponent const &, class optional_ref, class optional_ref, float); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GetAttachPosSystemImpl.hpp b/LiteLoader/include/llapi/mc/GetAttachPosSystemImpl.hpp new file mode 100644 index 0000000000..d26a49eaeb --- /dev/null +++ b/LiteLoader/include/llapi/mc/GetAttachPosSystemImpl.hpp @@ -0,0 +1,28 @@ +/** + * @file GetAttachPosSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace GetAttachPosSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?getBaseAttachPoint\@GetAttachPosSystemImpl\@\@YA?AVVec3\@\@AEBUAABBShapeComponent\@\@AEBUActorRotationComponent\@\@AEBUOffsetsComponent\@\@MAEBUGetAttachPosRequestData\@\@V?$optional_ref\@$$CBUPassengerRenderingRidingOffsetComponent\@\@\@\@V?$optional_ref\@$$CBUVanillaOffsetComponent\@\@\@\@\@Z + */ + MCAPI class Vec3 getBaseAttachPoint(struct AABBShapeComponent const &, struct ActorRotationComponent const &, struct OffsetsComponent const &, float, struct GetAttachPosRequestData const &, class optional_ref, class optional_ref); + /** + * @symbol ?tickEntity\@GetAttachPosSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBV?$Optional\@$$CBUActorHeadRotationComponent\@\@\@\@AEBUActorRotationComponent\@\@AEBUOffsetsComponent\@\@V?$Optional\@$$CBUPassengerRenderingRidingOffsetComponent\@\@\@\@V?$Optional\@$$CBUVanillaOffsetComponent\@\@\@\@AEAUGetAttachPosRequestComponent\@\@\@Z + */ + MCAPI void tickEntity(class StrictEntityContext const &, struct AABBShapeComponent const &, class Optional const &, struct ActorRotationComponent const &, struct OffsetsComponent const &, class Optional, class Optional, struct GetAttachPosRequestComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GetAttachPositionUtility.hpp b/LiteLoader/include/llapi/mc/GetAttachPositionUtility.hpp index 2c528539df..f596e88a73 100644 --- a/LiteLoader/include/llapi/mc/GetAttachPositionUtility.hpp +++ b/LiteLoader/include/llapi/mc/GetAttachPositionUtility.hpp @@ -11,26 +11,22 @@ #undef BEFORE_EXTRA -class GetAttachPositionUtility { +namespace GetAttachPositionUtility { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GETATTACHPOSITIONUTILITY -public: - class GetAttachPositionUtility& operator=(class GetAttachPositionUtility const &) = delete; - GetAttachPositionUtility(class GetAttachPositionUtility const &) = delete; - GetAttachPositionUtility() = delete; -#endif - -public: /** - * @symbol ?getAttachPos\@GetAttachPositionUtility\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@AEBUGetAttachPositionViews\@\@W4ActorLocation\@\@\@Z + * @symbol ?getAttachPosition\@GetAttachPositionUtility\@\@YA?AV?$optional\@VVec3\@\@\@std\@\@AEBVStrictEntityContext\@\@AEBUGetAttachPositionViews\@\@W4ActorLocation\@\@AEBVVec3\@\@\@Z + */ + MCAPI class std::optional getAttachPosition(class StrictEntityContext const &, struct GetAttachPositionViews const &, enum class ActorLocation, class Vec3 const &); + /** + * @symbol ?getNonPassengerAttachPos\@GetAttachPositionUtility\@\@YA?AVVec3\@\@AEBUStateVectorComponent\@\@V?$optional_ref\@$$CBUActorHeadRotationComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUActorRotationComponent\@\@AEBUOffsetsComponent\@\@V?$optional_ref\@$$CBUVanillaOffsetComponent\@\@\@\@W4ActorLocation\@\@M\@Z */ - MCAPI static class Vec3 getAttachPos(class StrictEntityContext const &, struct GetAttachPositionViews const &, enum class ActorLocation); + MCAPI class Vec3 getNonPassengerAttachPos(struct StateVectorComponent const &, class optional_ref, struct AABBShapeComponent const &, struct ActorRotationComponent const &, struct OffsetsComponent const &, class optional_ref, enum class ActorLocation, float); /** - * @symbol ?getAttachPos\@GetAttachPositionUtility\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBVStrictEntityContext\@\@AEBUGetAttachPositionViews\@\@W4ActorLocation\@\@AEBVVec3\@\@\@Z + * @symbol ?getPassengerAttachPos\@GetAttachPositionUtility\@\@YA?AVVec3\@\@AEBVStrictEntityContext\@\@AEBUGetAttachPositionViews\@\@W4ActorLocation\@\@M\@Z */ - MCAPI static class std::optional getAttachPos(class StrictEntityContext const &, struct GetAttachPositionViews const &, enum class ActorLocation, class Vec3 const &); + MCAPI class Vec3 getPassengerAttachPos(class StrictEntityContext const &, struct GetAttachPositionViews const &, enum class ActorLocation, float); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GetAttachPositionViews.hpp b/LiteLoader/include/llapi/mc/GetAttachPositionViews.hpp new file mode 100644 index 0000000000..122f7c346c --- /dev/null +++ b/LiteLoader/include/llapi/mc/GetAttachPositionViews.hpp @@ -0,0 +1,35 @@ +/** + * @file GetAttachPositionViews.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct GetAttachPositionViews { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GETATTACHPOSITIONVIEWS +public: + struct GetAttachPositionViews& operator=(struct GetAttachPositionViews const &) = delete; + GetAttachPositionViews() = delete; +#endif + +public: + /** + * @symbol ??0GetAttachPositionViews\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI GetAttachPositionViews(struct GetAttachPositionViews const &); + /** + * @symbol ??0GetAttachPositionViews\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI GetAttachPositionViews(struct GetAttachPositionViews &&); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp index 9f7d63e5db..b919d3ea5f 100644 --- a/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp @@ -36,7 +36,7 @@ class GetChunkDataCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GetChunkDataCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GetChunksCommand.hpp b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp index 451e4ace54..82e5bad749 100644 --- a/LiteLoader/include/llapi/mc/GetChunksCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp @@ -36,7 +36,7 @@ class GetChunksCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GetChunksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp index e8d181c83e..94e8bb7d9e 100644 --- a/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp @@ -36,7 +36,7 @@ class GetEduServerInfoCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GetEduServerInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp b/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp index d5c23bfb2b..31e06ac084 100644 --- a/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp @@ -32,12 +32,8 @@ class GetInterpolatedRidingPositionSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?getInterpolatedRidingPosition\@GetInterpolatedRidingPositionSystem\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCamelFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z + * @symbol ?getInterpolatedRidingPosition\@GetInterpolatedRidingPositionSystem\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCamelFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z */ - MCAPI static class Vec3 getInterpolatedRidingPosition(class StrictEntityContext const &, class ViewT, class ViewT, class ViewT>>, class ViewT>, class ViewT>, struct SynchedActorDataComponent const>, class ViewT>, struct StandAnimationComponent const>, class ViewT>, struct MobBodyRotationComponent const>, float); - /** - * @symbol ?processView\@GetInterpolatedRidingPositionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UGetAttachPosRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCamelFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@\@Z - */ - MCAPI static void processView(class ViewT, class ViewT, class ViewT, class ViewT>>, class ViewT>, class ViewT>, struct SynchedActorDataComponent const>, class ViewT>, struct StandAnimationComponent const>, class ViewT>, struct MobBodyRotationComponent const>); + MCAPI static class Vec3 getInterpolatedRidingPosition(class StrictEntityContext const &, class ViewT const &, class ViewT const &, class ViewT>> const &, class ViewT> const &, class ViewT>, struct SynchedActorDataComponent const> const &, class ViewT>, struct StandAnimationComponent const> const &, class ViewT>, struct MobBodyRotationComponent const> const &, float); }; diff --git a/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp index a66480c782..9ca2108cd5 100644 --- a/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp @@ -36,7 +36,7 @@ class GetSpawnPointCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GetSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp index c2ed0b52cf..cba3333816 100644 --- a/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp @@ -36,7 +36,7 @@ class GetTopSolidBlockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GetTopSolidBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Ghast.hpp b/LiteLoader/include/llapi/mc/Ghast.hpp index 986ba88203..810b421905 100644 --- a/LiteLoader/include/llapi/mc/Ghast.hpp +++ b/LiteLoader/include/llapi/mc/Ghast.hpp @@ -42,137 +42,137 @@ class Ghast : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Ghast\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Ghast\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Ghast\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@Ghast\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/GildedBlackstoneBlock.hpp b/LiteLoader/include/llapi/mc/GildedBlackstoneBlock.hpp index 10916bb2d3..d7dadb1911 100644 --- a/LiteLoader/include/llapi/mc/GildedBlackstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/GildedBlackstoneBlock.hpp @@ -31,20 +31,10 @@ class GildedBlackstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class GildedBlackstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class GildedBlackstoneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class GildedBlackstoneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class GildedBlackstoneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,40 +111,50 @@ class GildedBlackstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -171,62 +166,67 @@ class GildedBlackstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@GildedBlackstoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@GildedBlackstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GiveCommand.hpp b/LiteLoader/include/llapi/mc/GiveCommand.hpp index 361278b65c..873156df5c 100644 --- a/LiteLoader/include/llapi/mc/GiveCommand.hpp +++ b/LiteLoader/include/llapi/mc/GiveCommand.hpp @@ -36,7 +36,7 @@ class GiveCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GiveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GlassBlock.hpp b/LiteLoader/include/llapi/mc/GlassBlock.hpp index ea9bf19806..d3429a2539 100644 --- a/LiteLoader/include/llapi/mc/GlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlassBlock.hpp @@ -36,25 +36,15 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@GlassBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class GlassBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class GlassBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class GlassBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,50 +121,60 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 65 + * @vftbl 68 * @symbol ?canBeUsedInCommands\@GlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@GlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,57 +186,62 @@ class GlassBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 189 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 186 * @symbol ?getResourceCount\@GlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp index 611e958bfe..3d06038477 100644 --- a/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp @@ -36,20 +36,10 @@ class GlazedTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class GlazedTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class GlazedTerracottaBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class GlazedTerracottaBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class GlazedTerracottaBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class GlazedTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@GlazedTerracottaBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@GlazedTerracottaBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,55 +181,60 @@ class GlazedTerracottaBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0GlazedTerracottaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp index ccc31ffd2d..011994c045 100644 --- a/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp +++ b/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp @@ -36,17 +36,9 @@ class GlidingMoveFinalizeSystem { * @symbol ?createCollisionDamageCalculateSystem\@GlidingMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createCollisionDamageCalculateSystem(); - /** - * @symbol ?createCollisionDamageCalculateSystemSideBySide\@GlidingMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createCollisionDamageCalculateSystemSideBySide(); /** * @symbol ?createCollisionDamageHurtSystem\@GlidingMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createCollisionDamageHurtSystem(); - /** - * @symbol ?tickCollisionDamageHurt\@GlidingMoveFinalizeSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@VActorOwnerComponent\@\@$$CBUGlidingCollisionDamageComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UGlidingCollisionDamageComponent\@\@\@\@\@Z - */ - MCAPI static void tickCollisionDamageHurt(class ViewT>, class ActorOwnerComponent, struct GlidingCollisionDamageComponent const>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp index cb27ec8d68..ad90313f12 100644 --- a/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp +++ b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp @@ -36,7 +36,7 @@ class GlobalPauseCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@GlobalPauseCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp index 07c4857220..e1e43c309b 100644 --- a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp @@ -36,20 +36,10 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class GlowItemFrameBlock : public ItemFrameBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class GlowItemFrameBlock : public ItemFrameBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class GlowItemFrameBlock : public ItemFrameBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,57 +171,62 @@ class GlowItemFrameBlock : public ItemFrameBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getSpawnedItemName\@GlowItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ */ virtual class HashedString getSpawnedItemName() const; diff --git a/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp b/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp index 4897fd32c6..b1f2752067 100644 --- a/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp @@ -45,6 +45,11 @@ class GlowItemFrameBlockActor : public ItemFrameBlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +76,15 @@ class GlowItemFrameBlockActor : public ItemFrameBlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0GlowItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp index d45ac3c08f..1ff8a51388 100644 --- a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp @@ -36,20 +36,10 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class GlowLichenBlock : public MultifaceBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class GlowLichenBlock : public MultifaceBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class GlowLichenBlock : public MultifaceBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 85 + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 88 * @symbol ?onFertilized\@GlowLichenBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@GlowLichenBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,77 +181,82 @@ class GlowLichenBlock : public MultifaceBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 151 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 149 * @symbol ?init\@GlowLichenBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@GlowLichenBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@GlowLichenBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getMultifaceSpreader\@GlowLichenBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const; diff --git a/LiteLoader/include/llapi/mc/GlowSquid.hpp b/LiteLoader/include/llapi/mc/GlowSquid.hpp index af05fee2e2..2e5576428e 100644 --- a/LiteLoader/include/llapi/mc/GlowSquid.hpp +++ b/LiteLoader/include/llapi/mc/GlowSquid.hpp @@ -37,142 +37,142 @@ class GlowSquid : public Squid { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@GlowSquid\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@GlowSquid\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@GlowSquid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@GlowSquid\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?_getInkSquirtSoundEvent\@GlowSquid\@\@MEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent _getInkSquirtSoundEvent() const; diff --git a/LiteLoader/include/llapi/mc/GlowStickItem.hpp b/LiteLoader/include/llapi/mc/GlowStickItem.hpp index d07e02b443..da92886508 100644 --- a/LiteLoader/include/llapi/mc/GlowStickItem.hpp +++ b/LiteLoader/include/llapi/mc/GlowStickItem.hpp @@ -52,10 +52,10 @@ class GlowStickItem : public ChemistryStickItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/GlowstoneBlock.hpp b/LiteLoader/include/llapi/mc/GlowstoneBlock.hpp index 98bbb1739e..71f3b44125 100644 --- a/LiteLoader/include/llapi/mc/GlowstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowstoneBlock.hpp @@ -31,20 +31,10 @@ class GlowstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class GlowstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class GlowstoneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class GlowstoneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class GlowstoneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,45 +111,55 @@ class GlowstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 70 - * @symbol ?dispense\@GlowstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 73 + * @symbol ?dispense\@GlowstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + */ + virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + /** + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,62 +171,67 @@ class GlowstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@GlowstoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@GlowstoneBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/GoHomeGoal.hpp b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp index c832001399..adc7aa3baa 100644 --- a/LiteLoader/include/llapi/mc/GoHomeGoal.hpp +++ b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp @@ -83,6 +83,10 @@ class GoHomeGoal { * @symbol ?_getHomePos\@GoHomeGoal\@\@AEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos _getHomePos() const; + /** + * @symbol ?_hasRequiredComponents\@GoHomeGoal\@\@AEBA_NXZ + */ + MCAPI bool _hasRequiredComponents() const; /** * @symbol ?_triggerOnFailedEvents\@GoHomeGoal\@\@AEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/Goat.hpp b/LiteLoader/include/llapi/mc/Goat.hpp index 1b4a0bd1ef..30b4e44646 100644 --- a/LiteLoader/include/llapi/mc/Goat.hpp +++ b/LiteLoader/include/llapi/mc/Goat.hpp @@ -42,155 +42,155 @@ class Goat : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@Goat\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Goat\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Goat\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Goat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Goat\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 271 + * @vftbl 257 * @symbol ?getHurtSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getHurtSound(); /** - * @vftbl 272 + * @vftbl 258 * @symbol ?getDeathSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getDeathSound(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Goat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/GoatHornItem.hpp b/LiteLoader/include/llapi/mc/GoatHornItem.hpp index d8863adee6..553b82f547 100644 --- a/LiteLoader/include/llapi/mc/GoatHornItem.hpp +++ b/LiteLoader/include/llapi/mc/GoatHornItem.hpp @@ -52,10 +52,10 @@ class GoatHornItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/GrassBlock.hpp b/LiteLoader/include/llapi/mc/GrassBlock.hpp index fa3d72d78f..f830532213 100644 --- a/LiteLoader/include/llapi/mc/GrassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassBlock.hpp @@ -36,20 +36,10 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class GrassBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class GrassBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class GrassBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,66 +115,76 @@ class GrassBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@GrassBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 94 + * @vftbl 97 * @symbol ?tryToTill\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 106 + * @vftbl 109 * @symbol ?calcVariant\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z */ virtual int calcVariant(class BlockSource &, class BlockPos const &, class mce::Color const &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,82 +196,87 @@ class GrassBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 134 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 135 * @symbol ?getColor\@GrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@GrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@GrassBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@GrassBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@GrassBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/GravelBlock.hpp b/LiteLoader/include/llapi/mc/GravelBlock.hpp index 4b3cacfc44..7ca33d5218 100644 --- a/LiteLoader/include/llapi/mc/GravelBlock.hpp +++ b/LiteLoader/include/llapi/mc/GravelBlock.hpp @@ -36,20 +36,10 @@ class GravelBlock : public FallingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class GravelBlock : public FallingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class GravelBlock : public FallingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class GravelBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class GravelBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,61 +115,71 @@ class GravelBlock : public FallingBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@GravelBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,75 +191,80 @@ class GravelBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@GravelBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@GravelBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** * @symbol ??0GravelBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp index 6a27d9071e..d62de203ac 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp @@ -36,30 +36,25 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@GrindstoneBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@GrindstoneBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +66,10 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +80,6 @@ class GrindstoneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class GrindstoneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class GrindstoneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,55 +131,65 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 61 + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@GrindstoneBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@GrindstoneBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,77 +201,77 @@ class GrindstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@GrindstoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@GrindstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@GrindstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/GroundAndAirMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/GroundAndAirMoveFinalizeSystem.hpp index bf185a5e50..cbe2f84ec5 100644 --- a/LiteLoader/include/llapi/mc/GroundAndAirMoveFinalizeSystem.hpp +++ b/LiteLoader/include/llapi/mc/GroundAndAirMoveFinalizeSystem.hpp @@ -24,18 +24,10 @@ class GroundAndAirMoveFinalizeSystem { #endif public: - /** - * @symbol ?createAirMoveFinalizeSideBySideSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createAirMoveFinalizeSideBySideSystem(); /** * @symbol ?createAirMoveFinalizeSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAirMoveFinalizeSystem(); - /** - * @symbol ?createGroundMoveFinalizeSideBySideSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createGroundMoveFinalizeSideBySideSystem(); /** * @symbol ?createGroundMoveFinalizeSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GroundAndAirMoveSystem.hpp b/LiteLoader/include/llapi/mc/GroundAndAirMoveSystem.hpp index 4b7c254545..0646a4ef7d 100644 --- a/LiteLoader/include/llapi/mc/GroundAndAirMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/GroundAndAirMoveSystem.hpp @@ -24,18 +24,10 @@ class GroundAndAirMoveSystem { #endif public: - /** - * @symbol ?createAirMoveSideBySideSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createAirMoveSideBySideSystem(); /** * @symbol ?createAirMoveSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAirMoveSystem(); - /** - * @symbol ?createGroundMoveSideBySideSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createGroundMoveSideBySideSystem(); /** * @symbol ?createGroundMoveSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp b/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp index faaf7211ef..991e976d6a 100644 --- a/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp +++ b/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp @@ -32,10 +32,6 @@ class GroundTravelTypeSystem { * @symbol ?create\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI static struct TickingSystemWithInfo create(class BaseGameVersion const &); - /** - * @symbol ?createSideBySide\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@AEBVBaseGameVersion\@\@\@Z - */ - MCAPI static struct TickingSystemWithInfo createSideBySide(class BaseGameVersion const &); //private: diff --git a/LiteLoader/include/llapi/mc/Guardian.hpp b/LiteLoader/include/llapi/mc/Guardian.hpp index d130263888..e7c983f0a6 100644 --- a/LiteLoader/include/llapi/mc/Guardian.hpp +++ b/LiteLoader/include/llapi/mc/Guardian.hpp @@ -47,157 +47,157 @@ class Guardian : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 112 + * @vftbl 101 * @symbol ?setTarget\@Guardian\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Guardian\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Guardian\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Guardian\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Guardian\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Guardian\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 294 + * @vftbl 277 * @symbol ?getMaxHeadXRot\@Guardian\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@Guardian\@\@MEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp index 8753699b17..a3037088ee 100644 --- a/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp @@ -37,10 +37,6 @@ class GuardianPreAIStepSystem { * @symbol ?_doGuardianPreAIStepSystem\@GuardianPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doGuardianPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - /** - * @symbol ?_tickGuardianPreAIStepSystem\@GuardianPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UGuardianFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickGuardianPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp index 120a6f0e4c..cd5ad61ba0 100644 --- a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class GuiDataPickItemPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@GuiDataPickItemPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@GuiDataPickItemPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GUIDATAPICKITEMPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~GuiDataPickItemPacket(); #endif - /** - * @symbol ??0GuiDataPickItemPacket\@\@QEAA\@XZ - */ - MCAPI GuiDataPickItemPacket(); /** * @symbol ??0GuiDataPickItemPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBH\@Z */ MCAPI GuiDataPickItemPacket(std::string const &, std::string const &, int const &); + /** + * @symbol ??0GuiDataPickItemPacket\@\@QEAA\@XZ + */ + MCAPI GuiDataPickItemPacket(); }; diff --git a/LiteLoader/include/llapi/mc/HangingActor.hpp b/LiteLoader/include/llapi/mc/HangingActor.hpp index 25301f4517..f1974af549 100644 --- a/LiteLoader/include/llapi/mc/HangingActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingActor.hpp @@ -46,177 +46,172 @@ class HangingActor : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 27 - * @symbol ?move\@HangingActor\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void move(class Vec3 const &); + virtual void __unk_vfn_35(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 - */ - virtual void __unk_vfn_40(); - /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@HangingActor\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 85 + * @vftbl 76 * @symbol ?getBrightness\@HangingActor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@HangingActor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@HangingActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 225 + * @vftbl 212 * @symbol ?setSize\@HangingActor\@\@UEAAXMM\@Z */ virtual void setSize(float, float); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@HangingActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@HangingActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@HangingActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?setDir\@HangingActor\@\@UEAAXH\@Z */ virtual void setDir(int); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getWidth() const = 0; /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getHeight() const = 0; /** - * @vftbl 271 + * @vftbl 257 * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ */ virtual void dropItem() = 0; /** - * @vftbl 272 + * @vftbl 258 * @symbol ?placeHangingEntity\@HangingActor\@\@UEAA_NAEAVBlockSource\@\@H\@Z */ virtual bool placeHangingEntity(class BlockSource &, int); /** - * @vftbl 273 + * @vftbl 259 * @symbol ?wouldSurvive\@HangingActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool wouldSurvive(class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/HangingActorItem.hpp b/LiteLoader/include/llapi/mc/HangingActorItem.hpp index 8a6ef8d39f..c648d2978f 100644 --- a/LiteLoader/include/llapi/mc/HangingActorItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingActorItem.hpp @@ -52,10 +52,10 @@ class HangingActorItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,7 @@ class HangingActorItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@HangingActorItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/HangingActorMoveSystem.hpp b/LiteLoader/include/llapi/mc/HangingActorMoveSystem.hpp new file mode 100644 index 0000000000..881b8ec1a7 --- /dev/null +++ b/LiteLoader/include/llapi/mc/HangingActorMoveSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file HangingActorMoveSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class HangingActorMoveSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HANGINGACTORMOVESYSTEM +public: + class HangingActorMoveSystem& operator=(class HangingActorMoveSystem const &) = delete; + HangingActorMoveSystem(class HangingActorMoveSystem const &) = delete; + HangingActorMoveSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystems\@HangingActorMoveSystem\@\@SA?AV?$vector\@UTickingSystemWithInfo\@\@V?$allocator\@UTickingSystemWithInfo\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI static std::vector createSystems(); + +}; diff --git a/LiteLoader/include/llapi/mc/HangingActorMoveSystemImpl.hpp b/LiteLoader/include/llapi/mc/HangingActorMoveSystemImpl.hpp new file mode 100644 index 0000000000..ebc0d1dd08 --- /dev/null +++ b/LiteLoader/include/llapi/mc/HangingActorMoveSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file HangingActorMoveSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace HangingActorMoveSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doActorMoveSystem\@HangingActorMoveSystemImpl\@\@YAXAEAVActorOwnerComponent\@\@AEAUMoveRequestComponent\@\@\@Z + */ + MCAPI void doActorMoveSystem(class ActorOwnerComponent &, struct MoveRequestComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HangingRootsBlock.hpp b/LiteLoader/include/llapi/mc/HangingRootsBlock.hpp index a8fbde1160..a66700caf4 100644 --- a/LiteLoader/include/llapi/mc/HangingRootsBlock.hpp +++ b/LiteLoader/include/llapi/mc/HangingRootsBlock.hpp @@ -32,29 +32,19 @@ class HangingRootsBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@HangingRootsBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@HangingRootsBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@HangingRootsBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class HangingRootsBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class HangingRootsBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class HangingRootsBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class HangingRootsBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,55 +121,65 @@ class HangingRootsBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@HangingRootsBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@HangingRootsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@HangingRootsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,72 +191,77 @@ class HangingRootsBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@HangingRootsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@HangingRootsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@HangingRootsBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@HangingRootsBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp index 7f2ec9eff4..c94173eb70 100644 --- a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp @@ -34,35 +34,30 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@HangingSignBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@HangingSignBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@HangingSignBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -74,10 +69,10 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -88,11 +83,6 @@ class HangingSignBlock : public SignBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -113,6 +103,11 @@ class HangingSignBlock : public SignBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -123,11 +118,6 @@ class HangingSignBlock : public SignBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -144,50 +134,60 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 68 + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@HangingSignBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -199,77 +199,77 @@ class HangingSignBlock : public SignBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getYRotationInDegrees\@HangingSignBlock\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getYRotationInDegrees(class Block const &) const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?_getItemInstance\@HangingSignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 198 + * @vftbl 196 * @symbol ?_getShape\@HangingSignBlock\@\@MEBAXHAEAVAABB\@\@\@Z */ virtual void _getShape(int, class AABB &) const; diff --git a/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp b/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp index c01c54c8fb..ce574c22cc 100644 --- a/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp @@ -48,6 +48,11 @@ class HangingSignBlockActor : public SignBlockActor { * @symbol ?getShadowRadius\@HangingSignBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -74,10 +79,15 @@ class HangingSignBlockActor : public SignBlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0HangingSignBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HangingSignItem.hpp b/LiteLoader/include/llapi/mc/HangingSignItem.hpp index d8828f8126..c343c44001 100644 --- a/LiteLoader/include/llapi/mc/HangingSignItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignItem.hpp @@ -51,10 +51,10 @@ class HangingSignItem : public SignItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -116,7 +116,7 @@ class HangingSignItem : public SignItem { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getBlockToPlace\@HangingSignItem\@\@MEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z */ virtual class Block const * getBlockToPlace(unsigned char, class Actor const &, class BlockPos) const; diff --git a/LiteLoader/include/llapi/mc/HatchetItem.hpp b/LiteLoader/include/llapi/mc/HatchetItem.hpp index af17bd9e71..b5e776cb82 100644 --- a/LiteLoader/include/llapi/mc/HatchetItem.hpp +++ b/LiteLoader/include/llapi/mc/HatchetItem.hpp @@ -58,10 +58,10 @@ class HatchetItem : public DiggerItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/HayBlock.hpp b/LiteLoader/include/llapi/mc/HayBlock.hpp index 25921e2372..d286f7f4e1 100644 --- a/LiteLoader/include/llapi/mc/HayBlock.hpp +++ b/LiteLoader/include/llapi/mc/HayBlock.hpp @@ -31,20 +31,10 @@ class HayBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class HayBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class HayBlock : public RotatedPillarBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class HayBlock : public RotatedPillarBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class HayBlock : public RotatedPillarBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,45 +111,55 @@ class HayBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@HayBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@HayBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,65 +171,70 @@ class HayBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@HayBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@HayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0HayBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/HellFireFeature.hpp b/LiteLoader/include/llapi/mc/HellFireFeature.hpp deleted file mode 100644 index 529ac73e48..0000000000 --- a/LiteLoader/include/llapi/mc/HellFireFeature.hpp +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @file HellFireFeature.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Feature.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class HellFireFeature. - * - */ -class HellFireFeature : public Feature { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HELLFIREFEATURE -public: - class HellFireFeature& operator=(class HellFireFeature const &) = delete; - HellFireFeature(class HellFireFeature const &) = delete; - HellFireFeature() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 3 - * @symbol ?place\@HellFireFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HELLFIREFEATURE - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~HellFireFeature(); -#endif - -}; diff --git a/LiteLoader/include/llapi/mc/HellSpringFeature.hpp b/LiteLoader/include/llapi/mc/HellSpringFeature.hpp deleted file mode 100644 index f036e05521..0000000000 --- a/LiteLoader/include/llapi/mc/HellSpringFeature.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @file HellSpringFeature.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Feature.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class HellSpringFeature. - * - */ -class HellSpringFeature : public Feature { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HELLSPRINGFEATURE -public: - class HellSpringFeature& operator=(class HellSpringFeature const &) = delete; - HellSpringFeature(class HellSpringFeature const &) = delete; - HellSpringFeature() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 3 - * @symbol ?place\@HellSpringFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z - */ - virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HELLSPRINGFEATURE - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~HellSpringFeature(); -#endif - /** - * @symbol ??0HellSpringFeature\@\@QEAA\@AEBVBlock\@\@_N\@Z - */ - MCAPI HellSpringFeature(class Block const &, bool); - -}; diff --git a/LiteLoader/include/llapi/mc/HelpCommand.hpp b/LiteLoader/include/llapi/mc/HelpCommand.hpp index 367e2749d6..b17ed24163 100644 --- a/LiteLoader/include/llapi/mc/HelpCommand.hpp +++ b/LiteLoader/include/llapi/mc/HelpCommand.hpp @@ -36,7 +36,7 @@ class HelpCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@HelpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/HideGoal.hpp b/LiteLoader/include/llapi/mc/HideGoal.hpp index 6330646cb5..36b138ebd5 100644 --- a/LiteLoader/include/llapi/mc/HideGoal.hpp +++ b/LiteLoader/include/llapi/mc/HideGoal.hpp @@ -90,12 +90,4 @@ class HideGoal : public MoveToPOIGoal { */ MCAPI HideGoal(class Mob &, float, float, float, enum class POIType); -//private: - /** - * @symbol ?_sendSoundTheAlarmAchievement\@HideGoal\@\@AEBAXXZ - */ - MCAPI void _sendSoundTheAlarmAchievement() const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/HitResult.hpp b/LiteLoader/include/llapi/mc/HitResult.hpp index c136f08f59..a5e4bfd422 100644 --- a/LiteLoader/include/llapi/mc/HitResult.hpp +++ b/LiteLoader/include/llapi/mc/HitResult.hpp @@ -67,6 +67,10 @@ class HitResult { * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@\@Z */ MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &); + /** + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z + */ + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, class Vec3 const &); /** * @symbol ??0HitResult\@\@QEAA\@AEBV0\@\@Z */ @@ -80,17 +84,13 @@ class HitResult { */ MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &); /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEBVBlockPos\@\@E0\@Z */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, class Vec3 const &); + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class BlockPos const &, unsigned char, class Vec3 const &); /** * @symbol ??0HitResult\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI HitResult(class HitResult &&); - /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEBVBlockPos\@\@E0\@Z - */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class BlockPos const &, unsigned char, class Vec3 const &); /** * @symbol ?distanceTo\@HitResult\@\@QEBAMAEBVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HitboxComponent.hpp b/LiteLoader/include/llapi/mc/HitboxComponent.hpp index 0933839e95..e532cd92fc 100644 --- a/LiteLoader/include/llapi/mc/HitboxComponent.hpp +++ b/LiteLoader/include/llapi/mc/HitboxComponent.hpp @@ -24,14 +24,11 @@ class HitboxComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_HITBOXCOMPONENT public: class HitboxComponent& operator=(class HitboxComponent const &) = delete; + HitboxComponent(class HitboxComponent const &) = delete; HitboxComponent() = delete; #endif public: - /** - * @symbol ??0HitboxComponent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI HitboxComponent(class HitboxComponent const &); /** * @symbol ?addAdditionalSaveData\@HitboxComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ @@ -48,9 +45,5 @@ class HitboxComponent { * @symbol ?toCompoundTag\@HitboxComponent\@\@QEAAXAEAVCompoundTag\@\@\@Z */ MCAPI void toCompoundTag(class CompoundTag &); - /** - * @symbol ??1HitboxComponent\@\@QEAA\@XZ - */ - MCAPI ~HitboxComponent(); }; diff --git a/LiteLoader/include/llapi/mc/HoeItem.hpp b/LiteLoader/include/llapi/mc/HoeItem.hpp index 5fc455a81d..1f37b45337 100644 --- a/LiteLoader/include/llapi/mc/HoeItem.hpp +++ b/LiteLoader/include/llapi/mc/HoeItem.hpp @@ -58,10 +58,10 @@ class HoeItem : public DiggerItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/HoneyBlock.hpp b/LiteLoader/include/llapi/mc/HoneyBlock.hpp index 2ace44d1ee..ee41241807 100644 --- a/LiteLoader/include/llapi/mc/HoneyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneyBlock.hpp @@ -36,25 +36,20 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@HoneyBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@HoneyBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class HoneyBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class HoneyBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class HoneyBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +126,50 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 112 - * @symbol ?entityInside\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,75 +181,75 @@ class HoneyBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@HoneyBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onStandOn\@HoneyBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 181 + * @vftbl 178 * @symbol ?getExtraRenderLayers\@HoneyBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0HoneyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HoneycombBlock.hpp b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp index 371394fccd..b532a9d7ec 100644 --- a/LiteLoader/include/llapi/mc/HoneycombBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp @@ -36,20 +36,10 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class HoneycombBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class HoneycombBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class HoneycombBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class HoneycombBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0HoneycombBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/HopperBlock.hpp b/LiteLoader/include/llapi/mc/HopperBlock.hpp index c1cb0e3128..be375c4918 100644 --- a/LiteLoader/include/llapi/mc/HopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/HopperBlock.hpp @@ -36,35 +36,30 @@ class HopperBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@HopperBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?clip\@HopperBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@HopperBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 9 + * @symbol ?addAABBs\@HopperBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ - virtual void __unk_vfn_19(); + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@HopperBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@HopperBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +71,10 @@ class HopperBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +85,6 @@ class HopperBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class HopperBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class HopperBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,70 +136,80 @@ class HopperBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 79 + * @vftbl 82 * @symbol ?getRedstoneProperty\@HopperBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@HopperBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@HopperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@HopperBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -222,81 +222,81 @@ class HopperBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@HopperBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 - */ - virtual void __unk_vfn_169(); - /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 174 - * @symbol ?clip\@HopperBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@HopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@HopperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Horse.hpp b/LiteLoader/include/llapi/mc/Horse.hpp index 51455121f6..d4a101ee92 100644 --- a/LiteLoader/include/llapi/mc/Horse.hpp +++ b/LiteLoader/include/llapi/mc/Horse.hpp @@ -42,262 +42,252 @@ class Horse : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 35 + * @vftbl 32 * @symbol ?getInterpolatedRidingOffset\@Horse\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 - */ - virtual void __unk_vfn_40(); - /** - * @vftbl 51 - * @symbol ?positionPassenger\@Horse\@\@UEAAXAEAVActor\@\@M\@Z + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void positionPassenger(class Actor &, float); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Horse\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 90 + * @vftbl 79 * @symbol ?isImmobile\@Horse\@\@MEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 120 + * @vftbl 109 * @symbol ?onFailedTame\@Horse\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 124 + * @vftbl 113 * @symbol ?setStanding\@Horse\@\@UEAAX_N\@Z */ virtual void setStanding(bool); /** - * @vftbl 138 + * @vftbl 126 * @symbol ?feed\@Horse\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Horse\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 169 + * @vftbl 157 * @symbol ?canFreeze\@Horse\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 178 + * @vftbl 166 * @symbol ?getControllingPlayer\@Horse\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@Horse\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 181 + * @vftbl 169 * @symbol ?handleFallDistanceOnServer\@Horse\@\@MEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Horse\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 212 + * @vftbl 199 * @symbol ?openContainerComponent\@Horse\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void openContainerComponent(class Player &); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@Horse\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Horse\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Horse\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Horse\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 - */ - virtual void __unk_vfn_267(); - /** - * @vftbl 278 - * @symbol ?travel\@Horse\@\@UEAAXMMM_N\@Z + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void travel(float, float, float, bool); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@Horse\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?setType\@Horse\@\@UEAAXH\@Z */ virtual void setType(int); /** - * @vftbl 346 + * @vftbl 326 * @symbol ?getType\@Horse\@\@UEBAHXZ */ virtual int getType() const; /** - * @vftbl 347 + * @vftbl 327 * @symbol ?setHorseEating\@Horse\@\@UEAAX_N\@Z */ virtual void setHorseEating(bool); /** - * @vftbl 348 + * @vftbl 328 * @symbol ?getStandAnim\@Horse\@\@UEBAMM\@Z */ virtual float getStandAnim(float) const; /** - * @vftbl 349 + * @vftbl 329 * @symbol ?isAdult\@Horse\@\@UEBA_NXZ */ virtual bool isAdult() const; /** - * @vftbl 350 + * @vftbl 330 * @symbol ?isHorseEating\@Horse\@\@UEBA_NXZ */ virtual bool isHorseEating() const; /** - * @vftbl 351 + * @vftbl 331 * @symbol ?isMouthOpen\@Horse\@\@UEBA_NXZ */ virtual bool isMouthOpen() const; /** - * @vftbl 352 + * @vftbl 332 * @symbol ?makeMad\@Horse\@\@UEAAXXZ */ virtual void makeMad(); /** - * @vftbl 353 + * @vftbl 333 * @symbol ?tameToPlayer\@Horse\@\@UEAA_NAEAVPlayer\@\@_N\@Z */ virtual bool tameToPlayer(class Player &, bool); diff --git a/LiteLoader/include/llapi/mc/HorseArmorItem.hpp b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp index 8d2e8ef818..fc61533c5f 100644 --- a/LiteLoader/include/llapi/mc/HorseArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp @@ -59,10 +59,10 @@ enum class Tier; */ virtual bool isDyeable() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp b/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp index 5b9588cdd4..49fef207b9 100644 --- a/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp @@ -28,10 +28,6 @@ class HorsePostTravelSystem { * @symbol ?createSystem\@HorsePostTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@HorsePostTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundPreTravelFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT, class FlagComponent>, class Optional const>, class ActorOwnerComponent>); //private: /** diff --git a/LiteLoader/include/llapi/mc/HoverTextColorItemComponent.hpp b/LiteLoader/include/llapi/mc/HoverTextColorItemComponent.hpp new file mode 100644 index 0000000000..579743953d --- /dev/null +++ b/LiteLoader/include/llapi/mc/HoverTextColorItemComponent.hpp @@ -0,0 +1,76 @@ +/** + * @file HoverTextColorItemComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class HoverTextColorItemComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HOVERTEXTCOLORITEMCOMPONENT +public: + class HoverTextColorItemComponent& operator=(class HoverTextColorItemComponent const &) = delete; + HoverTextColorItemComponent(class HoverTextColorItemComponent const &) = delete; + HoverTextColorItemComponent() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VHoverTextColorItemComponent\@\@\@\@UEBA_NXZ + */ + virtual bool isNetworkComponent() const; + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VHoverTextColorItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + */ + virtual std::unique_ptr buildNetworkTag() const; + /** + * @vftbl 5 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VHoverTextColorItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + */ + virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @vftbl 6 + * @symbol __unk_vfn_6 + */ + virtual void __unk_vfn_6(); + /** + * @vftbl 7 + * @symbol ?initializeComponent\@HoverTextColorItemComponent\@\@UEBAXXZ + */ + virtual void initializeComponent() const; + /** + * @symbol ?bindType\@HoverTextColorItemComponent\@\@SAXXZ + */ + MCAPI static void bindType(); + /** + * @symbol ?getIdentifier\@HoverTextColorItemComponent\@\@SAAEBVHashedString\@\@XZ + */ + MCAPI static class HashedString const & getIdentifier(); + +}; diff --git a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp index 30cdf7ac4e..e06e97a805 100644 --- a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp @@ -36,20 +36,10 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class HugeMushroomBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class HugeMushroomBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class HugeMushroomBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,82 +176,87 @@ class HugeMushroomBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@HugeMushroomBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@HugeMushroomBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@HugeMushroomBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/HumanoidMonster.hpp b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp index 5d23f1f408..9749fca71f 100644 --- a/LiteLoader/include/llapi/mc/HumanoidMonster.hpp +++ b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp @@ -37,145 +37,145 @@ class HumanoidMonster : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@HumanoidMonster\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@HumanoidMonster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@HumanoidMonster\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 288 + * @vftbl 271 * @symbol ?getItemUseDuration\@HumanoidMonster\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 296 + * @vftbl 279 * @symbol ?doHurtTarget\@HumanoidMonster\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_HUMANOIDMONSTER /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp index a1ca74058f..d21ced8f68 100644 --- a/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp +++ b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class HurtArmorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@HurtArmorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@HurtArmorPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_HURTARMORPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/I18n.hpp b/LiteLoader/include/llapi/mc/I18n.hpp index 05c32e4308..0edf63acd3 100644 --- a/LiteLoader/include/llapi/mc/I18n.hpp +++ b/LiteLoader/include/llapi/mc/I18n.hpp @@ -53,14 +53,14 @@ class I18n { * @symbol ?appendLanguageStringsFromPack\@I18n\@\@SAXAEBVPackManifest\@\@AEBV?$multimap\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@2\@U?$less\@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\@\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI static void appendLanguageStringsFromPack(class PackManifest const &, class std::multimap, struct std::less, class std::allocator>>> const &); - /** - * @symbol ?chooseLanguage\@I18n\@\@SAXAEBVLocalization\@\@\@Z - */ - MCAPI static void chooseLanguage(class Localization const &); /** * @symbol ?chooseLanguage\@I18n\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void chooseLanguage(std::string const &); + /** + * @symbol ?chooseLanguage\@I18n\@\@SAXAEBVLocalization\@\@\@Z + */ + MCAPI static void chooseLanguage(class Localization const &); /** * @symbol ?findAvailableLanguageNames\@I18n\@\@SA?AV?$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\@\@std\@\@AEAVResourcePackManager\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp b/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp index f0f6edf03e..b47358d897 100644 --- a/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp @@ -32,10 +32,6 @@ struct IActorMovementProxy { * @symbol ?isFlying\@IActorMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isFlying() const; - /** - * @symbol ?setIsFlying\@IActorMovementProxy\@\@UEAAX_N\@Z - */ - MCVAPI void setIsFlying(bool); #endif /** * @symbol ?getRegionAsConstBlockSource\@IActorMovementProxy\@\@QEBAAEBVIConstBlockSource\@\@XZ diff --git a/LiteLoader/include/llapi/mc/IEntitySystems.hpp b/LiteLoader/include/llapi/mc/IEntitySystems.hpp index 602a698fc4..99564351f4 100644 --- a/LiteLoader/include/llapi/mc/IEntitySystems.hpp +++ b/LiteLoader/include/llapi/mc/IEntitySystems.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -27,5 +28,9 @@ class IEntitySystems { #endif public: + /** + * @symbol ?registerTickingSystem\@IEntitySystems\@\@QEAAXV?$initializer_list\@V?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@\@std\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@3\@AEBUSystemInfo\@\@UEntitySystemTickingMode\@\@\@Z + */ + MCAPI void registerTickingSystem(class std::initializer_list>, std::unique_ptr, struct SystemInfo const &, struct EntitySystemTickingMode); }; diff --git a/LiteLoader/include/llapi/mc/IEntitySystemsCollection.hpp b/LiteLoader/include/llapi/mc/IEntitySystemsCollection.hpp new file mode 100644 index 0000000000..fbabae31e9 --- /dev/null +++ b/LiteLoader/include/llapi/mc/IEntitySystemsCollection.hpp @@ -0,0 +1,33 @@ +/** + * @file IEntitySystemsCollection.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct IEntitySystemsCollection { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_IENTITYSYSTEMSCOLLECTION +public: + struct IEntitySystemsCollection& operator=(struct IEntitySystemsCollection const &) = delete; + IEntitySystemsCollection(struct IEntitySystemsCollection const &) = delete; + IEntitySystemsCollection() = delete; +#endif + +public: + /** + * @symbol ?registerTickingSystem\@IEntitySystemsCollection\@\@QEAAXV?$initializer_list\@V?$typeid_t\@USystemCategory\@\@\@Bedrock\@\@\@std\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@3\@AEBUSystemInfo\@\@UEntitySystemTickingMode\@\@\@Z + */ + MCAPI void registerTickingSystem(class std::initializer_list>, std::unique_ptr, struct SystemInfo const &, struct EntitySystemTickingMode); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IceBlock.hpp b/LiteLoader/include/llapi/mc/IceBlock.hpp index d656e51c9f..1c89286266 100644 --- a/LiteLoader/include/llapi/mc/IceBlock.hpp +++ b/LiteLoader/include/llapi/mc/IceBlock.hpp @@ -36,20 +36,10 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class IceBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class IceBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class IceBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@IceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@IceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,67 +181,72 @@ class IceBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@IceBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@IceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@IceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/IceBombItem.hpp b/LiteLoader/include/llapi/mc/IceBombItem.hpp index 567c52a10e..266d440560 100644 --- a/LiteLoader/include/llapi/mc/IceBombItem.hpp +++ b/LiteLoader/include/llapi/mc/IceBombItem.hpp @@ -52,10 +52,10 @@ class IceBombItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@IceBombItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp index 51b7c3f937..018239ff0a 100644 --- a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp @@ -35,14 +35,14 @@ enum class Type : char #endif public: - /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI IdentityDefinition(class IdentityDefinition const &); /** * @symbol ??0IdentityDefinition\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI IdentityDefinition(class IdentityDefinition &&); + /** + * @symbol ??0IdentityDefinition\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI IdentityDefinition(class IdentityDefinition const &); /** * @symbol ?getEntityId\@IdentityDefinition\@\@QEBAAEBUActorUniqueID\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/IllagerBeast.hpp b/LiteLoader/include/llapi/mc/IllagerBeast.hpp index b34be00f5d..8c32923a3b 100644 --- a/LiteLoader/include/llapi/mc/IllagerBeast.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeast.hpp @@ -37,125 +37,125 @@ class IllagerBeast : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 41 + * @vftbl 36 * @symbol ?blockedByShield\@IllagerBeast\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0IllagerBeast\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp index bce4677aff..188a1c7083 100644 --- a/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp +++ b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp @@ -36,7 +36,7 @@ class ImmutableWorldCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ImmutableWorldCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp b/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp index 183fcc4294..66e5d7414b 100644 --- a/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp @@ -35,5 +35,9 @@ class InLavaSensingSystem { * @symbol ?doInLavaSensing\@InLavaSensingSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@\@Z */ MCAPI static void doInLavaSensing(class StrictEntityContext const &, struct UpdateWaterStateRequestComponent const &, class EntityModifierT>); + /** + * @symbol ?tickSystem\@InLavaSensingSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUUpdateWaterStateRequestComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tickSystem(class ViewT, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/IndexSet.hpp b/LiteLoader/include/llapi/mc/IndexSet.hpp index 60ea14d0c1..cd88ebc147 100644 --- a/LiteLoader/include/llapi/mc/IndexSet.hpp +++ b/LiteLoader/include/llapi/mc/IndexSet.hpp @@ -31,14 +31,14 @@ class IndexSet { * @symbol ??0IndexSet\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI IndexSet(class IndexSet &&); - /** - * @symbol ??0IndexSet\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI IndexSet(class IndexSet const &); /** * @symbol ??0IndexSet\@\@QEAA\@XZ */ MCAPI IndexSet(); + /** + * @symbol ??0IndexSet\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI IndexSet(class IndexSet const &); /** * @symbol ?contains\@IndexSet\@\@QEBA_N_K\@Z */ diff --git a/LiteLoader/include/llapi/mc/InfestedBlock.hpp b/LiteLoader/include/llapi/mc/InfestedBlock.hpp index 1b257cdf46..fff729b1ac 100644 --- a/LiteLoader/include/llapi/mc/InfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedBlock.hpp @@ -36,20 +36,10 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class InfestedBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class InfestedBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class InfestedBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@InfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@InfestedBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,82 +181,87 @@ class InfestedBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@InfestedBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@InfestedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 159 + * @vftbl 157 * @symbol ?tryGetUninfested\@InfestedBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@InfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@InfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp index 2b18ca1719..7e66a538c4 100644 --- a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp @@ -36,20 +36,10 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +171,65 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 159 + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 157 * @symbol ?tryGetUninfested\@InfestedDeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0InfestedDeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp index 8b8ec8c844..300aec715f 100644 --- a/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp @@ -46,9 +46,9 @@ class InitialTickFilterSystem { //private: /** - * @symbol ?_blockFilterTickView\@InitialTickFilterSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UGlobalActorFlag\@\@\@\@USideBySideSimulatorComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z + * @symbol ?_blockFilterTickView\@InitialTickFilterSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UGlobalActorFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z */ - MCAPI static void _blockFilterTickView(class ViewT>, struct StateVectorComponent const, struct Exclude, class FlagComponent, struct SideBySideSimulatorComponent>>, class ViewT, class OptionalGlobalT, class EntityModifierT>); + MCAPI static void _blockFilterTickView(class ViewT>, struct StateVectorComponent const, struct Exclude, class FlagComponent>>, class ViewT, class OptionalGlobalT, class EntityModifierT>); /** * @symbol ?_tickingAreaFilterTickView\@InitialTickFilterSystem\@\@CAXV?$OptionalGlobalT\@$$CBUCurrentTickComponent\@\@VEntityRegistryBase\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@VTickWorldComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InputPermissionCommand.hpp b/LiteLoader/include/llapi/mc/InputPermissionCommand.hpp index cf6b7641cc..a3322e63e2 100644 --- a/LiteLoader/include/llapi/mc/InputPermissionCommand.hpp +++ b/LiteLoader/include/llapi/mc/InputPermissionCommand.hpp @@ -31,7 +31,7 @@ class InputPermissionCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@InputPermissionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/InsideBlockComponentUtility.hpp b/LiteLoader/include/llapi/mc/InsideBlockComponentUtility.hpp new file mode 100644 index 0000000000..d269425ff3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/InsideBlockComponentUtility.hpp @@ -0,0 +1,36 @@ +/** + * @file InsideBlockComponentUtility.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace InsideBlockComponentUtility { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?entityInside\@InsideBlockComponentUtility\@\@YAXAEBV?$vector\@UInsideBlockData\@\@V?$allocator\@UInsideBlockData\@\@\@std\@\@\@std\@\@AEAVActor\@\@\@Z + */ + MCAPI void entityInside(std::vector const &, class Actor &); + /** + * @symbol ?entityInsideLegacyRedirect\@InsideBlockComponentUtility\@\@YAXAEBU?$InsideBlockWithPosAndBlockComponent\@USweetBerryBushBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void entityInsideLegacyRedirect(struct InsideBlockWithPosAndBlockComponent const &, class ActorOwnerComponent &); + /** + * @symbol ?entityInsideLegacyRedirect\@InsideBlockComponentUtility\@\@YAXAEBUInsideGenericBlockComponent\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void entityInsideLegacyRedirect(struct InsideGenericBlockComponent const &, class ActorOwnerComponent &); + /** + * @symbol ?entityInsideLegacyRedirect\@InsideBlockComponentUtility\@\@YAXAEBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void entityInsideLegacyRedirect(struct InsideBlockWithPosAndBlockComponent const &, class ActorOwnerComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp b/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp index e4a351a40f..dd74c29a18 100644 --- a/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp @@ -27,14 +27,6 @@ class InsideBubbleColumnSystem { #endif public: - /** - * @symbol ?createBoatInsideBubbleColumnSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createBoatInsideBubbleColumnSystem(); - /** - * @symbol ?createBubbleColumnMovementSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createBubbleColumnMovementSystem(); /** * @symbol ?createSpawnBubbleColumnParticlesSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/InsideBubbleColumnSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideBubbleColumnSystemImpl.hpp deleted file mode 100644 index e81d5d0d92..0000000000 --- a/LiteLoader/include/llapi/mc/InsideBubbleColumnSystemImpl.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file InsideBubbleColumnSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class InsideBubbleColumnSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEBUBBLECOLUMNSYSTEMIMPL -public: - class InsideBubbleColumnSystemImpl& operator=(class InsideBubbleColumnSystemImpl const &) = delete; - InsideBubbleColumnSystemImpl(class InsideBubbleColumnSystemImpl const &) = delete; - InsideBubbleColumnSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?boatInsideBubbleColumn\@InsideBubbleColumnSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUInsideBubbleColumnBlockComponent\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void boatInsideBubbleColumn(class ViewT>, class ActorOwnerComponent>); - -}; diff --git a/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp deleted file mode 100644 index 8c8fe8efed..0000000000 --- a/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file InsideCactusBlockSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class InsideCactusBlockSystem. - * - */ -class InsideCactusBlockSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDECACTUSBLOCKSYSTEM -public: - class InsideCactusBlockSystem& operator=(class InsideCactusBlockSystem const &) = delete; - InsideCactusBlockSystem(class InsideCactusBlockSystem const &) = delete; - InsideCactusBlockSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@InsideCactusBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@InsideCactusBlockSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBU?$InsideBlockWithPosAndBlockComponent\@UCactusBlockFlag\@\@\@\@UInsideBlockComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT const, struct InsideBlockComponent>); - -}; diff --git a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp index 47f2e6aeec..2f7ce24d30 100644 --- a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp @@ -10,30 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class InsideEndPortalBlockSystemImpl. - * - */ -class InsideEndPortalBlockSystemImpl { + +namespace InsideEndPortalBlockSystemImpl { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEENDPORTALBLOCKSYSTEMIMPL -public: - class InsideEndPortalBlockSystemImpl& operator=(class InsideEndPortalBlockSystemImpl const &) = delete; - InsideEndPortalBlockSystemImpl(class InsideEndPortalBlockSystemImpl const &) = delete; - InsideEndPortalBlockSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?_tickInsideEndPortalBlockSystem\@InsideEndPortalBlockSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _tickInsideEndPortalBlockSystem(class StrictEntityContext &, struct InsideBlockWithPosAndBlockComponent const &, class ActorOwnerComponent &); /** - * @symbol ?tickInsideEndPortalBlockSystem\@InsideEndPortalBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + * @symbol ?tickInsideEndPortalBlock\@InsideEndPortalBlockSystemImpl\@\@YAXAEBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z */ - MCAPI static void tickInsideEndPortalBlockSystem(class ViewT const, class ActorOwnerComponent>); + MCAPI void tickInsideEndPortalBlock(struct InsideBlockWithPosAndBlockComponent const &, class ActorOwnerComponent &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideGenericBlockComponent.hpp b/LiteLoader/include/llapi/mc/InsideGenericBlockComponent.hpp new file mode 100644 index 0000000000..568d3c3289 --- /dev/null +++ b/LiteLoader/include/llapi/mc/InsideGenericBlockComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file InsideGenericBlockComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct InsideGenericBlockComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEGENERICBLOCKCOMPONENT +public: + struct InsideGenericBlockComponent& operator=(struct InsideGenericBlockComponent const &) = delete; + InsideGenericBlockComponent(struct InsideGenericBlockComponent const &) = delete; + InsideGenericBlockComponent() = delete; +#endif + +public: + /** + * @symbol ??4InsideGenericBlockComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct InsideGenericBlockComponent & operator=(struct InsideGenericBlockComponent &&); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideGenericBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideGenericBlockSystemImpl.hpp new file mode 100644 index 0000000000..dd84547822 --- /dev/null +++ b/LiteLoader/include/llapi/mc/InsideGenericBlockSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file InsideGenericBlockSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace InsideGenericBlockSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tickInsideGenericBlock\@InsideGenericBlockSystemImpl\@\@YAXAEAUInsideGenericBlockComponent\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void tickInsideGenericBlock(struct InsideGenericBlockComponent &, class ActorOwnerComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp index c644ec45dd..4aad2b3758 100644 --- a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp @@ -31,9 +31,5 @@ class InsideHoneyBlockSystem { * @symbol ?createEventsSystem\@InsideHoneyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createEventsSystem(); - /** - * @symbol ?createMovementSystem\@InsideHoneyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createMovementSystem(); }; diff --git a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideHoneyBlockSystemImpl.hpp deleted file mode 100644 index bf8a401bf9..0000000000 --- a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystemImpl.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file InsideHoneyBlockSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class InsideHoneyBlockSystemImpl. - * - */ -class InsideHoneyBlockSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEHONEYBLOCKSYSTEMIMPL -public: - class InsideHoneyBlockSystemImpl& operator=(class InsideHoneyBlockSystemImpl const &) = delete; - InsideHoneyBlockSystemImpl(class InsideHoneyBlockSystemImpl const &) = delete; - InsideHoneyBlockSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?isSlidingDown\@InsideHoneyBlockSystemImpl\@\@SA_NAEBVBlockPos\@\@AEBVVec3\@\@1AEBVVec2\@\@\@Z - */ - MCAPI static bool isSlidingDown(class BlockPos const &, class Vec3 const &, class Vec3 const &, class Vec2 const &); - /** - * @symbol ?movementSystem\@InsideHoneyBlockSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBU?$InsideBlockWithPosAndBlockComponent\@UHoneyBlockFlag\@\@\@\@AEBUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@\@Z - */ - MCAPI static void movementSystem(class StrictEntityContext const &, struct InsideBlockWithPosAndBlockComponent const &, struct AABBShapeComponent const &, struct StateVectorComponent &, struct FallDistanceComponent &); - -}; diff --git a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp index 6dc81dc750..fd5b0c7e83 100644 --- a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp @@ -20,17 +20,9 @@ namespace InsidePowderSnowBlockSystem { * @symbol ?createClientSideSpawnParticleSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createClientSideSpawnParticleSystem(); - /** - * @symbol ?createMovementSlowdownSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createMovementSlowdownSystem(); /** * @symbol ?createServerSideClearFireSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createServerSideClearFireSystem(); - /** - * @symbol ?createServerSideFreezingSystem\@InsidePowderSnowBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createServerSideFreezingSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp deleted file mode 100644 index aea5d1a20a..0000000000 --- a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file InsidePowderSnowBlockSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class InsidePowderSnowBlockSystemImpl. - * - */ -class InsidePowderSnowBlockSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEPOWDERSNOWBLOCKSYSTEMIMPL -public: - class InsidePowderSnowBlockSystemImpl& operator=(class InsidePowderSnowBlockSystemImpl const &) = delete; - InsidePowderSnowBlockSystemImpl(class InsidePowderSnowBlockSystemImpl const &) = delete; - InsidePowderSnowBlockSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?SLOWDOWN_MODIFIER\@InsidePowderSnowBlockSystemImpl\@\@2VVec3\@\@B - */ - MCAPI static class Vec3 const SLOWDOWN_MODIFIER; - /** - * @symbol ?movementSlowdownSystem\@InsidePowderSnowBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UBlockMovementSlowdownMultiplierComponent\@\@U?$Include\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z - */ - MCAPI static void movementSlowdownSystem(class ViewT>>, class EntityModifierT); - /** - * @symbol ?serverSideFreezingSystem\@InsidePowderSnowBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@\@\@U?$Exclude\@VFreezingComponent\@\@V?$FlagComponent\@UFreezeImmuneFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Exclude\@VFreezingComponent\@\@V?$FlagComponent\@UFreezeImmuneFlag\@\@\@\@V?$FlagComponent\@UIsDeadFlag\@\@\@\@\@\@$$CBUActorGameTypeComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@VFreezingComponent\@\@\@\@V?$OptionalGlobalT\@$$CBUExternalDataComponent\@\@VEntityRegistryBase\@\@\@\@\@Z - */ - MCAPI static void serverSideFreezingSystem(class ViewT>, struct Exclude, class FlagComponent>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>, struct ActorGameTypeComponent const>, class EntityModifierT, class OptionalGlobalT); - -}; diff --git a/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp index b2dd47be1e..4b24f1d386 100644 --- a/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp @@ -10,30 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class InsideSweetBerryBushBlockSystem. - * - */ -class InsideSweetBerryBushBlockSystem { + +namespace InsideSweetBerryBushBlockSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDESWEETBERRYBUSHBLOCKSYSTEM -public: - class InsideSweetBerryBushBlockSystem& operator=(class InsideSweetBerryBushBlockSystem const &) = delete; - InsideSweetBerryBushBlockSystem(class InsideSweetBerryBushBlockSystem const &) = delete; - InsideSweetBerryBushBlockSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@InsideSweetBerryBushBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tick\@InsideSweetBerryBushBlockSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBU?$InsideBlockWithPosAndBlockComponent\@USweetBerryBushBlockFlag\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + * @symbol ?createSystem\@InsideSweetBerryBushBlockSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void tick(class ViewT const, class ActorOwnerComponent>); + MCAPI struct TickingSystemWithInfo createSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystemImpl.hpp new file mode 100644 index 0000000000..df6f638612 --- /dev/null +++ b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file InsideSweetBerryBushBlockSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace InsideSweetBerryBushBlockSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tick\@InsideSweetBerryBushBlockSystemImpl\@\@YAXAEBU?$InsideBlockWithPosAndBlockComponent\@USweetBerryBushBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void tick(struct InsideBlockWithPosAndBlockComponent const &, class ActorOwnerComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp index 954ee09006..e20f3fbaf3 100644 --- a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp @@ -31,9 +31,5 @@ class InsideWaterlilyBlockSystem { * @symbol ?createDestroyWaterlilySystem\@InsideWaterlilyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createDestroyWaterlilySystem(); - /** - * @symbol ?createMovementSystem\@InsideWaterlilyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createMovementSystem(); }; diff --git a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp index 8ef0730553..9445526d12 100644 --- a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp @@ -10,34 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class InsideWaterlilyBlockSystemImpl. - * - */ -class InsideWaterlilyBlockSystemImpl { + +namespace InsideWaterlilyBlockSystemImpl { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEWATERLILYBLOCKSYSTEMIMPL -public: - class InsideWaterlilyBlockSystemImpl& operator=(class InsideWaterlilyBlockSystemImpl const &) = delete; - InsideWaterlilyBlockSystemImpl(class InsideWaterlilyBlockSystemImpl const &) = delete; - InsideWaterlilyBlockSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?_tickMovementSystem\@InsideWaterlilyBlockSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@AEAUStateVectorComponent\@\@\@Z - */ - MCAPI static void _tickMovementSystem(class StrictEntityContext const &, struct InsideBlockWithPosComponent const &, struct StateVectorComponent &); - /** - * @symbol ?tickDestroyWaterlilySystem\@InsideWaterlilyBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void tickDestroyWaterlilySystem(class ViewT>, struct InsideBlockWithPosComponent const, class ActorOwnerComponent>); /** - * @symbol ?tickMovementSystem\@InsideWaterlilyBlockSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@UStateVectorComponent\@\@\@\@\@Z + * @symbol ?tickDestroyWaterlily\@InsideWaterlilyBlockSystemImpl\@\@YAXAEBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z */ - MCAPI static void tickMovementSystem(class ViewT>, struct InsideBlockWithPosComponent const, struct StateVectorComponent>); + MCAPI void tickDestroyWaterlily(struct InsideBlockWithPosComponent const &, class ActorOwnerComponent &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp deleted file mode 100644 index 98b1bb8bc6..0000000000 --- a/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/** - * @file InsideWebBlockSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class InsideWebBlockSystem. - * - */ -class InsideWebBlockSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEWEBBLOCKSYSTEM -public: - class InsideWebBlockSystem& operator=(class InsideWebBlockSystem const &) = delete; - InsideWebBlockSystem(class InsideWebBlockSystem const &) = delete; - InsideWebBlockSystem() = delete; -#endif - -public: - /** - * @symbol ?SLOWDOWN_MULTIPLIER\@InsideWebBlockSystem\@\@2VVec3\@\@B - */ - MCAPI static class Vec3 const SLOWDOWN_MULTIPLIER; - /** - * @symbol ?_applySlowdown\@InsideWebBlockSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z - */ - MCAPI static void _applySlowdown(class StrictEntityContext &, struct BlockMovementSlowdownMultiplierComponent &, class EntityModifierT); - /** - * @symbol ?createSlowdownSystem\@InsideWebBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSlowdownSystem(); - /** - * @symbol ?webSlowdownSystem\@InsideWebBlockSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UWebBlockTag\@\@\@\@\@\@UBlockMovementSlowdownMultiplierComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z - */ - MCAPI static void webSlowdownSystem(class ViewT>, struct BlockMovementSlowdownMultiplierComponent>, class EntityModifierT); - -}; diff --git a/LiteLoader/include/llapi/mc/Int64Tag.hpp b/LiteLoader/include/llapi/mc/Int64Tag.hpp index 607627e6b7..e1e874619e 100644 --- a/LiteLoader/include/llapi/mc/Int64Tag.hpp +++ b/LiteLoader/include/llapi/mc/Int64Tag.hpp @@ -46,9 +46,9 @@ int64_t val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@Int64Tag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@Int64Tag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,12 +79,6 @@ int64_t val; * @symbol ?hash\@Int64Tag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INT64TAG - /** - * @symbol ?write\@Int64Tag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; -#endif /** * @symbol ??0Int64Tag\@\@QEAA\@_J\@Z */ diff --git a/LiteLoader/include/llapi/mc/IntArrayTag.hpp b/LiteLoader/include/llapi/mc/IntArrayTag.hpp index af7fea7ddf..befcd16501 100644 --- a/LiteLoader/include/llapi/mc/IntArrayTag.hpp +++ b/LiteLoader/include/llapi/mc/IntArrayTag.hpp @@ -48,9 +48,9 @@ class IntArrayTag : public Tag { virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@IntArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@IntArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -81,11 +81,5 @@ class IntArrayTag : public Tag { * @symbol ?hash\@IntArrayTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INTARRAYTAG - /** - * @symbol ?write\@IntArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; -#endif }; diff --git a/LiteLoader/include/llapi/mc/IntComponent.hpp b/LiteLoader/include/llapi/mc/IntComponent.hpp deleted file mode 100644 index c47a76f6ea..0000000000 --- a/LiteLoader/include/llapi/mc/IntComponent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file IntComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct IntComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INTCOMPONENT -public: - struct IntComponent& operator=(struct IntComponent const &) = delete; - IntComponent(struct IntComponent const &) = delete; - IntComponent() = delete; -#endif - -public: - /** - * @symbol ?getDiff\@IntComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z - */ - MCAPI static class std::optional getDiff(struct IntComponent const &, struct IntComponent const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IntTag.hpp b/LiteLoader/include/llapi/mc/IntTag.hpp index 9c5bf82758..af93e61513 100644 --- a/LiteLoader/include/llapi/mc/IntTag.hpp +++ b/LiteLoader/include/llapi/mc/IntTag.hpp @@ -45,9 +45,9 @@ int val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@IntTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@IntTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,22 +79,18 @@ int val; */ virtual unsigned __int64 hash() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INTTAG - /** - * @symbol ?write\@IntTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; /** * @symbol __unk_destructor_-1 */ MCVAPI ~IntTag(); #endif - /** - * @symbol ??0IntTag\@\@QEAA\@XZ - */ - MCAPI IntTag(); /** * @symbol ??0IntTag\@\@QEAA\@H\@Z */ MCAPI IntTag(int); + /** + * @symbol ??0IntTag\@\@QEAA\@XZ + */ + MCAPI IntTag(); }; diff --git a/LiteLoader/include/llapi/mc/InteractPacket.hpp b/LiteLoader/include/llapi/mc/InteractPacket.hpp index 45ae07287f..34bb517302 100644 --- a/LiteLoader/include/llapi/mc/InteractPacket.hpp +++ b/LiteLoader/include/llapi/mc/InteractPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class InteractPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InteractPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InteractPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INTERACTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Interaction.hpp b/LiteLoader/include/llapi/mc/Interaction.hpp index db4afd642d..41b23f3d54 100644 --- a/LiteLoader/include/llapi/mc/Interaction.hpp +++ b/LiteLoader/include/llapi/mc/Interaction.hpp @@ -31,14 +31,14 @@ struct Interaction { * @symbol ??0Interaction\@\@QEAA\@XZ */ MCAPI Interaction(); - /** - * @symbol ??0Interaction\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI Interaction(struct Interaction const &); /** * @symbol ??0Interaction\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI Interaction(struct Interaction &&); + /** + * @symbol ??0Interaction\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI Interaction(struct Interaction const &); /** * @symbol ?addActorDefinitionIdentifierByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp b/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp index 317833306f..5267d874b9 100644 --- a/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp @@ -7,6 +7,7 @@ #include "llapi/Global.h" #include "ItemDescriptor.hpp" #include "Json.hpp" +#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -72,8 +73,8 @@ struct InternalItemDescriptor { */ virtual unsigned __int64 getHash() const; /** - * @symbol ?deserialize\@InternalItemDescriptor\@\@SA?AV?$unique_ptr\@UInternalItemDescriptor\@\@U?$default_delete\@UInternalItemDescriptor\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@InternalItemDescriptor\@\@SA?AV?$Result\@V?$unique_ptr\@UInternalItemDescriptor\@\@U?$default_delete\@UInternalItemDescriptor\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI static std::unique_ptr deserialize(class ReadOnlyBinaryStream &); + MCAPI static class Bedrock::Result, class std::error_code> deserialize(class ReadOnlyBinaryStream &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp b/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp index 093f8498a7..509264039c 100644 --- a/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp +++ b/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp @@ -33,16 +33,20 @@ struct InterpolatedRidingPositionCalculationHelper { */ MCAPI static class Vec3 getCamelInterpolatedRidingOffset(struct SynchedActorDataComponent const &); /** - * @symbol ?getHorseInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z + * @symbol ?getHorseInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z */ - MCAPI static class Vec3 getHorseInterpolatedRidingOffset(class StrictEntityContext const &, class ViewT>, struct StandAnimationComponent const>, class ViewT, float); + MCAPI static class Vec3 getHorseInterpolatedRidingOffset(class StrictEntityContext const &, class ViewT>, struct StandAnimationComponent const> const &, class ViewT const &, float); /** - * @symbol ?getInterpolatedBodyRot\@InterpolatedRidingPositionCalculationHelper\@\@SAMAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z + * @symbol ?getInterpolatedBodyRot\@InterpolatedRidingPositionCalculationHelper\@\@SAMAEBVStrictEntityContext\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z */ - MCAPI static float getInterpolatedBodyRot(class StrictEntityContext const &, class ViewT, class ViewT>, struct MobBodyRotationComponent const>, float); + MCAPI static float getInterpolatedBodyRot(class StrictEntityContext const &, class ViewT const &, class ViewT>, struct MobBodyRotationComponent const> const &, float); /** - * @symbol ?getInterpolatedPosition\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z + * @symbol ?getInterpolatedPosition\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBUStateVectorComponent\@\@M\@Z */ - MCAPI static class Vec3 getInterpolatedPosition(class StrictEntityContext const &, class ViewT, float); + MCAPI static class Vec3 getInterpolatedPosition(struct StateVectorComponent const &, float); + /** + * @symbol ?getInterpolatedPosition\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z + */ + MCAPI static class Vec3 getInterpolatedPosition(class StrictEntityContext const &, class ViewT const &, float); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp index 6800fcee1e..07fc40bd91 100644 --- a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class InventoryContentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InventoryContentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InventoryContentPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYCONTENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp index a5d8a2b7a0..2dd9178da5 100644 --- a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class InventorySlotPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InventorySlotPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InventorySlotPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYSLOTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp index 9b121eefd9..ccc001a29e 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -82,9 +83,9 @@ class InventoryTransaction { */ MCAPI static bool checkTransactionItemsMatch(class ItemStack const &, class ItemStack const &); /** - * @symbol ?deserialize\@InventoryTransaction\@\@SA?AV1\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@InventoryTransaction\@\@SA?AV?$Result\@VInventoryTransaction\@\@Verror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI static class InventoryTransaction deserialize(class ReadOnlyBinaryStream &); + MCAPI static class Bedrock::Result deserialize(class ReadOnlyBinaryStream &); /** * @symbol ?getInventoryTransactionErrorName\@InventoryTransaction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4InventoryTransactionError\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp index aeec8ae5e0..fb883f78d8 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -57,9 +58,9 @@ class InventoryTransactionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@InventoryTransactionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@InventoryTransactionPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYTRANSACTIONPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/InvisibleBlock.hpp b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp index 7c80bb4e67..1b12947367 100644 --- a/LiteLoader/include/llapi/mc/InvisibleBlock.hpp +++ b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp @@ -36,20 +36,15 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 5 + * @symbol ?clip\@InvisibleBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void __unk_vfn_28(); + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class InvisibleBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class InvisibleBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class InvisibleBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +121,50 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +176,60 @@ class InvisibleBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 174 - * @symbol ?clip\@InvisibleBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0InvisibleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/IronGolem.hpp b/LiteLoader/include/llapi/mc/IronGolem.hpp index f6aac49af3..e3e754e7bb 100644 --- a/LiteLoader/include/llapi/mc/IronGolem.hpp +++ b/LiteLoader/include/llapi/mc/IronGolem.hpp @@ -37,160 +37,160 @@ class IronGolem : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@IronGolem\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@IronGolem\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@IronGolem\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@IronGolem\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 275 + * @vftbl 261 * @symbol ?hurtEffects\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@IronGolem\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 296 + * @vftbl 279 * @symbol ?doHurtTarget\@IronGolem\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0IronGolem\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Item.hpp b/LiteLoader/include/llapi/mc/Item.hpp index 8dcb4f6db4..b1690b09df 100644 --- a/LiteLoader/include/llapi/mc/Item.hpp +++ b/LiteLoader/include/llapi/mc/Item.hpp @@ -134,9 +134,9 @@ class Tier { virtual bool isDyeable() const; /** * @vftbl 19 - * @symbol __unk_vfn_19 + * @symbol ?isDye\@Item\@\@UEBA_NXZ */ - virtual void __unk_vfn_19(); + virtual bool isDye() const; /** * @vftbl 20 * @symbol ?getItemColor\@Item\@\@UEBA?AW4ItemColor\@\@XZ @@ -144,9 +144,9 @@ class Tier { virtual enum class ItemColor getItemColor() const; /** * @vftbl 21 - * @symbol ?isFertilizer\@Item\@\@UEBA_NXZ + * @symbol __unk_vfn_21 */ - virtual bool isFertilizer() const; + virtual void __unk_vfn_21(); /** * @vftbl 22 * @symbol ?isFood\@Item\@\@UEBA_NXZ @@ -709,6 +709,11 @@ class Tier { virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** * @vftbl 134 + * @symbol ?_shouldAutoCalculatePlacePos\@Item\@\@EEBA_NXZ + */ + virtual bool _shouldAutoCalculatePlacePos() const; + /** + * @vftbl 135 * @symbol ?_useOn\@Item\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; @@ -746,9 +751,9 @@ class Tier { */ MCVAPI bool isComponentBased() const; /** - * @symbol ?isDye\@Item\@\@UEBA_NXZ + * @symbol ?isFertilizer\@Item\@\@UEBA_NXZ */ - MCVAPI bool isDye() const; + MCVAPI bool isFertilizer() const; /** * @symbol ?isMultiColorTinted\@Item\@\@UEBA_NAEBVItemStack\@\@\@Z */ @@ -806,6 +811,10 @@ class Tier { * @symbol ?calculatePlacePos\@Item\@\@QEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ MCAPI bool calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; + /** + * @symbol ?canBeUsedInCommands\@Item\@\@QEBA_NAEBVBaseGameVersion\@\@\@Z + */ + MCAPI bool canBeUsedInCommands(class BaseGameVersion const &) const; /** * @symbol ?destroySpeedBonus\@Item\@\@QEBAMAEBVItemStackBase\@\@\@Z */ @@ -902,6 +911,10 @@ class Tier { * @symbol ?setFurnaceXPmultiplier\@Item\@\@QEAAAEAV1\@M\@Z */ MCAPI class Item & setFurnaceXPmultiplier(float); + /** + * @symbol ?setHoverTextColorFormat\@Item\@\@QEAAXAEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + */ + MCAPI void setHoverTextColorFormat(class std::basic_string_view> const &); /** * @symbol ?setIsMirroredArt\@Item\@\@QEAAAEAV1\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemActor.hpp b/LiteLoader/include/llapi/mc/ItemActor.hpp index 2a8c764cd5..727d1ed1e7 100644 --- a/LiteLoader/include/llapi/mc/ItemActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemActor.hpp @@ -50,155 +50,155 @@ class ItemActor : public Actor { */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 39 + * @vftbl 34 * @symbol ?isFireImmune\@ItemActor\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 47 + * @vftbl 42 * @symbol ?tryCreateAddActorPacket\@ItemActor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 87 + * @vftbl 78 * @symbol ?playerTouch\@ItemActor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@ItemActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@ItemActor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@ItemActor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 171 + * @vftbl 159 * @symbol ?getLiquidAABB\@ItemActor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z */ virtual class AABB getLiquidAABB(enum class MaterialType) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 + * @vftbl 181 * @symbol ?canSynchronizeNewEntity\@ItemActor\@\@UEBA_NXZ */ virtual bool canSynchronizeNewEntity() const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@ItemActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@ItemActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@ItemActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMACTOR /** * @symbol ?canMakeStepSound\@ItemActor\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp index 10e7d50489..3c713bd9d7 100644 --- a/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp @@ -34,13 +34,5 @@ struct ItemChargeEvent { * @symbol ??0ItemChargeEvent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ItemChargeEvent(struct ItemChargeEvent &&); - /** - * @symbol ??0ItemChargeEvent\@\@QEAA\@AEBVItemInstance\@\@VWeakEntityRef\@\@H\@Z - */ - MCAPI ItemChargeEvent(class ItemInstance const &, class WeakEntityRef, int); - /** - * @symbol ??1ItemChargeEvent\@\@QEAA\@XZ - */ - MCAPI ~ItemChargeEvent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemColorUtil.hpp b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp index 188dfbd33d..a51c722b12 100644 --- a/LiteLoader/include/llapi/mc/ItemColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp @@ -41,6 +41,10 @@ namespace ItemColorUtil { * @symbol ?getName\@ItemColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemColor\@\@\@Z */ MCAPI std::string const & getName(enum class ItemColor); + /** + * @symbol ?getNameMixedCase\@ItemColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemColor\@\@\@Z + */ + MCAPI std::string const & getNameMixedCase(enum class ItemColor); /** * @symbol ?getRGBColor\@ItemColorUtil\@\@YAHW4ItemColor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemCompleteChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemCompleteChargeEvent.hpp deleted file mode 100644 index 4f91d2cb47..0000000000 --- a/LiteLoader/include/llapi/mc/ItemCompleteChargeEvent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file ItemCompleteChargeEvent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct ItemCompleteChargeEvent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMCOMPLETECHARGEEVENT -public: - struct ItemCompleteChargeEvent& operator=(struct ItemCompleteChargeEvent const &) = delete; - ItemCompleteChargeEvent(struct ItemCompleteChargeEvent const &) = delete; - ItemCompleteChargeEvent() = delete; -#endif - -public: - /** - * @symbol ??1ItemCompleteChargeEvent\@\@QEAA\@XZ - */ - MCAPI ~ItemCompleteChargeEvent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemCompleteUseEvent.hpp b/LiteLoader/include/llapi/mc/ItemCompleteUseEvent.hpp new file mode 100644 index 0000000000..51ee901a68 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ItemCompleteUseEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ItemCompleteUseEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ItemCompleteUseEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMCOMPLETEUSEEVENT +public: + struct ItemCompleteUseEvent& operator=(struct ItemCompleteUseEvent const &) = delete; + ItemCompleteUseEvent(struct ItemCompleteUseEvent const &) = delete; + ItemCompleteUseEvent() = delete; +#endif + +public: + /** + * @symbol ??1ItemCompleteUseEvent\@\@QEAA\@XZ + */ + MCAPI ~ItemCompleteUseEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemComponent.hpp b/LiteLoader/include/llapi/mc/ItemComponent.hpp index 9a3e0f5d51..e5acf1fa14 100644 --- a/LiteLoader/include/llapi/mc/ItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ItemComponent.hpp @@ -71,6 +71,10 @@ class ItemComponent { * @symbol ?handleVersionBasedInitialization\@ItemComponent\@\@UEAAXAEBVSemVersion\@\@\@Z */ MCVAPI void handleVersionBasedInitialization(class SemVersion const &); + /** + * @symbol ?initializeComponent\@ItemComponent\@\@UEBAXXZ + */ + MCVAPI void initializeComponent() const; /** * @symbol ?initializeFromNetwork\@ItemComponent\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp index ddaf433627..cb9aaa6ae1 100644 --- a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ItemComponentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ItemComponentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemComponentPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMCOMPONENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ItemContext.hpp b/LiteLoader/include/llapi/mc/ItemContext.hpp index 93e91b76fc..08f1431ab8 100644 --- a/LiteLoader/include/llapi/mc/ItemContext.hpp +++ b/LiteLoader/include/llapi/mc/ItemContext.hpp @@ -36,10 +36,6 @@ class ItemContext { * @symbol ??0ItemContext\@\@QEAA\@AEBVWeakEntityRef\@\@H\@Z */ MCAPI ItemContext(class WeakEntityRef const &, int); - /** - * @symbol ?clone\@ItemContext\@\@QEBA?AV?$optional\@VItemStack\@\@\@std\@\@XZ - */ - MCAPI class std::optional clone() const; /** * @symbol ?getAmount\@ItemContext\@\@QEBA?AV?$optional\@H\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp index 55ced9120d..63d3290e9f 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp @@ -67,14 +67,14 @@ class ItemDescriptor { * @symbol ??0ItemDescriptor\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI ItemDescriptor(class ReadOnlyBinaryStream &); - /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z - */ - MCAPI ItemDescriptor(class Item const &, int); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBUItemTag\@\@\@Z */ MCAPI ItemDescriptor(struct ItemTag const &); + /** + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z + */ + MCAPI ItemDescriptor(class Item const &, int); /** * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlockLegacy\@\@\@Z */ @@ -147,14 +147,14 @@ class ItemDescriptor { * @symbol ?isValid\@ItemDescriptor\@\@QEBA_N_N\@Z */ MCAPI bool isValid(bool) const; - /** - * @symbol ??4ItemDescriptor\@\@QEAAX$$QEAV0\@\@Z - */ - MCAPI void operator=(class ItemDescriptor &&); /** * @symbol ??4ItemDescriptor\@\@QEAAXAEBV0\@\@Z */ MCAPI void operator=(class ItemDescriptor const &); + /** + * @symbol ??4ItemDescriptor\@\@QEAAX$$QEAV0\@\@Z + */ + MCAPI void operator=(class ItemDescriptor &&); /** * @symbol ??8ItemDescriptor\@\@QEBA_NAEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp index afa3cef63f..3c15d6c225 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp @@ -49,17 +49,17 @@ class ItemDescriptorCount : public ItemDescriptor { MCVAPI ~ItemDescriptorCount(); #endif /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ItemDescriptorCount(class ReadOnlyBinaryStream &); + MCAPI ItemDescriptorCount(class ItemDescriptorCount const &); /** * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z */ MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z */ - MCAPI ItemDescriptorCount(class ItemDescriptorCount const &); + MCAPI ItemDescriptorCount(class Block const &, unsigned short); /** * @symbol ??0ItemDescriptorCount\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HG\@Z */ @@ -68,22 +68,22 @@ class ItemDescriptorCount : public ItemDescriptor { * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItem\@\@HG\@Z */ MCAPI ItemDescriptorCount(class Item const &, int, unsigned short); - /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBUItemTag\@\@G\@Z - */ - MCAPI ItemDescriptorCount(struct ItemTag const &, unsigned short); /** * @symbol ??0ItemDescriptorCount\@\@QEAA\@XZ */ MCAPI ItemDescriptorCount(); + /** + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI ItemDescriptorCount(class ReadOnlyBinaryStream &); /** * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItemDescriptor\@\@G\@Z */ MCAPI ItemDescriptorCount(class ItemDescriptor const &, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBUItemTag\@\@G\@Z */ - MCAPI ItemDescriptorCount(class Block const &, unsigned short); + MCAPI ItemDescriptorCount(struct ItemTag const &, unsigned short); /** * @symbol ?getStackSize\@ItemDescriptorCount\@\@QEBAFXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemEnchants.hpp b/LiteLoader/include/llapi/mc/ItemEnchants.hpp index ff820e0a27..d0e97982f5 100644 --- a/LiteLoader/include/llapi/mc/ItemEnchants.hpp +++ b/LiteLoader/include/llapi/mc/ItemEnchants.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Enchant.hpp" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -79,9 +80,9 @@ class ItemEnchants { */ MCAPI bool isEmpty() const; /** - * @symbol ?read\@ItemEnchants\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemEnchants\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI void read(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @symbol ?removeEnchantment\@ItemEnchants\@\@QEAAXW4Type\@Enchant\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp index 9d944cdfcc..030636d595 100644 --- a/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp @@ -5,8 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Tag.hpp" -#include "Int64Tag.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +15,7 @@ * @brief MC class ItemEventCoordinator. * */ -class ItemEventCoordinator : public Int64Tag { +class ItemEventCoordinator { #define AFTER_EXTRA // Add Member There @@ -30,340 +28,6 @@ class ItemEventCoordinator : public Int64Tag { #endif public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 11 - * @symbol __unk_vfn_11 - */ - virtual void __unk_vfn_11(); - /** - * @symbol ?rawView\@CompoundTag\@\@QEBAAEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@U?$less\@X\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI class std::map, class std::allocator>> const & rawView() const; - /** - * @vftbl 13 - * @symbol __unk_vfn_13 - */ - virtual void __unk_vfn_13(); - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14(); - /** - * @vftbl 15 - * @symbol __unk_vfn_15 - */ - virtual void __unk_vfn_15(); - /** - * @vftbl 16 - * @symbol __unk_vfn_16 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 17 - * @symbol __unk_vfn_17 - */ - virtual void __unk_vfn_17(); - /** - * @vftbl 18 - * @symbol __unk_vfn_18 - */ - virtual void __unk_vfn_18(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 20 - * @symbol __unk_vfn_20 - */ - virtual void __unk_vfn_20(); - /** - * @vftbl 21 - * @symbol __unk_vfn_21 - */ - virtual void __unk_vfn_21(); - /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); - /** - * @vftbl 25 - * @symbol __unk_vfn_25 - */ - virtual void __unk_vfn_25(); - /** - * @vftbl 26 - * @symbol __unk_vfn_26 - */ - virtual void __unk_vfn_26(); - /** - * @vftbl 27 - * @symbol __unk_vfn_27 - */ - virtual void __unk_vfn_27(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @vftbl 31 - * @symbol __unk_vfn_31 - */ - virtual void __unk_vfn_31(); - /** - * @vftbl 32 - * @symbol __unk_vfn_32 - */ - virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); - /** - * @vftbl 34 - * @symbol __unk_vfn_34 - */ - virtual void __unk_vfn_34(); - /** - * @vftbl 35 - * @symbol __unk_vfn_35 - */ - virtual void __unk_vfn_35(); - /** - * @vftbl 36 - * @symbol __unk_vfn_36 - */ - virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); - /** - * @vftbl 38 - * @symbol __unk_vfn_38 - */ - virtual void __unk_vfn_38(); - /** - * @vftbl 39 - * @symbol __unk_vfn_39 - */ - virtual void __unk_vfn_39(); - /** - * @vftbl 40 - * @symbol __unk_vfn_40 - */ - virtual void __unk_vfn_40(); - /** - * @vftbl 41 - * @symbol __unk_vfn_41 - */ - virtual void __unk_vfn_41(); - /** - * @vftbl 42 - * @symbol __unk_vfn_42 - */ - virtual void __unk_vfn_42(); - /** - * @vftbl 43 - * @symbol __unk_vfn_43 - */ - virtual void __unk_vfn_43(); - /** - * @vftbl 44 - * @symbol __unk_vfn_44 - */ - virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); - /** - * @vftbl 46 - * @symbol __unk_vfn_46 - */ - virtual void __unk_vfn_46(); - /** - * @vftbl 47 - * @symbol __unk_vfn_47 - */ - virtual void __unk_vfn_47(); - /** - * @vftbl 48 - * @symbol __unk_vfn_48 - */ - virtual void __unk_vfn_48(); - /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 50 - * @symbol __unk_vfn_50 - */ - virtual void __unk_vfn_50(); - /** - * @vftbl 51 - * @symbol __unk_vfn_51 - */ - virtual void __unk_vfn_51(); - /** - * @vftbl 52 - * @symbol __unk_vfn_52 - */ - virtual void __unk_vfn_52(); - /** - * @vftbl 53 - * @symbol __unk_vfn_53 - */ - virtual void __unk_vfn_53(); - /** - * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 - * @symbol __unk_vfn_55 - */ - virtual void __unk_vfn_55(); - /** - * @vftbl 56 - * @symbol __unk_vfn_56 - */ - virtual void __unk_vfn_56(); - /** - * @vftbl 57 - * @symbol __unk_vfn_57 - */ - virtual void __unk_vfn_57(); - /** - * @vftbl 58 - * @symbol __unk_vfn_58 - */ - virtual void __unk_vfn_58(); - /** - * @vftbl 59 - * @symbol __unk_vfn_59 - */ - virtual void __unk_vfn_59(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 - */ - virtual void __unk_vfn_62(); - /** - * @vftbl 63 - * @symbol __unk_vfn_63 - */ - virtual void __unk_vfn_63(); - /** - * @vftbl 64 - * @symbol __unk_vfn_64 - */ - virtual void __unk_vfn_64(); - /** - * @vftbl 65 - * @symbol __unk_vfn_65 - */ - virtual void __unk_vfn_65(); - /** - * @vftbl 66 - * @symbol __unk_vfn_66 - */ - virtual void __unk_vfn_66(); - /** - * @vftbl 67 - * @symbol __unk_vfn_67 - */ - virtual void __unk_vfn_67(); - /** - * @vftbl 68 - * @symbol __unk_vfn_68 - */ - virtual void __unk_vfn_68(); - /** - * @vftbl 69 - * @symbol __unk_vfn_69 - */ - virtual void __unk_vfn_69(); - /** - * @vftbl 70 - * @symbol __unk_vfn_70 - */ - virtual void __unk_vfn_70(); - /** - * @vftbl 71 - * @symbol __unk_vfn_71 - */ - virtual void __unk_vfn_71(); - /** - * @vftbl 72 - * @symbol __unk_vfn_72 - */ - virtual void __unk_vfn_72(); - /** - * @vftbl 73 - * @symbol __unk_vfn_73 - */ - virtual void __unk_vfn_73(); - /** - * @vftbl 74 - * @symbol __unk_vfn_74 - */ - virtual void __unk_vfn_74(); - /** - * @vftbl 75 - * @symbol ?write\@Int64Tag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - virtual void write(class IDataOutput &) const; /** * @symbol ??0ItemEventCoordinator\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp index f1692e8881..2a16cbface 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp @@ -36,25 +36,20 @@ class ItemFrameBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +60,11 @@ class ItemFrameBlock : public ActorBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@ItemFrameBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +77,9 @@ class ItemFrameBlock : public ActorBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@ItemFrameBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class ItemFrameBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class ItemFrameBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,85 +131,95 @@ class ItemFrameBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@ItemFrameBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 97 + * @vftbl 100 * @symbol ?getIgnoresDestroyPermissions\@ItemFrameBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool getIgnoresDestroyPermissions(class Actor &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@ItemFrameBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@ItemFrameBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -232,101 +232,101 @@ class ItemFrameBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 - * @symbol ?getComparatorSignal\@ItemFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @symbol __unk_vfn_125 */ - virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; + virtual void __unk_vfn_125(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 126 + * @symbol ?getComparatorSignal\@ItemFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ - virtual void __unk_vfn_127(); + virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getEntityResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getSpawnedItemName\@ItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ */ virtual class HashedString getSpawnedItemName() const; diff --git a/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp index 2e201a3dd3..168762c0eb 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp @@ -75,6 +75,11 @@ class ItemFrameBlockActor : public BlockActor { * @symbol ?getShadowRadius\@ItemFrameBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -101,17 +106,22 @@ class ItemFrameBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@ItemFrameBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@ItemFrameBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); @@ -130,13 +140,13 @@ class ItemFrameBlockActor : public BlockActor { */ MCAPI ItemFrameBlockActor(class BlockPos, enum class BlockActorType, std::string const &); /** - * @symbol ?actuallyDropItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z + * @symbol ?actuallyDropItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_NPEAVActor\@\@\@Z */ - MCAPI void actuallyDropItem(class BlockSource &, bool); + MCAPI void actuallyDropItem(class BlockSource &, bool, class Actor *); /** - * @symbol ?dropFramedItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z + * @symbol ?dropFramedItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_NPEAVActor\@\@\@Z */ - MCAPI void dropFramedItem(class BlockSource &, bool); + MCAPI void dropFramedItem(class BlockSource &, bool, class Actor *); /** * @symbol ?getFramedItem\@ItemFrameBlockActor\@\@QEBAAEBVItemInstance\@\@XZ */ @@ -146,13 +156,13 @@ class ItemFrameBlockActor : public BlockActor { */ MCAPI float getRotation(); /** - * @symbol ?rotateFramedItem\@ItemFrameBlockActor\@\@QEAAXXZ + * @symbol ?rotateFramedItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@AEAVActor\@\@\@Z */ - MCAPI void rotateFramedItem(); + MCAPI void rotateFramedItem(class BlockSource &, class Actor &); /** - * @symbol ?setItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVItemInstance\@\@\@Z + * @symbol ?setItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVItemInstance\@\@PEAVActor\@\@\@Z */ - MCAPI void setItem(class BlockSource &, class ItemInstance const &); + MCAPI void setItem(class BlockSource &, class ItemInstance const &, class Actor *); /** * @symbol ?updateNameTag\@ItemFrameBlockActor\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp index d2617e54ab..5fcadb3a43 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ItemFrameDropItemPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ItemFrameDropItemPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemFrameDropItemPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMFRAMEDROPITEMPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ItemInUseComponent.hpp b/LiteLoader/include/llapi/mc/ItemInUseComponent.hpp deleted file mode 100644 index b235a8970c..0000000000 --- a/LiteLoader/include/llapi/mc/ItemInUseComponent.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file ItemInUseComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure ItemInUseComponent. - * - */ -struct ItemInUseComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMINUSECOMPONENT -public: - struct ItemInUseComponent& operator=(struct ItemInUseComponent const &) = delete; - ItemInUseComponent(struct ItemInUseComponent const &) = delete; - ItemInUseComponent() = delete; -#endif - -public: - /** - * @symbol ??4ItemInUseComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct ItemInUseComponent & operator=(struct ItemInUseComponent &&); - /** - * @symbol ??1ItemInUseComponent\@\@QEAA\@XZ - */ - MCAPI ~ItemInUseComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemInstance.hpp b/LiteLoader/include/llapi/mc/ItemInstance.hpp index db549ed190..58ff7b6b17 100644 --- a/LiteLoader/include/llapi/mc/ItemInstance.hpp +++ b/LiteLoader/include/llapi/mc/ItemInstance.hpp @@ -53,6 +53,10 @@ class ItemInstance : public ItemStackBase { * @symbol ??0ItemInstance\@\@QEAA\@XZ */ MCAPI ItemInstance(); + /** + * @symbol ??0ItemInstance\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z + */ + MCAPI ItemInstance(class std::basic_string_view>, int, int, class CompoundTag const *); /** * @symbol ??0ItemInstance\@\@QEAA\@AEBV0\@\@Z */ @@ -61,18 +65,14 @@ class ItemInstance : public ItemStackBase { * @symbol ??0ItemInstance\@\@QEAA\@AEBVItemStackBase\@\@\@Z */ MCAPI ItemInstance(class ItemStackBase const &); - /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z - */ - MCAPI ItemInstance(class Block const &, int, class CompoundTag const *); /** * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z */ MCAPI ItemInstance(class BlockLegacy const &, int); /** - * @symbol ??0ItemInstance\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ - MCAPI ItemInstance(class std::basic_string_view>, int, int, class CompoundTag const *); + MCAPI ItemInstance(class Block const &, int, class CompoundTag const *); /** * @symbol ??0ItemInstance\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp b/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp index 118bf678d8..67a0ac34de 100644 --- a/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp @@ -61,14 +61,14 @@ class ItemRegistryRef { * @symbol ?getComplexAliasSplitNames\@ItemRegistryRef\@\@QEBAAEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@AEBVHashedString\@\@\@Z */ MCAPI std::vector> const & getComplexAliasSplitNames(class HashedString const &) const; - /** - * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z - */ - MCAPI class WeakPtr getItem(class HashedString const &) const; /** * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z */ MCAPI class WeakPtr getItem(short) const; + /** + * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class WeakPtr getItem(class HashedString const &) const; /** * @symbol ?getItemCount\@ItemRegistryRef\@\@QEBAHXZ */ @@ -118,17 +118,17 @@ class ItemRegistryRef { */ MCAPI class ItemRegistryRef::LockGuard lockItemWorldCompatibilityMutex() const; /** - * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ - MCAPI class WeakPtr lookupByName(int &, int &, class std::basic_string_view>) const; + MCAPI class WeakPtr lookupByName(class HashedString const &) const; /** * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class WeakPtr lookupByName(int &, class std::basic_string_view>) const; /** - * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class WeakPtr lookupByName(class HashedString const &) const; + MCAPI class WeakPtr lookupByName(int &, int &, class std::basic_string_view>) const; /** * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemReleaseChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemReleaseChargeEvent.hpp deleted file mode 100644 index 728fe4acb6..0000000000 --- a/LiteLoader/include/llapi/mc/ItemReleaseChargeEvent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file ItemReleaseChargeEvent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct ItemReleaseChargeEvent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMRELEASECHARGEEVENT -public: - struct ItemReleaseChargeEvent& operator=(struct ItemReleaseChargeEvent const &) = delete; - ItemReleaseChargeEvent(struct ItemReleaseChargeEvent const &) = delete; - ItemReleaseChargeEvent() = delete; -#endif - -public: - /** - * @symbol ??1ItemReleaseChargeEvent\@\@QEAA\@XZ - */ - MCAPI ~ItemReleaseChargeEvent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp index bd6d27f56a..2c03e00d1d 100644 --- a/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -36,9 +37,9 @@ class ItemReleaseInventoryTransaction { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?read\@ItemReleaseInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemReleaseInventoryTransaction\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual void read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 2 * @symbol ?write\@ItemReleaseInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/ItemReleaseUseEvent.hpp b/LiteLoader/include/llapi/mc/ItemReleaseUseEvent.hpp new file mode 100644 index 0000000000..c7a89893ea --- /dev/null +++ b/LiteLoader/include/llapi/mc/ItemReleaseUseEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ItemReleaseUseEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ItemReleaseUseEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMRELEASEUSEEVENT +public: + struct ItemReleaseUseEvent& operator=(struct ItemReleaseUseEvent const &) = delete; + ItemReleaseUseEvent(struct ItemReleaseUseEvent const &) = delete; + ItemReleaseUseEvent() = delete; +#endif + +public: + /** + * @symbol ??1ItemReleaseUseEvent\@\@QEAA\@XZ + */ + MCAPI ~ItemReleaseUseEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemStack.hpp b/LiteLoader/include/llapi/mc/ItemStack.hpp index 471e5e6deb..6c7a330def 100644 --- a/LiteLoader/include/llapi/mc/ItemStack.hpp +++ b/LiteLoader/include/llapi/mc/ItemStack.hpp @@ -105,14 +105,14 @@ class ItemStack : public ItemStackBase { */ MCVAPI ~ItemStack(); #endif - /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z - */ - MCAPI ItemStack(class ItemInstance const &); /** * @symbol ??0ItemStack\@\@QEAA\@AEBVRecipeIngredient\@\@\@Z */ MCAPI ItemStack(class RecipeIngredient const &); + /** + * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z + */ + MCAPI ItemStack(class ItemInstance const &); /** * @symbol ??0ItemStack\@\@QEAA\@XZ */ @@ -121,22 +121,22 @@ class ItemStack : public ItemStackBase { * @symbol ??0ItemStack\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ MCAPI ItemStack(class Item const &, int, int, class CompoundTag const *); - /** - * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ItemStack(class ItemStack const &); /** * @symbol ??0ItemStack\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z */ MCAPI ItemStack(class std::basic_string_view>, int, int, class CompoundTag const *); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ItemStack(class BlockLegacy const &, int); + MCAPI ItemStack(class ItemStack const &); /** * @symbol ??0ItemStack\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ MCAPI ItemStack(class Block const &, int, class CompoundTag const *); + /** + * @symbol ??0ItemStack\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z + */ + MCAPI ItemStack(class BlockLegacy const &, int); /** * @symbol ?_assignNetIdVariant\@ItemStack\@\@QEBAXAEBV1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackBase.hpp b/LiteLoader/include/llapi/mc/ItemStackBase.hpp index 87e560c47a..159e003e36 100644 --- a/LiteLoader/include/llapi/mc/ItemStackBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackBase.hpp @@ -252,14 +252,14 @@ class ItemStackBase { * @symbol ?getUseAnimation\@ItemStackBase\@\@QEBA?AW4UseAnimation\@\@XZ */ MCAPI enum class UseAnimation getUseAnimation() const; - /** - * @symbol ?getUserData\@ItemStackBase\@\@QEBAPEBVCompoundTag\@\@XZ - */ - MCAPI class CompoundTag const * getUserData() const; /** * @symbol ?getUserData\@ItemStackBase\@\@QEAAPEAVCompoundTag\@\@XZ */ MCAPI class CompoundTag * getUserData(); + /** + * @symbol ?getUserData\@ItemStackBase\@\@QEBAPEBVCompoundTag\@\@XZ + */ + MCAPI class CompoundTag const * getUserData() const; /** * @symbol ?getWasPickedUp\@ItemStackBase\@\@QEBA_NXZ */ @@ -292,14 +292,14 @@ class ItemStackBase { * @symbol ?hasSameUserData\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool hasSameUserData(class ItemStackBase const &) const; - /** - * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEBUItemTag\@\@\@Z - */ - MCAPI bool hasTag(struct ItemTag const &) const; /** * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEB_K\@Z */ MCAPI bool hasTag(unsigned __int64 const &) const; + /** + * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEBUItemTag\@\@\@Z + */ + MCAPI bool hasTag(struct ItemTag const &) const; /** * @symbol ?hasUserData\@ItemStackBase\@\@QEBA_NXZ */ @@ -368,6 +368,10 @@ class ItemStackBase { * @symbol ?isLiquidClipItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isLiquidClipItem() const; + /** + * @symbol ?isMusicDiscItem\@ItemStackBase\@\@QEBA_NXZ + */ + MCAPI bool isMusicDiscItem() const; /** * @symbol ?isNull\@ItemStackBase\@\@QEBA_NXZ */ @@ -376,6 +380,10 @@ class ItemStackBase { * @symbol ?isOffhandItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isOffhandItem() const; + /** + * @symbol ?isOneOfBlockInstances\@ItemStackBase\@\@QEBA_NAEBV?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@\@Z + */ + MCAPI bool isOneOfBlockInstances(std::vector> const &) const; /** * @symbol ?isOneOfBlockInstances\@ItemStackBase\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z */ @@ -464,14 +472,14 @@ class ItemStackBase { * @symbol ?resetHoverName\@ItemStackBase\@\@QEAAXXZ */ MCAPI void resetHoverName(); - /** - * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NHH\@Z - */ - MCAPI bool sameItem(int, int) const; /** * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@AEBUComparisonOptions\@1\@\@Z */ MCAPI bool sameItem(class ItemStackBase const &, struct ItemStackBase::ComparisonOptions const &) const; + /** + * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NHH\@Z + */ + MCAPI bool sameItem(int, int) const; /** * @symbol ?sameItemAndAux\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ @@ -544,6 +552,10 @@ class ItemStackBase { * @symbol ?setShowPickUp\@ItemStackBase\@\@QEAAX_N\@Z */ MCAPI void setShowPickUp(bool); + /** + * @symbol ?setStackSize\@ItemStackBase\@\@QEAAXE\@Z + */ + MCAPI void setStackSize(unsigned char); /** * @symbol ?setUserData\@ItemStackBase\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ @@ -622,14 +634,14 @@ class ItemStackBase { * @symbol ??0ItemStackBase\@\@IEAA\@XZ */ MCAPI ItemStackBase(); - /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlockLegacy\@\@H\@Z - */ - MCAPI ItemStackBase(class BlockLegacy const &, int); /** * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ MCAPI ItemStackBase(class Block const &, int, class CompoundTag const *); + /** + * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlockLegacy\@\@H\@Z + */ + MCAPI ItemStackBase(class BlockLegacy const &, int); /** * @symbol ??0ItemStackBase\@\@IEAA\@AEBVRecipeIngredient\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp index 6d8856034e..9869e61d19 100644 --- a/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp @@ -42,14 +42,14 @@ class ItemStackDescriptor : public ItemDescriptorCount { */ MCVAPI ~ItemStackDescriptor(); #endif - /** - * @symbol ??0ItemStackDescriptor\@\@QEAA\@XZ - */ - MCAPI ItemStackDescriptor(); /** * @symbol ??0ItemStackDescriptor\@\@QEAA\@AEBVItem\@\@HGPEBVCompoundTag\@\@\@Z */ MCAPI ItemStackDescriptor(class Item const &, int, unsigned short, class CompoundTag const *); + /** + * @symbol ??0ItemStackDescriptor\@\@QEAA\@XZ + */ + MCAPI ItemStackDescriptor(); /** * @symbol ??4ItemStackDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp index 4f2522ea7a..7d3ff51c73 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -47,9 +48,9 @@ struct ItemStackNetIdVariant { */ MCAPI ItemStackNetIdVariant(); /** - * @symbol ?deserialize\@ItemStackNetIdVariant\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@ItemStackNetIdVariant\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI void deserialize(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result deserialize(class ReadOnlyBinaryStream &); /** * @symbol ?hasServerNetId\@ItemStackNetIdVariant\@\@QEBA_NXZ */ @@ -58,10 +59,6 @@ struct ItemStackNetIdVariant { * @symbol ?isValid\@ItemStackNetIdVariant\@\@QEBA_NXZ */ MCAPI bool isValid() const; - /** - * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z - */ - MCAPI struct ItemStackNetIdVariant & operator=(class TypedClientNetId const &); /** * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ @@ -74,6 +71,10 @@ struct ItemStackNetIdVariant { * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z */ MCAPI struct ItemStackNetIdVariant & operator=(class TypedServerNetId const &); + /** + * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z + */ + MCAPI struct ItemStackNetIdVariant & operator=(class TypedClientNetId const &); /** * @symbol ??8ItemStackNetIdVariant\@\@QEBA_NAEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp index b742a88130..c54bf43996 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -74,9 +75,9 @@ class ItemStackRequestAction { */ MCAPI static std::string const getActionTypeName(enum class ItemStackRequestActionType); /** - * @symbol ?read\@ItemStackRequestAction\@\@SA?AV?$unique_ptr\@VItemStackRequestAction\@\@U?$default_delete\@VItemStackRequestAction\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemStackRequestAction\@\@SA?AV?$Result\@V?$unique_ptr\@VItemStackRequestAction\@\@U?$default_delete\@VItemStackRequestAction\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI static std::unique_ptr read(class ReadOnlyBinaryStream &); + MCAPI static class Bedrock::Result, class std::error_code> read(class ReadOnlyBinaryStream &); //private: diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp index dce09cb65b..71f169b6bc 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -56,8 +57,8 @@ class ItemStackRequestActionBeaconPayment { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionBeaconPayment\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionBeaconPayment\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp index f003157d4b..f0a2b88cc5 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA @@ -57,8 +58,8 @@ class ItemStackRequestActionConsume : public ItemStackRequestActionTransferBase virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp index 91d6cd6c51..c1cd6f7bd5 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -55,9 +56,9 @@ class ItemStackRequestActionCraftGrindstone { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftGrindstone\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCraftGrindstone\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @vftbl 6 * @symbol ?getRecipeNetId\@ItemStackRequestActionCraftGrindstone\@\@UEBAAEBUItemStackNetIdVariant\@\@XZ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp index 9aca49a46c..f1346fd659 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp @@ -33,10 +33,6 @@ class ItemStackRequestActionCraftHandler { * @symbol ??0ItemStackRequestActionCraftHandler\@\@QEAA\@AEAVItemStackRequestActionHandler\@\@AEAVPlayer\@\@\@Z */ MCAPI ItemStackRequestActionCraftHandler(class ItemStackRequestActionHandler &, class Player &); - /** - * @symbol ?_getOrInitSparseContainer\@ItemStackRequestActionCraftHandler\@\@QEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z - */ - MCAPI class std::shared_ptr _getOrInitSparseContainer(enum class ContainerEnumName); /** * @symbol ?_initCraftResults\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@E\@Z */ @@ -45,10 +41,6 @@ class ItemStackRequestActionCraftHandler { * @symbol ?_initSingleCraftResult\@ItemStackRequestActionCraftHandler\@\@QEAAPEAVItemInstance\@\@AEBV2\@\@Z */ MCAPI class ItemInstance * _initSingleCraftResult(class ItemInstance const &); - /** - * @symbol ?_validateRequestSlot\@ItemStackRequestActionCraftHandler\@\@QEAA?AUItemStackRequestHandlerSlotInfo\@\@AEBUItemStackRequestSlotInfo\@\@\@Z - */ - MCAPI struct ItemStackRequestHandlerSlotInfo _validateRequestSlot(struct ItemStackRequestSlotInfo const &); /** * @symbol ?endRequest\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp index 7631565d4d..6acaf58f5b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -55,9 +56,9 @@ class ItemStackRequestActionCraftLoom { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftLoom\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCraftLoom\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ItemStackRequestActionCraftLoom\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp index 9561b7c871..875f5b56d3 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -55,9 +56,9 @@ class ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING { virtual void __unk_vfn_4(); /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp index 077f80e7e8..27fc5e46b9 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -55,20 +56,12 @@ class ItemStackRequestActionCraftRecipeAuto { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftRecipeAuto\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCraftRecipeAuto\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ItemStackRequestActionCraftRecipeAuto\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftRecipeAuto(); - /** - * @symbol ?getIngredients\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAPEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const * getIngredients() const; - /** - * @symbol ?getNumCrafts\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAEXZ - */ - MCAPI unsigned char getNumCrafts() const; }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp index 90ed3e9061..b29282ee6d 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -55,9 +56,9 @@ class ItemStackRequestActionCraftRecipeOptional { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftRecipeOptional\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCraftRecipeOptional\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ItemStackRequestActionCraftRecipeOptional\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp index cc52bf75da..42d17db0e0 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp @@ -30,9 +30,9 @@ class ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTIONCRAFTRESULTS_DEPRECATEDASKTYLAING /** - * @symbol ?_read\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCVAPI bool _read(class ReadOnlyBinaryStream &); + MCVAPI class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ?_write\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@MEBAXAEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp index 61e508edd5..0a10a99953 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -56,9 +57,9 @@ class ItemStackRequestActionCreate { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCreate\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCreate\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ?getResultsIndex\@ItemStackRequestActionCreate\@\@QEBAEXZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp index 84e8c25ad6..51df6b832d 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA @@ -57,8 +58,8 @@ class ItemStackRequestActionDestroy : public ItemStackRequestActionTransferBase virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp index 5686e166f3..d2eaed7f97 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -56,8 +57,8 @@ class ItemStackRequestActionDrop { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionDrop\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionDrop\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp index 906c2c5d3b..f04e204948 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -58,9 +59,9 @@ enum class PreValidationStatus; virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionMineBlock\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionMineBlock\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ?getSrc\@ItemStackRequestActionMineBlock\@\@QEBA?AUItemStackRequestSlotInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp index ba0130d414..d7a03021ee 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA @@ -57,8 +58,8 @@ class ItemStackRequestActionPlace : public ItemStackRequestActionTransferBase { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp index 9aea5f1a56..f306766a1c 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA @@ -55,8 +56,8 @@ class ItemStackRequestActionPlaceInItemContainer : public ItemStackRequestAction virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp index c5de22dd8a..a6354bea60 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA @@ -57,8 +58,8 @@ class ItemStackRequestActionSwap : public ItemStackRequestActionTransferBase { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp index fca350bcc7..e83af92e3a 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA @@ -57,8 +58,8 @@ class ItemStackRequestActionTake : public ItemStackRequestActionTransferBase { virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp index ea4a687d66..4f42d63767 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "ItemStackRequestActionTransferBase.hpp" #define BEFORE_EXTRA @@ -55,8 +56,8 @@ class ItemStackRequestActionTakeFromItemContainer : public ItemStackRequestActio virtual void _write(class BinaryStream &) const; /** * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual bool _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp index 2b2fdbcdde..689bd0e540 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp @@ -31,9 +31,9 @@ class ItemStackRequestActionTransferBase { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTIONTRANSFERBASE /** - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCVAPI bool _read(class ReadOnlyBinaryStream &); + MCVAPI class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp index eefa092630..8ffec773c6 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -38,8 +39,8 @@ class ItemStackRequestBatch { */ MCAPI ~ItemStackRequestBatch(); /** - * @symbol ?read\@ItemStackRequestBatch\@\@SA?AV?$unique_ptr\@VItemStackRequestBatch\@\@U?$default_delete\@VItemStackRequestBatch\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemStackRequestBatch\@\@SA?AV?$Result\@V?$unique_ptr\@VItemStackRequestBatch\@\@U?$default_delete\@VItemStackRequestBatch\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI static std::unique_ptr read(class ReadOnlyBinaryStream &); + MCAPI static class Bedrock::Result, class std::error_code> read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp index 383858d533..f831616761 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -42,8 +43,8 @@ class ItemStackRequestData { */ MCAPI ~ItemStackRequestData(); /** - * @symbol ?read\@ItemStackRequestData\@\@SA?AV?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemStackRequestData\@\@SA?AV?$Result\@V?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI static std::unique_ptr read(class ReadOnlyBinaryStream &); + MCAPI static class Bedrock::Result, class std::error_code> read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp index 789af822c3..a94c8b21fb 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ItemStackRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ItemStackRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ItemStackRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp index 84cfb00dee..101269c267 100644 --- a/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp @@ -26,6 +26,10 @@ struct ItemStackResponseInfo { #endif public: + /** + * @symbol ??0ItemStackResponseInfo\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI ItemStackResponseInfo(struct ItemStackResponseInfo &&); /** * @symbol ??0ItemStackResponseInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp index aedf6b9a02..98082f005c 100644 --- a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ItemStackResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ItemStackResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackResponsePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKRESPONSEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ItemStartUseEvent.hpp b/LiteLoader/include/llapi/mc/ItemStartUseEvent.hpp new file mode 100644 index 0000000000..136c65b0af --- /dev/null +++ b/LiteLoader/include/llapi/mc/ItemStartUseEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ItemStartUseEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ItemStartUseEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMSTARTUSEEVENT +public: + struct ItemStartUseEvent& operator=(struct ItemStartUseEvent const &) = delete; + ItemStartUseEvent(struct ItemStartUseEvent const &) = delete; + ItemStartUseEvent() = delete; +#endif + +public: + /** + * @symbol ??1ItemStartUseEvent\@\@QEAA\@XZ + */ + MCAPI ~ItemStartUseEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemStopChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemStopChargeEvent.hpp deleted file mode 100644 index 48cdf751f2..0000000000 --- a/LiteLoader/include/llapi/mc/ItemStopChargeEvent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file ItemStopChargeEvent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct ItemStopChargeEvent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMSTOPCHARGEEVENT -public: - struct ItemStopChargeEvent& operator=(struct ItemStopChargeEvent const &) = delete; - ItemStopChargeEvent(struct ItemStopChargeEvent const &) = delete; - ItemStopChargeEvent() = delete; -#endif - -public: - /** - * @symbol ??1ItemStopChargeEvent\@\@QEAA\@XZ - */ - MCAPI ~ItemStopChargeEvent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemStopUseEvent.hpp b/LiteLoader/include/llapi/mc/ItemStopUseEvent.hpp new file mode 100644 index 0000000000..40f4eff43e --- /dev/null +++ b/LiteLoader/include/llapi/mc/ItemStopUseEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ItemStopUseEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ItemStopUseEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMSTOPUSEEVENT +public: + struct ItemStopUseEvent& operator=(struct ItemStopUseEvent const &) = delete; + ItemStopUseEvent(struct ItemStopUseEvent const &) = delete; + ItemStopUseEvent() = delete; +#endif + +public: + /** + * @symbol ??1ItemStopUseEvent\@\@QEAA\@XZ + */ + MCAPI ~ItemStopUseEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp index b2cde2c68f..21fdb2a388 100644 --- a/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp @@ -7,6 +7,7 @@ #include "llapi/Global.h" #include "ItemDescriptor.hpp" #include "Json.hpp" +#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -92,8 +93,8 @@ struct ItemTagDescriptor { */ virtual unsigned __int64 getHash() const; /** - * @symbol ?deserialize\@ItemTagDescriptor\@\@SA?AV?$unique_ptr\@UItemTagDescriptor\@\@U?$default_delete\@UItemTagDescriptor\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@ItemTagDescriptor\@\@SA?AV?$Result\@V?$unique_ptr\@UItemTagDescriptor\@\@U?$default_delete\@UItemTagDescriptor\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI static std::unique_ptr deserialize(class ReadOnlyBinaryStream &); + MCAPI static class Bedrock::Result, class std::error_code> deserialize(class ReadOnlyBinaryStream &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp index f36a83a831..b8f98a93aa 100644 --- a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp +++ b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp @@ -26,24 +26,24 @@ namespace ItemTransactionLogger { */ MCAPI void initializeLogger(bool); /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryAction\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStackResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void log(class InventoryAction const &, std::string const &); + MCAPI void log(class ItemStackResponsePacket const &, std::string const &); /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryTransactionPacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryAction\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void log(class InventoryTransactionPacket const &, std::string const &); + MCAPI void log(class InventoryAction const &, std::string const &); /** * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void log(class ItemStack const &, std::string const &); /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryTransactionPacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void log(std::string const &); + MCAPI void log(class InventoryTransactionPacket const &, std::string const &); /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStackResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void log(class ItemStackResponsePacket const &, std::string const &); + MCAPI void log(std::string const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp index 5702d48b9d..30d2fb5866 100644 --- a/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -36,9 +37,9 @@ enum class ActionType; virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?read\@ItemUseInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemUseInventoryTransaction\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual void read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 2 * @symbol ?write\@ItemUseInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp index dea3dcf912..1513ac47cf 100644 --- a/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -36,9 +37,9 @@ class ItemUseOnActorInventoryTransaction { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?read\@ItemUseOnActorInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemUseOnActorInventoryTransaction\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual void read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 2 * @symbol ?write\@ItemUseOnActorInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/JigsawBlock.hpp b/LiteLoader/include/llapi/mc/JigsawBlock.hpp index 43b5068c5f..526d38774f 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlock.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlock.hpp @@ -36,20 +36,10 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class JigsawBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class JigsawBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class JigsawBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 65 + * @vftbl 68 * @symbol ?canBeUsedInCommands\@JigsawBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,77 +181,82 @@ class JigsawBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 147 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 145 * @symbol ?getRenderBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@JigsawBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getFaceFlip\@JigsawBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@JigsawBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@JigsawBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp b/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp index a0f1fecded..2a0861a546 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp @@ -55,6 +55,11 @@ class JigsawBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -82,26 +87,31 @@ class JigsawBlockActor : public BlockActor { virtual void __unk_vfn_35(); /** * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 * @symbol ?getUgcStrings\@JigsawBlockActor\@\@UEBA?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\@\@AEBVCompoundTag\@\@\@Z */ virtual std::vector getUgcStrings(class CompoundTag const &) const; /** - * @vftbl 37 + * @vftbl 38 * @symbol ?setUgcStrings\@JigsawBlockActor\@\@UEBAXAEAVCompoundTag\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void setUgcStrings(class CompoundTag &, std::vector const &) const; /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** - * @vftbl 39 + * @vftbl 40 * @symbol ?_getUpdatePacket\@JigsawBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@JigsawBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/JigsawEditorData.hpp b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp index 3a09ee3eb3..b4eaddc5d7 100644 --- a/LiteLoader/include/llapi/mc/JigsawEditorData.hpp +++ b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp @@ -32,14 +32,14 @@ class JigsawEditorData { * @symbol ??0JigsawEditorData\@\@QEAA\@XZ */ MCAPI JigsawEditorData(); - /** - * @symbol ??0JigsawEditorData\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI JigsawEditorData(class JigsawEditorData &&); /** * @symbol ??0JigsawEditorData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000W4JigsawJointType\@\@\@Z */ MCAPI JigsawEditorData(std::string const &, std::string const &, std::string const &, std::string const &, enum class JigsawJointType); + /** + * @symbol ??0JigsawEditorData\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI JigsawEditorData(class JigsawEditorData &&); /** * @symbol ?getFinalBlock\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/JsonLoader.hpp b/LiteLoader/include/llapi/mc/JsonLoader.hpp deleted file mode 100644 index 5b98ad45e5..0000000000 --- a/LiteLoader/include/llapi/mc/JsonLoader.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file JsonLoader.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class JsonLoader. - * - */ -class JsonLoader { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_JSONLOADER -public: - class JsonLoader& operator=(class JsonLoader const &) = delete; - JsonLoader(class JsonLoader const &) = delete; - JsonLoader() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_JSONLOADER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~JsonLoader(); -#endif - -}; diff --git a/LiteLoader/include/llapi/mc/JsonSaver.hpp b/LiteLoader/include/llapi/mc/JsonSaver.hpp deleted file mode 100644 index f97100bd09..0000000000 --- a/LiteLoader/include/llapi/mc/JsonSaver.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file JsonSaver.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class JsonSaver. - * - */ -class JsonSaver { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_JSONSAVER -public: - class JsonSaver& operator=(class JsonSaver const &) = delete; - JsonSaver(class JsonSaver const &) = delete; - JsonSaver() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_JSONSAVER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~JsonSaver(); -#endif - /** - * @symbol ?toString\@JsonSaver\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string toString(); - -}; diff --git a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp index 75a1020e2d..a2f88f2aa6 100644 --- a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp @@ -36,20 +36,10 @@ class JukeboxBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class JukeboxBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class JukeboxBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class JukeboxBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class JukeboxBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,56 +115,66 @@ class JukeboxBlock : public ActorBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@JukeboxBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@JukeboxBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@JukeboxBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 - */ - virtual void __unk_vfn_81(); - /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -192,74 +187,79 @@ class JukeboxBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@JukeboxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@JukeboxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_JUKEBOXBLOCK /** * @symbol ?hasComparatorSignal\@JukeboxBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp b/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp index 867c7c6867..6e9a60db49 100644 --- a/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp @@ -121,10 +121,6 @@ class JukeboxBlockActor { MCAPI void stopPlayingRecord(class BlockSource &) const; //private: - /** - * @symbol ?_onChanged\@JukeboxBlockActor\@\@AEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@\@Z - */ - MCAPI void _onChanged(class BlockSource &, enum class LevelSoundEvent); /** * @symbol ?_spawnMusicParticles\@JukeboxBlockActor\@\@AEAAXAEAVLevel\@\@M\@Z */ diff --git a/LiteLoader/include/llapi/mc/JumpControlComponent.hpp b/LiteLoader/include/llapi/mc/JumpControlComponent.hpp index c680d1d10e..32d3892541 100644 --- a/LiteLoader/include/llapi/mc/JumpControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/JumpControlComponent.hpp @@ -66,10 +66,6 @@ class JumpControlComponent { * @symbol ??4JumpControlComponent\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class JumpControlComponent & operator=(class JumpControlComponent const &); - /** - * @symbol ??8JumpControlComponent\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class JumpControlComponent const &) const; /** * @symbol ?resetSpeedModifier\@JumpControlComponent\@\@QEAAXAEAVMob\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/JumpInfo.hpp b/LiteLoader/include/llapi/mc/JumpInfo.hpp index dfc88c53ca..19f4b68a40 100644 --- a/LiteLoader/include/llapi/mc/JumpInfo.hpp +++ b/LiteLoader/include/llapi/mc/JumpInfo.hpp @@ -49,9 +49,5 @@ class JumpInfo { * @symbol ?getJumpDelay\@JumpInfo\@\@QEBAHXZ */ MCAPI int getJumpDelay() const; - /** - * @symbol ??9JumpInfo\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator!=(class JumpInfo const &) const; }; diff --git a/LiteLoader/include/llapi/mc/JumpInputSystem.hpp b/LiteLoader/include/llapi/mc/JumpInputSystem.hpp index 7a75e9db9f..8c60487f8a 100644 --- a/LiteLoader/include/llapi/mc/JumpInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/JumpInputSystem.hpp @@ -35,9 +35,5 @@ class JumpInputSystem { * @symbol ?doJumpInputSystem\@JumpInputSystem\@\@SAXAEBVStrictEntityContext\@\@V?$optional_ref\@$$CBV?$FlagComponent\@UAutoJumpingFlag\@\@\@\@\@\@AEBUAbilitiesComponent\@\@AEBUMoveInputComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ MCAPI static void doJumpInputSystem(class StrictEntityContext const &, class optional_ref const>, struct AbilitiesComponent const &, struct MoveInputComponent const &, class EntityModifierT>); - /** - * @symbol ?tickJumpInputSystem\@JumpInputSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerInputRequestComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UAutoJumpingFlag\@\@\@\@\@\@$$CBUAbilitiesComponent\@\@$$CBUMoveInputComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void tickJumpInputSystem(class ViewT, class Optional const>, struct AbilitiesComponent const, struct MoveInputComponent const>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/KelpBlock.hpp b/LiteLoader/include/llapi/mc/KelpBlock.hpp index 6cd2f96db6..5748e30229 100644 --- a/LiteLoader/include/llapi/mc/KelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/KelpBlock.hpp @@ -36,25 +36,15 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@KelpBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class KelpBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class KelpBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class KelpBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,75 +121,85 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@KelpBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@KelpBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,82 +211,87 @@ class KelpBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@KelpBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@KelpBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@KelpBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/KickCommand.hpp b/LiteLoader/include/llapi/mc/KickCommand.hpp index 79b0462d37..99ecf62425 100644 --- a/LiteLoader/include/llapi/mc/KickCommand.hpp +++ b/LiteLoader/include/llapi/mc/KickCommand.hpp @@ -36,7 +36,7 @@ class KickCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@KickCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/KillCommand.hpp b/LiteLoader/include/llapi/mc/KillCommand.hpp index 73fbf20e21..266a477043 100644 --- a/LiteLoader/include/llapi/mc/KillCommand.hpp +++ b/LiteLoader/include/llapi/mc/KillCommand.hpp @@ -36,7 +36,7 @@ class KillCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@KillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp index 74d03ed84b..98cef8ccfc 100644 --- a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp @@ -161,6 +161,16 @@ class KnockbackArmorUpdater { virtual void __unk_vfn_25(); /** * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 27 + * @symbol __unk_vfn_27 + */ + virtual void __unk_vfn_27(); + /** + * @vftbl 28 * @symbol ?onEvent\@KnockbackArmorUpdater\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); diff --git a/LiteLoader/include/llapi/mc/KnockbackRules.hpp b/LiteLoader/include/llapi/mc/KnockbackRules.hpp index 1e8319fbc6..4752c54d53 100644 --- a/LiteLoader/include/llapi/mc/KnockbackRules.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackRules.hpp @@ -21,14 +21,14 @@ namespace KnockbackRules { // Add Member There #undef AFTER_EXTRA - /** - * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec3\@\@MM\@Z - */ - MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec3 const &, float, float); /** * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec2\@\@MM\@Z */ MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec2 const &, float, float); + /** + * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec3\@\@MM\@Z + */ + MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec3 const &, float, float); /** * @symbol ?getScaledKnockbackForce\@KnockbackRules\@\@YAMAEBVActor\@\@M\@Z */ diff --git a/LiteLoader/include/llapi/mc/LabTablePacket.hpp b/LiteLoader/include/llapi/mc/LabTablePacket.hpp index 11c03c9529..a91c10166e 100644 --- a/LiteLoader/include/llapi/mc/LabTablePacket.hpp +++ b/LiteLoader/include/llapi/mc/LabTablePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,23 +52,23 @@ class LabTablePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LabTablePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LabTablePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LABTABLEPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~LabTablePacket(); #endif - /** - * @symbol ??0LabTablePacket\@\@QEAA\@XZ - */ - MCAPI LabTablePacket(); /** * @symbol ??0LabTablePacket\@\@QEAA\@AEBVBlockPos\@\@W4LabTableReactionType\@\@\@Z */ MCAPI LabTablePacket(class BlockPos const &, enum class LabTableReactionType); + /** + * @symbol ??0LabTablePacket\@\@QEAA\@XZ + */ + MCAPI LabTablePacket(); /** * @symbol ??0LabTablePacket\@\@QEAA\@W4Type\@0\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LadderBlock.hpp b/LiteLoader/include/llapi/mc/LadderBlock.hpp index 46c621cb86..82e1a138f6 100644 --- a/LiteLoader/include/llapi/mc/LadderBlock.hpp +++ b/LiteLoader/include/llapi/mc/LadderBlock.hpp @@ -36,30 +36,25 @@ class LadderBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + /** + * @vftbl 12 + * @symbol ?getVisualShape\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + */ + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 14 * @symbol ?getLiquidClipVolume\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +65,11 @@ class LadderBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@LadderBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +82,9 @@ class LadderBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@LadderBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class LadderBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class LadderBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,65 +136,75 @@ class LadderBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 59 * @symbol ?sanitizeFillBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@LadderBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,70 +216,70 @@ class LadderBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LADDERBLOCK /** * @symbol ?canBeSilkTouched\@LadderBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/LanternBlock.hpp b/LiteLoader/include/llapi/mc/LanternBlock.hpp index 208de953e0..0963cc3e24 100644 --- a/LiteLoader/include/llapi/mc/LanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LanternBlock.hpp @@ -36,20 +36,15 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@LanternBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class LanternBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class LanternBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class LanternBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,70 +121,80 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 68 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@LanternBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 75 + * @vftbl 78 * @symbol ?movedByPiston\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@LanternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@LanternBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,82 +206,82 @@ class LanternBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@LanternBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@LanternBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/LargeFireball.hpp b/LiteLoader/include/llapi/mc/LargeFireball.hpp index 63c12fecef..b089dd5c82 100644 --- a/LiteLoader/include/llapi/mc/LargeFireball.hpp +++ b/LiteLoader/include/llapi/mc/LargeFireball.hpp @@ -37,110 +37,110 @@ class LargeFireball : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** * @symbol ??0LargeFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LavaMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/LavaMoveFinalizeSystem.hpp index e00c0d03b0..507ee0fce8 100644 --- a/LiteLoader/include/llapi/mc/LavaMoveFinalizeSystem.hpp +++ b/LiteLoader/include/llapi/mc/LavaMoveFinalizeSystem.hpp @@ -24,10 +24,6 @@ class LavaMoveFinalizeSystem { #endif public: - /** - * @symbol ?createLavaMoveFinalizeSideBySideSystem\@LavaMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createLavaMoveFinalizeSideBySideSystem(); /** * @symbol ?createLavaMoveFinalizeSystem\@LavaMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LavaMoveSystem.hpp b/LiteLoader/include/llapi/mc/LavaMoveSystem.hpp index 6d37393988..65bcaf218b 100644 --- a/LiteLoader/include/llapi/mc/LavaMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/LavaMoveSystem.hpp @@ -24,10 +24,6 @@ class LavaMoveSystem { #endif public: - /** - * @symbol ?createLavaMoveSideBySideSystem\@LavaMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createLavaMoveSideBySideSystem(); /** * @symbol ?createLavaMoveSystem\@LavaMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LavaSlime.hpp b/LiteLoader/include/llapi/mc/LavaSlime.hpp index bc44742ec2..36a3803800 100644 --- a/LiteLoader/include/llapi/mc/LavaSlime.hpp +++ b/LiteLoader/include/llapi/mc/LavaSlime.hpp @@ -42,162 +42,157 @@ class LavaSlime : public Slime { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 85 + * @vftbl 76 * @symbol ?getBrightness\@LavaSlime\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 102 + * @vftbl 91 * @symbol ?isOnFire\@LavaSlime\@\@MEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@LavaSlime\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@LavaSlime\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 336 - * @symbol ?jumpFromGround\@LavaSlime\@\@MEAAXAEBVIConstBlockSource\@\@\@Z - */ - virtual void jumpFromGround(class IConstBlockSource const &); - /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@LavaSlime\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; /** - * @vftbl 349 + * @vftbl 329 * @symbol ?doPlayLandSound\@LavaSlime\@\@MEAA_NXZ */ virtual bool doPlayLandSound(); /** - * @vftbl 352 + * @vftbl 332 * @symbol ?decreaseSquish\@LavaSlime\@\@MEAAXXZ */ virtual void decreaseSquish(); /** - * @vftbl 353 + * @vftbl 333 * @symbol ?createChild\@LavaSlime\@\@MEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@H\@Z */ virtual class OwnerPtrT createChild(int); diff --git a/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp b/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp index 3ac7cfd990..e4cfa63712 100644 --- a/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp @@ -28,9 +28,5 @@ class LavaTravelSystem { * @symbol ?createLavaTravelSystem\@LavaTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createLavaTravelSystem(); - /** - * @symbol ?tickLavaTravelSystem\@LavaTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@ULavaTravelFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@UMobTravelComponent\@\@\@\@\@Z - */ - MCAPI static void tickLavaTravelSystem(class ViewT, class FlagComponent, class FlagComponent>, struct AttributesComponent const, struct MobTravelComponent>); }; diff --git a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp index ae5f99d253..33275e4d09 100644 --- a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp +++ b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp @@ -108,10 +108,6 @@ class LayeredAbilities { * @symbol ?DIFF_LAYER_AT\@LayeredAbilities\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_LAYER_AT; - /** - * @symbol ?getDiff\@LayeredAbilities\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z - */ - MCAPI static class std::optional getDiff(class LayeredAbilities const &, class LayeredAbilities const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/LeadItem.hpp b/LiteLoader/include/llapi/mc/LeadItem.hpp index db44e88170..a7fa4d3253 100644 --- a/LiteLoader/include/llapi/mc/LeadItem.hpp +++ b/LiteLoader/include/llapi/mc/LeadItem.hpp @@ -52,10 +52,10 @@ class LeadItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,7 @@ class LeadItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@LeadItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp b/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp index 54713067ee..5f34f1230c 100644 --- a/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp +++ b/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp @@ -47,162 +47,162 @@ class LeashFenceKnotActor : public HangingActor { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@LeashFenceKnotActor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@LeashFenceKnotActor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@LeashFenceKnotActor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 222 + * @vftbl 209 * @symbol ?getInteraction\@LeashFenceKnotActor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@LeashFenceKnotActor\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@LeashFenceKnotActor\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@LeashFenceKnotActor\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?setDir\@LeashFenceKnotActor\@\@UEAAXH\@Z */ virtual void setDir(int); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getWidth() const; /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getHeight() const; /** - * @vftbl 271 + * @vftbl 257 * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ */ virtual void dropItem(); /** - * @vftbl 273 + * @vftbl 259 * @symbol ?wouldSurvive\@LeashFenceKnotActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool wouldSurvive(class BlockSource &); @@ -214,5 +214,9 @@ class LeashFenceKnotActor : public HangingActor { * @symbol ?numberofAnimalsAttached\@LeashFenceKnotActor\@\@QEAAHXZ */ MCAPI int numberofAnimalsAttached(); + /** + * @symbol ?removeAnimals\@LeashFenceKnotActor\@\@QEAAXXZ + */ + MCAPI void removeAnimals(); }; diff --git a/LiteLoader/include/llapi/mc/LeavesBlock.hpp b/LiteLoader/include/llapi/mc/LeavesBlock.hpp index a0484c8f32..f7b2ae8544 100644 --- a/LiteLoader/include/llapi/mc/LeavesBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeavesBlock.hpp @@ -31,30 +31,20 @@ class LeavesBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@LeavesBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 24 + * @vftbl 27 * @symbol ?canProvideMultifaceSupport\@LeavesBlock\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideMultifaceSupport(class Block const &, unsigned char) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class LeavesBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class LeavesBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class LeavesBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class LeavesBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +121,70 @@ class LeavesBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@LeavesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@LeavesBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@LeavesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@LeavesBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,102 +196,107 @@ class LeavesBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 135 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 136 * @symbol ?getColor\@LeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 + * @vftbl 139 * @symbol ?isSeasonTinted\@LeavesBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@LeavesBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@LeavesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@LeavesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@LeavesBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@LeavesBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@LeavesBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@LeavesBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getExtraResourceItem\@LeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/LeavesBlockItem.hpp b/LiteLoader/include/llapi/mc/LeavesBlockItem.hpp index 3ab7146502..29dbb009e5 100644 --- a/LiteLoader/include/llapi/mc/LeavesBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/LeavesBlockItem.hpp @@ -47,10 +47,10 @@ class LeavesBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@LeavesBlockItem\@\@UEBAHH\@Z diff --git a/LiteLoader/include/llapi/mc/LecternBlock.hpp b/LiteLoader/include/llapi/mc/LecternBlock.hpp index 9616e118b1..f152997847 100644 --- a/LiteLoader/include/llapi/mc/LecternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LecternBlock.hpp @@ -36,25 +36,15 @@ class LecternBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@LecternBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class LecternBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class LecternBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class LecternBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class LecternBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,81 +120,91 @@ class LecternBlock : public ActorBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 * @symbol ?isSignalSource\@LecternBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@LecternBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@LecternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@LecternBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@LecternBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@LecternBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -222,74 +217,79 @@ class LecternBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@LecternBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNBLOCK /** * @symbol ?hasComparatorSignal\@LecternBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp index 99b1e98d59..10e4c4bbe0 100644 --- a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class LecternUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LecternUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LecternUpdatePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNUPDATEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/LegacyDyeItem.hpp b/LiteLoader/include/llapi/mc/LegacyDyeItem.hpp new file mode 100644 index 0000000000..a1dfaa1b0c --- /dev/null +++ b/LiteLoader/include/llapi/mc/LegacyDyeItem.hpp @@ -0,0 +1,119 @@ +/** + * @file LegacyDyeItem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Json.hpp" +#include "DyePowderItem.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LegacyDyeItem : public DyePowderItem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEGACYDYEITEM +public: + class LegacyDyeItem& operator=(class LegacyDyeItem const &) = delete; + LegacyDyeItem(class LegacyDyeItem const &) = delete; + LegacyDyeItem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 19 + * @symbol ?isDye\@LegacyDyeItem\@\@UEBA_NXZ + */ + virtual bool isDye() const; + /** + * @vftbl 21 + * @symbol __unk_vfn_21 + */ + virtual void __unk_vfn_21(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 66 + * @symbol __unk_vfn_66 + */ + virtual void __unk_vfn_66(); + /** + * @vftbl 70 + * @symbol __unk_vfn_70 + */ + virtual void __unk_vfn_70(); + /** + * @vftbl 71 + * @symbol __unk_vfn_71 + */ + virtual void __unk_vfn_71(); + /** + * @vftbl 72 + * @symbol __unk_vfn_72 + */ + virtual void __unk_vfn_72(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 79 + * @symbol __unk_vfn_79 + */ + virtual void __unk_vfn_79(); + /** + * @vftbl 80 + * @symbol __unk_vfn_80 + */ + virtual void __unk_vfn_80(); + /** + * @vftbl 115 + * @symbol __unk_vfn_115 + */ + virtual void __unk_vfn_115(); + /** + * @vftbl 116 + * @symbol __unk_vfn_116 + */ + virtual void __unk_vfn_116(); + /** + * @symbol ??0LegacyDyeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemColor\@\@_N\@Z + */ + MCAPI LegacyDyeItem(std::string const &, int, enum class ItemColor, bool); + +}; diff --git a/LiteLoader/include/llapi/mc/LegacyTelemetryEventPacket.hpp b/LiteLoader/include/llapi/mc/LegacyTelemetryEventPacket.hpp new file mode 100644 index 0000000000..d622f84d22 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LegacyTelemetryEventPacket.hpp @@ -0,0 +1,133 @@ +/** + * @file LegacyTelemetryEventPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" +#include "MinecraftEventing.hpp" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LegacyTelemetryEventPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEGACYTELEMETRYEVENTPACKET +public: + class LegacyTelemetryEventPacket& operator=(class LegacyTelemetryEventPacket const &) = delete; + LegacyTelemetryEventPacket(class LegacyTelemetryEventPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@LegacyTelemetryEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@LegacyTelemetryEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@LegacyTelemetryEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 7 + * @symbol ?_read\@LegacyTelemetryEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEGACYTELEMETRYEVENTPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LegacyTelemetryEventPacket(); +#endif + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ActorType\@\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, std::string, int, enum class ActorType); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, int, class gsl::not_null); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const &, std::string const &, int); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@FIF\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, short, unsigned int, short); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, std::string const &, int, int, std::string const &); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@AEBVPlayer\@\@W4MovementEventType\@\@MMMMM\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@_N\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, enum class MinecraftEventing::AchievementIds, bool); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const &, std::string const &); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@AEBUData\@0\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, struct LegacyTelemetryEventPacket::Data const &); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@XZ + */ + MCAPI LegacyTelemetryEventPacket(); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, class gsl::not_null); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@AEBVRaid\@\@_N\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, class Raid const &, bool); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVActor\@\@\@gsl\@\@W4InteractionType\@MinecraftEventing\@\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, class gsl::not_null, enum class MinecraftEventing::InteractionType); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, class AutomaticID); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, class AutomaticID, class AutomaticID); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@W4ActorType\@\@\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, enum class ActorType); + /** + * @symbol ??0LegacyTelemetryEventPacket\@\@QEAA\@PEBVPlayer\@\@HHW4ActorDamageCause\@\@_N\@Z + */ + MCAPI LegacyTelemetryEventPacket(class Player const *, int, int, enum class ActorDamageCause, bool); + /** + * @symbol ??4LegacyTelemetryEventPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z + */ + MCAPI class LegacyTelemetryEventPacket & operator=(class LegacyTelemetryEventPacket &&); + +}; diff --git a/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp b/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp index 77b785a8b4..b148a41163 100644 --- a/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp @@ -61,9 +61,9 @@ class LegacyTradeableComponent { */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?getLastPlayerTradeName\@LegacyTradeableComponent\@\@QEBAPEBVPlayer\@\@XZ + * @symbol ?getLastPlayerTradeID\@LegacyTradeableComponent\@\@QEBA?BUActorUniqueID\@\@XZ */ - MCAPI class Player const * getLastPlayerTradeName() const; + MCAPI struct ActorUniqueID const getLastPlayerTradeID() const; /** * @symbol ?getOffers\@LegacyTradeableComponent\@\@QEAAPEAVMerchantRecipeList\@\@AEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LessonCommand.hpp b/LiteLoader/include/llapi/mc/LessonCommand.hpp index 920e487ee0..e2d3e1cfd5 100644 --- a/LiteLoader/include/llapi/mc/LessonCommand.hpp +++ b/LiteLoader/include/llapi/mc/LessonCommand.hpp @@ -34,7 +34,7 @@ class LessonCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@LessonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp index 7f384dbb6d..2322093b29 100644 --- a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp +++ b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class LessonProgressPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LessonProgressPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LessonProgressPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LESSONPROGRESSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Level.hpp b/LiteLoader/include/llapi/mc/Level.hpp index 7485c4bd2c..9086dc260b 100644 --- a/LiteLoader/include/llapi/mc/Level.hpp +++ b/LiteLoader/include/llapi/mc/Level.hpp @@ -270,10 +270,6 @@ class Level { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVEL - /** - * @symbol ?_checkUserStorage\@Level\@\@UEAAXXZ - */ - MCVAPI void _checkUserStorage(); /** * @symbol ?_clientHandleAddOwnedEntity\@Level\@\@UEAA?AV?$StackRefResultT\@UEntityRefTraits\@\@\@\@VEntityNetId\@\@\@Z */ @@ -370,10 +366,6 @@ class Level { * @symbol ?animateTick\@Level\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void animateTick(class Actor &); - /** - * @symbol ?applyLiquidPhysicsToActor\@Level\@\@UEAA_NPEAVActor\@\@W4MaterialType\@\@\@Z - */ - MCVAPI bool applyLiquidPhysicsToActor(class Actor *, enum class MaterialType); /** * @symbol ?asLevel\@Level\@\@UEAAPEAV1\@XZ */ @@ -383,17 +375,17 @@ class Level { */ MCVAPI bool blockNetworkIdsAreHashes(); /** - * @symbol ?broadcastActorEvent\@Level\@\@UEAAXAEAVActor\@\@W4ActorEvent\@\@H\@Z + * @symbol ?broadcastActorEvent\@Level\@\@UEBAXAEAVActor\@\@W4ActorEvent\@\@H\@Z */ - MCVAPI void broadcastActorEvent(class Actor &, enum class ActorEvent, int); - /** - * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@HPEBVUserEntityIdentifierComponent\@\@\@Z - */ - MCVAPI void broadcastLevelEvent(enum class LevelEvent, class Vec3 const &, int, class UserEntityIdentifierComponent const *); + MCVAPI void broadcastActorEvent(class Actor &, enum class ActorEvent, int) const; /** * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@PEBVUserEntityIdentifierComponent\@\@\@Z */ MCVAPI void broadcastLevelEvent(enum class LevelEvent, class CompoundTag const &, class UserEntityIdentifierComponent const *); + /** + * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@HPEBVUserEntityIdentifierComponent\@\@\@Z + */ + MCVAPI void broadcastLevelEvent(enum class LevelEvent, class Vec3 const &, int, class UserEntityIdentifierComponent const *); /** * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z */ @@ -426,14 +418,14 @@ class Level { * @symbol ?countUsersWithMatchingNetworkId\@Level\@\@UEBAHAEBVNetworkIdentifier\@\@\@Z */ MCVAPI int countUsersWithMatchingNetworkId(class NetworkIdentifier const &) const; - /** - * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z - */ - MCVAPI class MapItemSavedData & createMapSavedData(std::vector const &, class BlockPos const &, class AutomaticID, int); /** * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z */ MCVAPI class MapItemSavedData & createMapSavedData(struct ActorUniqueID const &, class BlockPos const &, class AutomaticID, int); + /** + * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z + */ + MCVAPI class MapItemSavedData & createMapSavedData(std::vector const &, class BlockPos const &, class AutomaticID, int); /** * @symbol ?createPhotoStorage\@Level\@\@UEAAXXZ */ @@ -450,10 +442,6 @@ class Level { * @symbol ?destroyBlock\@Level\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCVAPI bool destroyBlock(class BlockSource &, class BlockPos const &, bool); - /** - * @symbol ?digestServerBlockProperties\@Level\@\@UEAAXAEBVStartGamePacket\@\@I\@Z - */ - MCVAPI void digestServerBlockProperties(class StartGamePacket const &, unsigned int); /** * @symbol ?digestServerItemComponents\@Level\@\@UEAAXAEBVItemComponentPacket\@\@\@Z */ @@ -506,22 +494,22 @@ class Level { * @symbol ?flushRunTimeLighting\@Level\@\@UEAAXXZ */ MCVAPI void flushRunTimeLighting(); - /** - * @symbol ?forEachDimension\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVDimension\@\@\@Z\@std\@\@\@Z - */ - MCVAPI void forEachDimension(class std::function) const; /** * @symbol ?forEachDimension\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVDimension\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachDimension(class std::function); /** - * @symbol ?forEachPlayer\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachDimension\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVDimension\@\@\@Z\@std\@\@\@Z */ - MCVAPI void forEachPlayer(class std::function); + MCVAPI void forEachDimension(class std::function) const; /** * @symbol ?forEachPlayer\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPlayer(class std::function) const; + /** + * @symbol ?forEachPlayer\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z + */ + MCVAPI void forEachPlayer(class std::function); /** * @symbol ?forEachUser\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z */ @@ -594,22 +582,30 @@ class Level { * @symbol ?getArmorTrimUnloader\@Level\@\@UEAAPEAVArmorTrimUnloader\@\@XZ */ MCVAPI class ArmorTrimUnloader * getArmorTrimUnloader(); + /** + * @symbol ?getAutomationBehaviorTreeGroup\@Level\@\@UEBAAEAVAutomationBehaviorTreeGroup\@\@XZ + */ + MCVAPI class AutomationBehaviorTreeGroup & getAutomationBehaviorTreeGroup() const; /** * @symbol ?getBehaviorFactory\@Level\@\@UEBAAEAVBehaviorFactory\@\@XZ */ MCVAPI class BehaviorFactory & getBehaviorFactory() const; /** - * @symbol ?getBehaviorTreeGroup\@Level\@\@UEBAAEAVBehaviorTreeGroup\@\@XZ + * @symbol ?getBiomeComponentFactory\@Level\@\@UEAAAEAVBiomeComponentFactory\@\@XZ */ - MCVAPI class BehaviorTreeGroup & getBehaviorTreeGroup() const; + MCVAPI class BiomeComponentFactory & getBiomeComponentFactory(); /** * @symbol ?getBiomeComponentFactory\@Level\@\@UEBAAEBVBiomeComponentFactory\@\@XZ */ MCVAPI class BiomeComponentFactory const & getBiomeComponentFactory() const; /** - * @symbol ?getBiomeComponentFactory\@Level\@\@UEAAAEAVBiomeComponentFactory\@\@XZ + * @symbol ?getBiomeManager\@Level\@\@UEAAAEAVBiomeManager\@\@XZ */ - MCVAPI class BiomeComponentFactory & getBiomeComponentFactory(); + MCVAPI class BiomeManager & getBiomeManager(); + /** + * @symbol ?getBiomeManager\@Level\@\@UEBAAEBVBiomeManager\@\@XZ + */ + MCVAPI class BiomeManager const & getBiomeManager() const; /** * @symbol ?getBiomeRegistry\@Level\@\@UEAAAEAVBiomeRegistry\@\@XZ */ @@ -618,14 +614,14 @@ class Level { * @symbol ?getBiomeRegistry\@Level\@\@UEBAAEBVBiomeRegistry\@\@XZ */ MCVAPI class BiomeRegistry const & getBiomeRegistry() const; - /** - * @symbol ?getBlockComponentFactory\@Level\@\@UEAAAEAVBlockComponentFactory\@\@XZ - */ - MCVAPI class BlockComponentFactory & getBlockComponentFactory(); /** * @symbol ?getBlockComponentFactory\@Level\@\@UEBAAEBVBlockComponentFactory\@\@XZ */ MCVAPI class BlockComponentFactory const & getBlockComponentFactory() const; + /** + * @symbol ?getBlockComponentFactory\@Level\@\@UEAAAEAVBlockComponentFactory\@\@XZ + */ + MCVAPI class BlockComponentFactory & getBlockComponentFactory(); /** * @symbol ?getBlockDefinitions\@Level\@\@UEBAPEAVBlockDefinitionGroup\@\@XZ */ @@ -634,14 +630,14 @@ class Level { * @symbol ?getBlockEventCoordinator\@Level\@\@UEAAAEAVBlockEventCoordinator\@\@XZ */ MCVAPI class BlockEventCoordinator & getBlockEventCoordinator(); - /** - * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ - */ - MCVAPI class BlockPalette const & getBlockPalette() const; /** * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ */ MCVAPI class BlockPalette & getBlockPalette(); + /** + * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ + */ + MCVAPI class BlockPalette const & getBlockPalette() const; /** * @symbol ?getBlockReducer\@Level\@\@UEBAPEAVBlockReducer\@\@XZ */ @@ -654,14 +650,14 @@ class Level { * @symbol ?getBossEventSubscriptionManager\@Level\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VBossEventSubscriptionManager\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null> getBossEventSubscriptionManager(); - /** - * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ - */ - MCVAPI class CameraPresets const & getCameraPresets() const; /** * @symbol ?getCameraPresets\@Level\@\@UEAAAEAVCameraPresets\@\@XZ */ MCVAPI class CameraPresets & getCameraPresets(); + /** + * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ + */ + MCVAPI class CameraPresets const & getCameraPresets() const; /** * @symbol ?getCapabilities\@Level\@\@UEBAAEBUISharedController\@PlayerCapabilities\@\@XZ */ @@ -702,14 +698,14 @@ class Level { * @symbol ?getDefaultGameType\@Level\@\@UEBA?AW4GameType\@\@XZ */ MCVAPI enum class GameType getDefaultGameType() const; - /** - * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ - */ - MCVAPI class PermissionsHandler const & getDefaultPermissions() const; /** * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ */ MCVAPI class PermissionsHandler & getDefaultPermissions(); + /** + * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ + */ + MCVAPI class PermissionsHandler const & getDefaultPermissions() const; /** * @symbol ?getDefaultSpawn\@Level\@\@UEBAAEBVBlockPos\@\@XZ */ @@ -726,22 +722,22 @@ class Level { * @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\@\@UEAAAEAVDimensionManager\@\@XZ + * @symbol ?getDimensionFactory\@Level\@\@UEAAAEAV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ */ - MCVAPI class DimensionManager & getDimensionManager(); + MCVAPI class OwnerPtrFactory & getDimensionFactory(); /** * @symbol ?getDimensionManager\@Level\@\@UEBAAEBVDimensionManager\@\@XZ */ MCVAPI class DimensionManager const & getDimensionManager() const; + /** + * @symbol ?getDimensionManager\@Level\@\@UEAAAEAVDimensionManager\@\@XZ + */ + MCVAPI class DimensionManager & getDimensionManager(); /** * @symbol ?getDisablePlayerInteractions\@Level\@\@UEBA_NXZ */ @@ -790,14 +786,14 @@ class Level { * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ */ MCVAPI class FeatureTypeFactory const & getFeatureTypeFactory() const; - /** - * @symbol ?getGameRules\@Level\@\@UEAAAEAVGameRules\@\@XZ - */ - MCVAPI class GameRules & getGameRules(); /** * @symbol ?getGameRules\@Level\@\@UEBAAEBVGameRules\@\@XZ */ MCVAPI class GameRules const & getGameRules() const; + /** + * @symbol ?getGameRules\@Level\@\@UEAAAEAVGameRules\@\@XZ + */ + MCVAPI class GameRules & getGameRules(); /** * @symbol ?getHitResult\@Level\@\@UEAAAEAVHitResult\@\@XZ */ @@ -822,14 +818,14 @@ class Level { * @symbol ?getItemRegistry\@Level\@\@UEBA?AVItemRegistryRef\@\@XZ */ MCVAPI class ItemRegistryRef getItemRegistry() const; - /** - * @symbol ?getJigsawStructureRegistry\@Level\@\@UEAAAEAVJigsawStructureRegistry\@\@XZ - */ - MCVAPI class JigsawStructureRegistry & getJigsawStructureRegistry(); /** * @symbol ?getJigsawStructureRegistry\@Level\@\@UEBAAEBVJigsawStructureRegistry\@\@XZ */ MCVAPI class JigsawStructureRegistry const & getJigsawStructureRegistry() const; + /** + * @symbol ?getJigsawStructureRegistry\@Level\@\@UEAAAEAVJigsawStructureRegistry\@\@XZ + */ + MCVAPI class JigsawStructureRegistry & getJigsawStructureRegistry(); /** * @symbol ?getLANBroadcast\@Level\@\@UEBA_NXZ */ @@ -890,10 +886,6 @@ class Level { * @symbol ?getLootTables\@Level\@\@UEAAAEAVLootTables\@\@XZ */ MCVAPI class LootTables & getLootTables(); - /** - * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@UActorUniqueID\@\@\@Z - */ - MCVAPI class MapItemSavedData * getMapSavedData(struct ActorUniqueID); /** * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@AEBVCompoundTag\@\@\@Z */ @@ -902,6 +894,10 @@ class Level { * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@PEBVCompoundTag\@\@\@Z */ MCVAPI class MapItemSavedData * getMapSavedData(class CompoundTag const *); + /** + * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@UActorUniqueID\@\@\@Z + */ + MCVAPI class MapItemSavedData * getMapSavedData(struct ActorUniqueID); /** * @symbol ?getMob\@Level\@\@UEBAPEAVMob\@\@UActorUniqueID\@\@\@Z */ @@ -963,17 +959,17 @@ class Level { */ MCVAPI class Player * getPlatformPlayer(std::string const &) const; /** - * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@UActorUniqueID\@\@\@Z + * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBVUUID\@mce\@\@\@Z */ - MCVAPI class Player * getPlayer(struct ActorUniqueID) const; + MCVAPI class Player * getPlayer(class mce::UUID const &) const; /** * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class Player * getPlayer(std::string const &) const; /** - * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@UActorUniqueID\@\@\@Z */ - MCVAPI class Player * getPlayer(class mce::UUID const &) const; + MCVAPI class Player * getPlayer(struct ActorUniqueID) const; /** * @symbol ?getPlayerAbilities\@Level\@\@UEAAPEAVLayeredAbilities\@\@AEBUActorUniqueID\@\@\@Z */ @@ -990,14 +986,14 @@ class Level { * @symbol ?getPlayerFromServerId\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class Player * getPlayerFromServerId(std::string const &) 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 class std::unordered_map, struct std::equal_to, class std::allocator>> & 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 class std::unordered_map, struct std::equal_to, class std::allocator>> 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 class std::unordered_map, struct std::equal_to, class std::allocator>> & getPlayerList(); /** * @symbol ?getPlayerMovementSettings\@Level\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ @@ -1182,14 +1178,14 @@ class Level { * @symbol ?getTradeTables\@Level\@\@UEAAPEAVTradeTables\@\@XZ */ MCVAPI class TradeTables * getTradeTables(); - /** - * @symbol ?getTrimMaterialRegistry\@Level\@\@UEAA?AV?$weak_ptr\@VTrimMaterialRegistry\@\@\@std\@\@XZ - */ - MCVAPI class std::weak_ptr getTrimMaterialRegistry(); /** * @symbol ?getTrimMaterialRegistry\@Level\@\@UEBA?AV?$weak_ptr\@$$CBVTrimMaterialRegistry\@\@\@std\@\@XZ */ MCVAPI class std::weak_ptr getTrimMaterialRegistry() const; + /** + * @symbol ?getTrimMaterialRegistry\@Level\@\@UEAA?AV?$weak_ptr\@VTrimMaterialRegistry\@\@\@std\@\@XZ + */ + MCVAPI class std::weak_ptr getTrimMaterialRegistry(); /** * @symbol ?getTrimPatternRegistry\@Level\@\@UEBA?AV?$weak_ptr\@$$CBVTrimPatternRegistry\@\@\@std\@\@XZ */ @@ -1210,14 +1206,14 @@ class Level { * @symbol ?getUsers\@Level\@\@UEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector> const & getUsers() const; - /** - * @symbol ?getWorldRegistriesProvider\@Level\@\@UEBAAEBVIWorldRegistriesProvider\@\@XZ - */ - MCVAPI class IWorldRegistriesProvider const & getWorldRegistriesProvider() const; /** * @symbol ?getWorldRegistriesProvider\@Level\@\@UEAAAEAVIWorldRegistriesProvider\@\@XZ */ MCVAPI class IWorldRegistriesProvider & getWorldRegistriesProvider(); + /** + * @symbol ?getWorldRegistriesProvider\@Level\@\@UEBAAEBVIWorldRegistriesProvider\@\@XZ + */ + MCVAPI class IWorldRegistriesProvider const & getWorldRegistriesProvider() const; /** * @symbol ?getXBLBroadcastIntent\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ */ @@ -1375,33 +1371,33 @@ class Level { */ MCVAPI void playSound(class AutomaticID, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z + * @symbol ?playSound\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ - MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); + MCVAPI void playSound(std::string const &, class Vec3 const &, float, float); /** * @symbol ?playSound\@Level\@\@UEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ MCVAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSound\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z + * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z */ - MCVAPI void playSound(std::string const &, class Vec3 const &, float, float); + MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); /** * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z */ - MCVAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z + * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ - MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?potionSplash\@Level\@\@UEAAXAEBVVec3\@\@AEBVColor\@mce\@\@_N\@Z */ @@ -1434,14 +1430,14 @@ class Level { * @symbol ?removeDisplayEntity\@Level\@\@UEAAXVWeakEntityRef\@\@\@Z */ MCVAPI void removeDisplayEntity(class WeakEntityRef); - /** - * @symbol ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEAVActor\@\@\@Z - */ - MCVAPI class OwnerPtrT removeEntity(class Actor &); /** * @symbol ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z */ MCVAPI class OwnerPtrT removeEntity(class WeakEntityRef); + /** + * @symbol ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEAVActor\@\@\@Z + */ + MCVAPI class OwnerPtrT removeEntity(class Actor &); /** * @symbol ?removeListener\@Level\@\@UEAAXAEAVLevelListener\@\@\@Z */ @@ -1474,22 +1470,6 @@ class Level { * @symbol ?save\@Level\@\@UEAAXXZ */ MCVAPI void save(); - /** - * @symbol ?saveAdditionalData\@Level\@\@UEAAXXZ - */ - MCVAPI void saveAdditionalData(); - /** - * @symbol ?saveBiomeData\@Level\@\@UEAAXXZ - */ - MCVAPI void saveBiomeData(); - /** - * @symbol ?saveDirtyChunks\@Level\@\@UEAAXXZ - */ - MCVAPI void saveDirtyChunks(); - /** - * @symbol ?saveEducationLevelSettings\@Level\@\@UEAAXXZ - */ - MCVAPI void saveEducationLevelSettings(); /** * @symbol ?saveGameData\@Level\@\@UEAAXXZ */ @@ -1498,14 +1478,6 @@ class Level { * @symbol ?saveLevelData\@Level\@\@UEAAXXZ */ MCVAPI void saveLevelData(); - /** - * @symbol ?savePlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z - */ - MCVAPI void savePlayer(class Player &); - /** - * @symbol ?saveVillages\@Level\@\@UEAAXXZ - */ - MCVAPI void saveVillages(); /** * @symbol ?sendAllPlayerAbilities\@Level\@\@UEAAXAEBVPlayer\@\@\@Z */ @@ -1726,19 +1698,15 @@ class Level { * @symbol ?useMsaGamertagsOnly\@Level\@\@UEBA_NXZ */ MCVAPI bool useMsaGamertagsOnly() const; - /** - * @symbol ?waitAsyncSuspendWork\@Level\@\@UEAAXXZ - */ - MCVAPI void waitAsyncSuspendWork(); /** * @symbol __unk_destructor_-1 */ MCVAPI ~Level(); #endif /** - * @symbol ??0Level\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@4\@AEAVIMinecraftEventing\@\@_NW4SubClientId\@\@AEAVScheduler\@\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVResourcePackManager\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@4\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@4\@VItemRegistryRef\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@44AEBUNetworkPermissions\@\@V?$optional\@VDimensionDefinitionGroup\@\@\@4\@\@Z + * @symbol ??0Level\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$OwnerPtrT\@U?$SharePtrRefTraits\@VLevelStorage\@\@\@\@\@\@AEAVIMinecraftEventing\@\@_NW4SubClientId\@\@AEAVScheduler\@\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVResourcePackManager\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@std\@\@VItemRegistryRef\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@33AEBUNetworkPermissions\@\@V?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@\@Z */ - MCAPI Level(class gsl::not_null> const &, std::unique_ptr, std::unique_ptr, class IMinecraftEventing &, bool, enum class SubClientId, class Scheduler &, class gsl::not_null>, class ResourcePackManager &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, class std::weak_ptr, bool, bool, struct NetworkPermissions const &, class std::optional); + MCAPI Level(class gsl::not_null> const &, class OwnerPtrT>, class IMinecraftEventing &, bool, enum class SubClientId, class Scheduler &, class gsl::not_null>, class ResourcePackManager &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, class std::weak_ptr, bool, bool, struct NetworkPermissions const &, class std::optional); /** * @symbol ?canChangeDimension\@Level\@\@QEAA_NAEAVActor\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ @@ -1775,10 +1743,6 @@ class Level { * @symbol ?getServerLevelEventCoordinatorAsSharedPointer\@Level\@\@QEAA?AV?$shared_ptr\@VServerLevelEventCoordinator\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr getServerLevelEventCoordinatorAsSharedPointer(); - /** - * @symbol ?getSideBySideEntity\@Level\@\@QEBA?AVStrictEntityContext\@\@XZ - */ - MCAPI class StrictEntityContext getSideBySideEntity() const; /** * @symbol ?getTickDeltaTime\@Level\@\@QEBANXZ */ @@ -1819,10 +1783,6 @@ class Level { * @symbol ?addLevelComponents\@Level\@\@SAXAEAVEntityContext\@\@AEAVIRandom\@\@_N\@Z */ MCAPI static void addLevelComponents(class EntityContext &, class IRandom &, bool); - /** - * @symbol ?addSideBySideLevelComponents\@Level\@\@SAXAEAVEntityContext\@\@_N\@Z - */ - MCAPI static void addSideBySideLevelComponents(class EntityContext &, bool); /** * @symbol ?createRandomSeed\@Level\@\@SAIXZ */ @@ -1842,9 +1802,9 @@ class Level { */ MCAPI class GameplayUserManager & _getGameplayUserManager(); /** - * @symbol ?_getLevelStorageManager\@Level\@\@IEAAAEAVLevelStorageManager\@\@XZ + * @symbol ?_getLevelStorageManager\@Level\@\@IEAAPEAVLevelStorageManager\@\@XZ */ - MCAPI class LevelStorageManager & _getLevelStorageManager(); + MCAPI class LevelStorageManager * _getLevelStorageManager(); /** * @symbol ?_getPlayerListManager\@Level\@\@IEAAAEAVPlayerListManager\@\@XZ */ @@ -1876,25 +1836,21 @@ class Level { */ MCAPI void _initializeActorManager(); /** - * @symbol ?_initializeGameplayUserManager\@Level\@\@AEAAXXZ + * @symbol ?_initializeBiomeManager\@Level\@\@AEAAXXZ */ - MCAPI void _initializeGameplayUserManager(); + MCAPI void _initializeBiomeManager(); /** - * @symbol ?_loadAutonomousEntities\@Level\@\@AEAAXXZ + * @symbol ?_initializeGameplayUserManager\@Level\@\@AEAAXXZ */ - MCAPI void _loadAutonomousEntities(); + MCAPI void _initializeGameplayUserManager(); /** - * @symbol ?_loadBiomeData\@Level\@\@AEAAXXZ + * @symbol ?_initializeLevelStorageManager\@Level\@\@AEAAXXZ */ - MCAPI void _loadBiomeData(); + MCAPI void _initializeLevelStorageManager(); /** * @symbol ?_loadMapData\@Level\@\@AEAAPEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class MapItemSavedData * _loadMapData(struct ActorUniqueID const &); - /** - * @symbol ?_loadOwnedEntityLimbo\@Level\@\@AEAAXXZ - */ - MCAPI void _loadOwnedEntityLimbo(); /** * @symbol ?_onAnyGameplayUsersRemoved\@Level\@\@AEAAXXZ */ @@ -1931,14 +1887,14 @@ class Level { * @symbol ?_playerChangeDimensionWaitingForRespawn\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z */ MCAPI bool _playerChangeDimensionWaitingForRespawn(class Player &, class ChangeDimensionRequest &); - /** - * @symbol ?_saveOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z - */ - MCAPI void _saveOwnedEntityLimboForPlayer(class Player const &); /** * @symbol ?_saveSomeChunks\@Level\@\@AEAAXXZ */ MCAPI void _saveSomeChunks(); + /** + * @symbol ?_shouldStartGameSaveTimer\@Level\@\@AEBA_NXZ + */ + MCAPI bool _shouldStartGameSaveTimer() const; /** * @symbol ?_syncTime\@Level\@\@AEAAXH\@Z */ @@ -1947,6 +1903,14 @@ class Level { * @symbol ?processOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z */ MCAPI void processOwnedEntityLimboForPlayer(class Player const &); + /** + * @symbol ?_createLevelStorageManager\@Level\@\@CA?AV?$unique_ptr\@VLevelStorageManager\@\@U?$default_delete\@VLevelStorageManager\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@U?$SharePtrRefTraits\@VLevelStorage\@\@\@\@\@\@AEAVScheduler\@\@\@Z + */ + MCAPI static std::unique_ptr _createLevelStorageManager(class OwnerPtrT>, class Scheduler &); + /** + * @symbol ?_onPollSaveGameStatistics\@Level\@\@CAXAEAVIMinecraftEventing\@\@AEAVLevelStorage\@\@\@Z + */ + MCAPI static void _onPollSaveGameStatistics(class IMinecraftEventing &, class LevelStorage &); protected: diff --git a/LiteLoader/include/llapi/mc/LevelChunk.hpp b/LiteLoader/include/llapi/mc/LevelChunk.hpp index 6b31ccaca2..f2097a55bf 100644 --- a/LiteLoader/include/llapi/mc/LevelChunk.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunk.hpp @@ -250,14 +250,14 @@ struct HardcodedSpawningArea { * @symbol ?getDimension\@LevelChunk\@\@QEBAAEAVDimension\@\@XZ */ MCAPI class Dimension & getDimension() const; - /** - * @symbol ?getEntities\@LevelChunk\@\@QEBAXV?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@_N\@Z - */ - MCAPI void getEntities(class gsl::span, -1>, class AABB const &, std::vector &, bool) const; /** * @symbol ?getEntities\@LevelChunk\@\@QEBAXW4ActorType\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI void getEntities(enum class ActorType, class AABB const &, std::vector &, bool) const; + /** + * @symbol ?getEntities\@LevelChunk\@\@QEBAXV?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@_N\@Z + */ + MCAPI void getEntities(class gsl::span, -1>, class AABB const &, std::vector &, bool) const; /** * @symbol ?getEntity\@LevelChunk\@\@QEBAPEAVActor\@\@AEBUActorUniqueID\@\@\@Z */ @@ -350,14 +350,14 @@ struct HardcodedSpawningArea { * @symbol ?getPosition\@LevelChunk\@\@QEBAAEBVChunkPos\@\@XZ */ MCAPI class ChunkPos const & getPosition() const; - /** - * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVHeightmapWrapper\@\@XZ - */ - MCAPI class HeightmapWrapper getPreWorldGenHeightmap() const; /** * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class ChunkLocalHeight getPreWorldGenHeightmap(class ChunkBlockPos const &) const; + /** + * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVHeightmapWrapper\@\@XZ + */ + MCAPI class HeightmapWrapper getPreWorldGenHeightmap() const; /** * @symbol ?getPreservedBlockEntities\@LevelChunk\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@2\@\@std\@\@XZ */ @@ -390,14 +390,14 @@ struct HardcodedSpawningArea { * @symbol ?getSurfaceBiome\@LevelChunk\@\@QEBAAEBVBiome\@\@VChunkBlockPos\@\@\@Z */ MCAPI class Biome const & getSurfaceBiome(class ChunkBlockPos) const; - /** - * @symbol ?getTickQueue\@LevelChunk\@\@QEAAAEAVBlockTickingQueue\@\@XZ - */ - MCAPI class BlockTickingQueue & getTickQueue(); /** * @symbol ?getTickQueue\@LevelChunk\@\@QEBAAEBVBlockTickingQueue\@\@XZ */ MCAPI class BlockTickingQueue const & getTickQueue() const; + /** + * @symbol ?getTickQueue\@LevelChunk\@\@QEAAAEAVBlockTickingQueue\@\@XZ + */ + MCAPI class BlockTickingQueue & getTickQueue(); /** * @symbol ?getTopRainBlockPos\@LevelChunk\@\@QEAA?BVBlockPos\@\@AEBVChunkBlockPos\@\@\@Z */ @@ -830,14 +830,14 @@ struct HardcodedSpawningArea { * @symbol ?_replaceBiomeStorage\@LevelChunk\@\@AEAAXGV?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@AEBV?$UniqueLock\@Vshared_mutex\@std\@\@\@Threading\@Bedrock\@\@\@Z */ MCAPI void _replaceBiomeStorage(unsigned short, std::unique_ptr>, class Bedrock::Threading::UniqueLock const &); - /** - * @symbol ?_setBiome\@LevelChunk\@\@AEAAXAEBVBiome\@\@AEBVChunkBlockPos\@\@_N\@Z - */ - MCAPI void _setBiome(class Biome const &, class ChunkBlockPos const &, bool); /** * @symbol ?_setBiome\@LevelChunk\@\@AEAAXAEBVBiome\@\@GGAEBV?$UniqueLock\@Vshared_mutex\@std\@\@\@Threading\@Bedrock\@\@\@Z */ MCAPI void _setBiome(class Biome const &, unsigned short, unsigned short, class Bedrock::Threading::UniqueLock const &); + /** + * @symbol ?_setBiome\@LevelChunk\@\@AEAAXAEBVBiome\@\@AEBVChunkBlockPos\@\@_N\@Z + */ + MCAPI void _setBiome(class Biome const &, class ChunkBlockPos const &, bool); protected: /** diff --git a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp index 58fafbecdd..45f73ba56d 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class LevelChunkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelChunkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelChunkPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LevelChunkPacket\@\@QEAA\@XZ */ @@ -62,5 +63,9 @@ class LevelChunkPacket : public Packet { * @symbol ?pushSubChunkMetadata\@LevelChunkPacket\@\@QEAAX_K\@Z */ MCAPI void pushSubChunkMetadata(unsigned __int64); + /** + * @symbol ?readCacheMetadata\@LevelChunkPacket\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI class Bedrock::Result readCacheMetadata(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/LevelData.hpp b/LiteLoader/include/llapi/mc/LevelData.hpp index 47519b3b97..9fa103130a 100644 --- a/LiteLoader/include/llapi/mc/LevelData.hpp +++ b/LiteLoader/include/llapi/mc/LevelData.hpp @@ -32,6 +32,10 @@ class LevelData { #endif public: + /** + * @symbol ??0LevelData\@\@QEAA\@_N\@Z + */ + MCAPI LevelData(bool); /** * @symbol ??0LevelData\@\@QEAA\@$$QEAV0\@\@Z */ @@ -40,10 +44,6 @@ class LevelData { * @symbol ??0LevelData\@\@QEAA\@AEBVLevelSettings\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GeneratorType\@\@AEBVBlockPos\@\@_NW4EducationEditionOffer\@\@MM\@Z */ MCAPI LevelData(class LevelSettings const &, std::string const &, enum class GeneratorType, class BlockPos const &, bool, enum class EducationEditionOffer, float, float); - /** - * @symbol ??0LevelData\@\@QEAA\@_N\@Z - */ - MCAPI LevelData(bool); /** * @symbol ?achievementsWillBeDisabledOnLoad\@LevelData\@\@QEBA_NXZ */ @@ -104,14 +104,14 @@ class LevelData { * @symbol ?getDefaultAbilities\@LevelData\@\@QEAAAEAVAbilities\@\@XZ */ MCAPI class Abilities & getDefaultAbilities(); - /** - * @symbol ?getDefaultPermissions\@LevelData\@\@QEAAAEAVPermissionsHandler\@\@XZ - */ - MCAPI class PermissionsHandler & getDefaultPermissions(); /** * @symbol ?getDefaultPermissions\@LevelData\@\@QEBAAEBVPermissionsHandler\@\@XZ */ MCAPI class PermissionsHandler const & getDefaultPermissions() const; + /** + * @symbol ?getDefaultPermissions\@LevelData\@\@QEAAAEAVPermissionsHandler\@\@XZ + */ + MCAPI class PermissionsHandler & getDefaultPermissions(); /** * @symbol ?getEduSharedUriResource\@LevelData\@\@QEBAAEBVCompoundTag\@\@XZ */ @@ -132,14 +132,14 @@ class LevelData { * @symbol ?getEmoteChatMuted\@LevelData\@\@QEBA_NXZ */ MCAPI bool getEmoteChatMuted() const; - /** - * @symbol ?getExperiments\@LevelData\@\@QEAAAEAVExperiments\@\@XZ - */ - MCAPI class Experiments & getExperiments(); /** * @symbol ?getExperiments\@LevelData\@\@QEBAAEBVExperiments\@\@XZ */ MCAPI class Experiments const & getExperiments() const; + /** + * @symbol ?getExperiments\@LevelData\@\@QEAAAEAVExperiments\@\@XZ + */ + MCAPI class Experiments & getExperiments(); /** * @symbol ?getFlatWorldGeneratorOptions\@LevelData\@\@QEBAAEBVValue\@Json\@\@XZ */ @@ -468,10 +468,6 @@ class LevelData { * @symbol ?setHasLockedResourcePack\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setHasLockedResourcePack(bool); - /** - * @symbol ?setIsEditorWorld\@LevelData\@\@QEAAX_N\@Z - */ - MCAPI void setIsEditorWorld(bool); /** * @symbol ?setLANBroadcast\@LevelData\@\@QEAAX_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp index d2785c85a4..fa236f4540 100644 --- a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp @@ -5,8 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Tag.hpp" -#include "Int64Tag.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +15,7 @@ * @brief MC class LevelEventCoordinator. * */ -class LevelEventCoordinator : public Int64Tag { +class LevelEventCoordinator { #define AFTER_EXTRA // Add Member There @@ -30,340 +28,6 @@ class LevelEventCoordinator : public Int64Tag { #endif public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 11 - * @symbol __unk_vfn_11 - */ - virtual void __unk_vfn_11(); - /** - * @symbol ?rawView\@CompoundTag\@\@QEBAAEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@U?$less\@X\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI class std::map, class std::allocator>> const & rawView() const; - /** - * @vftbl 13 - * @symbol __unk_vfn_13 - */ - virtual void __unk_vfn_13(); - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14(); - /** - * @vftbl 15 - * @symbol __unk_vfn_15 - */ - virtual void __unk_vfn_15(); - /** - * @vftbl 16 - * @symbol __unk_vfn_16 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 17 - * @symbol __unk_vfn_17 - */ - virtual void __unk_vfn_17(); - /** - * @vftbl 18 - * @symbol __unk_vfn_18 - */ - virtual void __unk_vfn_18(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 20 - * @symbol __unk_vfn_20 - */ - virtual void __unk_vfn_20(); - /** - * @vftbl 21 - * @symbol __unk_vfn_21 - */ - virtual void __unk_vfn_21(); - /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); - /** - * @vftbl 25 - * @symbol __unk_vfn_25 - */ - virtual void __unk_vfn_25(); - /** - * @vftbl 26 - * @symbol __unk_vfn_26 - */ - virtual void __unk_vfn_26(); - /** - * @vftbl 27 - * @symbol __unk_vfn_27 - */ - virtual void __unk_vfn_27(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @vftbl 31 - * @symbol __unk_vfn_31 - */ - virtual void __unk_vfn_31(); - /** - * @vftbl 32 - * @symbol __unk_vfn_32 - */ - virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); - /** - * @vftbl 34 - * @symbol __unk_vfn_34 - */ - virtual void __unk_vfn_34(); - /** - * @vftbl 35 - * @symbol __unk_vfn_35 - */ - virtual void __unk_vfn_35(); - /** - * @vftbl 36 - * @symbol __unk_vfn_36 - */ - virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); - /** - * @vftbl 38 - * @symbol __unk_vfn_38 - */ - virtual void __unk_vfn_38(); - /** - * @vftbl 39 - * @symbol __unk_vfn_39 - */ - virtual void __unk_vfn_39(); - /** - * @vftbl 40 - * @symbol __unk_vfn_40 - */ - virtual void __unk_vfn_40(); - /** - * @vftbl 41 - * @symbol __unk_vfn_41 - */ - virtual void __unk_vfn_41(); - /** - * @vftbl 42 - * @symbol __unk_vfn_42 - */ - virtual void __unk_vfn_42(); - /** - * @vftbl 43 - * @symbol __unk_vfn_43 - */ - virtual void __unk_vfn_43(); - /** - * @vftbl 44 - * @symbol __unk_vfn_44 - */ - virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); - /** - * @vftbl 46 - * @symbol __unk_vfn_46 - */ - virtual void __unk_vfn_46(); - /** - * @vftbl 47 - * @symbol __unk_vfn_47 - */ - virtual void __unk_vfn_47(); - /** - * @vftbl 48 - * @symbol __unk_vfn_48 - */ - virtual void __unk_vfn_48(); - /** - * @vftbl 49 - * @symbol __unk_vfn_49 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 50 - * @symbol __unk_vfn_50 - */ - virtual void __unk_vfn_50(); - /** - * @vftbl 51 - * @symbol __unk_vfn_51 - */ - virtual void __unk_vfn_51(); - /** - * @vftbl 52 - * @symbol __unk_vfn_52 - */ - virtual void __unk_vfn_52(); - /** - * @vftbl 53 - * @symbol __unk_vfn_53 - */ - virtual void __unk_vfn_53(); - /** - * @vftbl 54 - * @symbol __unk_vfn_54 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 - * @symbol __unk_vfn_55 - */ - virtual void __unk_vfn_55(); - /** - * @vftbl 56 - * @symbol __unk_vfn_56 - */ - virtual void __unk_vfn_56(); - /** - * @vftbl 57 - * @symbol __unk_vfn_57 - */ - virtual void __unk_vfn_57(); - /** - * @vftbl 58 - * @symbol __unk_vfn_58 - */ - virtual void __unk_vfn_58(); - /** - * @vftbl 59 - * @symbol __unk_vfn_59 - */ - virtual void __unk_vfn_59(); - /** - * @vftbl 60 - * @symbol __unk_vfn_60 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @symbol __unk_vfn_61 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 - */ - virtual void __unk_vfn_62(); - /** - * @vftbl 63 - * @symbol __unk_vfn_63 - */ - virtual void __unk_vfn_63(); - /** - * @vftbl 64 - * @symbol __unk_vfn_64 - */ - virtual void __unk_vfn_64(); - /** - * @vftbl 65 - * @symbol __unk_vfn_65 - */ - virtual void __unk_vfn_65(); - /** - * @vftbl 66 - * @symbol __unk_vfn_66 - */ - virtual void __unk_vfn_66(); - /** - * @vftbl 67 - * @symbol __unk_vfn_67 - */ - virtual void __unk_vfn_67(); - /** - * @vftbl 68 - * @symbol __unk_vfn_68 - */ - virtual void __unk_vfn_68(); - /** - * @vftbl 69 - * @symbol __unk_vfn_69 - */ - virtual void __unk_vfn_69(); - /** - * @vftbl 70 - * @symbol __unk_vfn_70 - */ - virtual void __unk_vfn_70(); - /** - * @vftbl 71 - * @symbol __unk_vfn_71 - */ - virtual void __unk_vfn_71(); - /** - * @vftbl 72 - * @symbol __unk_vfn_72 - */ - virtual void __unk_vfn_72(); - /** - * @vftbl 73 - * @symbol __unk_vfn_73 - */ - virtual void __unk_vfn_73(); - /** - * @vftbl 74 - * @symbol __unk_vfn_74 - */ - virtual void __unk_vfn_74(); - /** - * @vftbl 75 - * @symbol ?write\@Int64Tag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - virtual void write(class IDataOutput &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTCOORDINATOR /** * @symbol __unk_destructor_-1 @@ -382,10 +46,6 @@ class LevelEventCoordinator : public Int64Tag { * @symbol ?sendEvent\@LevelEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$LevelGameplayEvent\@X\@\@\@\@\@Z */ MCAPI void sendEvent(class EventRef> const &); - /** - * @symbol ?sendLevelBiomesRegistered\@LevelEventCoordinator\@\@QEAAXAEAVIWorldRegistriesProvider\@\@\@Z - */ - MCAPI void sendLevelBiomesRegistered(class IWorldRegistriesProvider &); /** * @symbol ?sendLevelInitialized\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp index fdb2750b8c..e727a79768 100644 --- a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class LevelEventGenericPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelEventGenericPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelEventGenericPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTGENERICPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~LevelEventGenericPacket(); #endif - /** - * @symbol ??0LevelEventGenericPacket\@\@QEAA\@XZ - */ - MCAPI LevelEventGenericPacket(); /** * @symbol ??0LevelEventGenericPacket\@\@QEAA\@W4LevelEvent\@\@AEBVCompoundTag\@\@\@Z */ MCAPI LevelEventGenericPacket(enum class LevelEvent, class CompoundTag const &); + /** + * @symbol ??0LevelEventGenericPacket\@\@QEAA\@XZ + */ + MCAPI LevelEventGenericPacket(); }; diff --git a/LiteLoader/include/llapi/mc/LevelEventListener.hpp b/LiteLoader/include/llapi/mc/LevelEventListener.hpp index 8f581d4d6e..fa505707ba 100644 --- a/LiteLoader/include/llapi/mc/LevelEventListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventListener.hpp @@ -38,10 +38,6 @@ class LevelEventListener { * @symbol ?onLevelAddedPlayer\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onLevelAddedPlayer(class Level &, class Player &); - /** - * @symbol ?onLevelBiomesRegistered\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVIWorldRegistriesProvider\@\@\@Z - */ - MCVAPI enum class EventResult onLevelBiomesRegistered(class IWorldRegistriesProvider &); /** * @symbol ?onLevelInitialized\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp index 4446dd5cfc..d3ff3c1f34 100644 --- a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,19 +52,15 @@ class LevelEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~LevelEventPacket(); #endif - /** - * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@MMMH\@Z - */ - MCAPI LevelEventPacket(enum class LevelEvent, float, float, float, int); /** * @symbol ??0LevelEventPacket\@\@QEAA\@XZ */ @@ -72,5 +69,9 @@ class LevelEventPacket : public Packet { * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z */ MCAPI LevelEventPacket(enum class LevelEvent, class Vec3 const &, int); + /** + * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@MMMH\@Z + */ + MCAPI LevelEventPacket(enum class LevelEvent, float, float, float, int); }; diff --git a/LiteLoader/include/llapi/mc/LevelListCache.hpp b/LiteLoader/include/llapi/mc/LevelListCache.hpp index 7f8d88515f..9252a5189b 100644 --- a/LiteLoader/include/llapi/mc/LevelListCache.hpp +++ b/LiteLoader/include/llapi/mc/LevelListCache.hpp @@ -43,9 +43,9 @@ class LevelListCache { */ MCVAPI std::unique_ptr createLevelLooseStorage(std::string const &, class ContentIdentity const &, class gsl::not_null> const &); /** - * @symbol ?createLevelStorage\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@8\@V?$unique_ptr\@VLevelStorageEventing\@\@U?$default_delete\@VLevelStorageEventing\@\@\@std\@\@\@3\@\@Z + * @symbol ?createLevelStorage\@LevelListCache\@\@UEAA?AV?$OwnerPtrT\@U?$SharePtrRefTraits\@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 */ - MCVAPI std::unique_ptr createLevelStorage(class Scheduler &, std::string const &, class ContentIdentity const &, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &, class gsl::not_null>, std::unique_ptr); + MCVAPI class OwnerPtrT> createLevelStorage(class Scheduler &, std::string const &, class ContentIdentity const &, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &, class gsl::not_null>, std::unique_ptr); /** * @symbol ?createLevelStorageObserver\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelStorageObserver\@\@U?$default_delete\@VLevelStorageObserver\@\@\@std\@\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp b/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp index 3deb5996d7..58c4564cbd 100644 --- a/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp +++ b/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp @@ -35,9 +35,5 @@ class LevelLooseFileStorage { * @symbol ??0LevelLooseFileStorage\@\@QEAA\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI LevelLooseFileStorage(class Core::Path const &, class ContentIdentity const &, class gsl::not_null> const &); - /** - * @symbol ?getAccessStrategy\@LevelLooseFileStorage\@\@QEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::unique_ptr getAccessStrategy() const; }; diff --git a/LiteLoader/include/llapi/mc/LevelSettings.hpp b/LiteLoader/include/llapi/mc/LevelSettings.hpp index a3eddcf06d..09afd2621f 100644 --- a/LiteLoader/include/llapi/mc/LevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/LevelSettings.hpp @@ -29,17 +29,17 @@ class LevelSettings { public: /** - * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z */ - MCAPI LevelSettings(class LevelSettings &&); + MCAPI LevelSettings(class LevelSettings const &); /** * @symbol ??0LevelSettings\@\@QEAA\@XZ */ MCAPI LevelSettings(); /** - * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI LevelSettings(class LevelSettings const &); + MCAPI LevelSettings(class LevelSettings &&); /** * @symbol ??0LevelSettings\@\@QEAA\@AEBVLevelData\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ @@ -280,6 +280,10 @@ class LevelSettings { * @symbol ?setEduSharedUriResource\@LevelSettings\@\@QEAAAEAV1\@AEBUEduSharedUriResource\@\@\@Z */ MCAPI class LevelSettings & setEduSharedUriResource(struct EduSharedUriResource const &); + /** + * @symbol ?setEducationEditionOffer\@LevelSettings\@\@QEAAAEAV1\@W4EducationEditionOffer\@\@\@Z + */ + MCAPI class LevelSettings & setEducationEditionOffer(enum class EducationEditionOffer); /** * @symbol ?setEducationFeaturesEnabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ @@ -292,6 +296,10 @@ class LevelSettings { * @symbol ?setEmoteChatMuted\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setEmoteChatMuted(bool); + /** + * @symbol ?setExperiments\@LevelSettings\@\@QEAAAEAV1\@AEBVExperimentStorage\@\@\@Z + */ + MCAPI class LevelSettings & setExperiments(class ExperimentStorage const &); /** * @symbol ?setForceGameType\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ @@ -308,10 +316,6 @@ class LevelSettings { * @symbol ?setGeneratorType\@LevelSettings\@\@QEAAAEAV1\@W4GeneratorType\@\@\@Z */ MCAPI class LevelSettings & setGeneratorType(enum class GeneratorType); - /** - * @symbol ?setIsEditorWorld\@LevelSettings\@\@QEAAAEAV1\@_N\@Z - */ - MCAPI class LevelSettings & setIsEditorWorld(bool); /** * @symbol ?setOnlySpawnV1Villagers\@LevelSettings\@\@QEAAX_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp index 01be7f7866..5eb2cfcd29 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class LevelSoundEventPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelSoundEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelSoundEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LevelSoundEventPacket\@\@QEAA\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N3\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp index b63a899b86..e9f1b8a976 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class LevelSoundEventPacketV1 : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelSoundEventPacketV1\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelSoundEventPacketV1\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LevelSoundEventPacketV1\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp index 758b2730e7..89b7500f29 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class LevelSoundEventPacketV2 : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@LevelSoundEventPacketV2\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LevelSoundEventPacketV2\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LevelSoundEventPacketV2\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp index 16d287a637..0c14182687 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp @@ -44,13 +44,17 @@ class LevelSoundManager { */ MCAPI class gsl::not_null> getSoundPlayer() const; /** - * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z + * @symbol ?playPredictiveSynchronizedSound\@LevelSoundManager\@\@QEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@PEAVPlayer\@\@HAEBUActorDefinitionIdentifier\@\@_N5\@Z */ - MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); + MCAPI void playPredictiveSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, class Player *, int, struct ActorDefinitionIdentifier const &, bool, bool); /** * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + /** + * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z + */ + MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); /** * @symbol ?playSound\@LevelSoundManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelStorageManager.hpp b/LiteLoader/include/llapi/mc/LevelStorageManager.hpp index a9821801bb..0e3483f89d 100644 --- a/LiteLoader/include/llapi/mc/LevelStorageManager.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageManager.hpp @@ -26,21 +26,49 @@ class LevelStorageManager { public: /** - * @symbol ??0LevelStorageManager\@\@QEAA\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0LevelStorageManager\@\@QEAA\@V?$OwnerPtrT\@U?$SharePtrRefTraits\@VLevelStorage\@\@\@\@\@\@V?$unique_ptr\@VGameDataSaveTimer\@\@U?$default_delete\@VGameDataSaveTimer\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VUserStorageChecker\@\@U?$default_delete\@VUserStorageChecker\@\@\@std\@\@\@3\@\@Z */ - MCAPI LevelStorageManager(std::unique_ptr); + MCAPI LevelStorageManager(class OwnerPtrT>, std::unique_ptr, std::unique_ptr); /** - * @symbol ?getLevelStorage\@LevelStorageManager\@\@QEAAPEAVLevelStorage\@\@XZ + * @symbol ?getLevelStorage\@LevelStorageManager\@\@QEAAAEAVLevelStorage\@\@XZ */ - MCAPI class LevelStorage * getLevelStorage(); - /** - * @symbol ?getLevelStorage\@LevelStorageManager\@\@QEBAPEBVLevelStorage\@\@XZ - */ - MCAPI class LevelStorage const * getLevelStorage() const; + MCAPI class LevelStorage & getLevelStorage(); /** * @symbol ?getSavedDataStorage\@LevelStorageManager\@\@QEAAAEAVSavedDataStorage\@\@XZ */ MCAPI class SavedDataStorage & getSavedDataStorage(); + /** + * @symbol ?initializeWithDimensionManager\@LevelStorageManager\@\@QEAAXAEAVDimensionManager\@\@\@Z + */ + MCAPI void initializeWithDimensionManager(class DimensionManager &); + /** + * @symbol ?initializeWithPlayerDeathManager\@LevelStorageManager\@\@QEAAXAEAVPlayerDeathManager\@\@\@Z + */ + MCAPI void initializeWithPlayerDeathManager(class PlayerDeathManager &); + /** + * @symbol ?onAppSuspend\@LevelStorageManager\@\@QEAAXXZ + */ + MCAPI void onAppSuspend(); + /** + * @symbol ?onLevelTearingDown\@LevelStorageManager\@\@QEAAXXZ + */ + MCAPI void onLevelTearingDown(); + /** + * @symbol ?onStartLeaveGame\@LevelStorageManager\@\@QEAAXXZ + */ + MCAPI void onStartLeaveGame(); + /** + * @symbol ?registerOnCanStartGameSaveTimerCheckCallback\@LevelStorageManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6A_NXZ\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnCanStartGameSaveTimerCheckCallback(class std::function); + /** + * @symbol ?registerOnPollSaveGameStatisticsCallback\@LevelStorageManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVLevelStorage\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnPollSaveGameStatisticsCallback(class std::function); + /** + * @symbol ?registerOnSaveCallback\@LevelStorageManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVLevelStorage\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnSaveCallback(class std::function); /** * @symbol ?registerOnSaveGameDataCallback\@LevelStorageManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVLevelStorage\@\@\@Z\@std\@\@\@Z */ @@ -50,20 +78,52 @@ class LevelStorageManager { */ MCAPI class Bedrock::PubSub::Subscription registerOnSaveLevelDataCallback(class std::function); /** - * @symbol ?saveGameData\@LevelStorageManager\@\@QEAAXXZ + * @symbol ?registerOnStartLeaveGameCallback\@LevelStorageManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVLevelStorage\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnStartLeaveGameCallback(class std::function); + /** + * @symbol ?requestTimedStorageDeferment\@LevelStorageManager\@\@QEAA?AV?$shared_ptr\@PEAX\@std\@\@XZ + */ + MCAPI class std::shared_ptr requestTimedStorageDeferment(); + /** + * @symbol ?save\@LevelStorageManager\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ - MCAPI void saveGameData(); + MCAPI void save(class std::chrono::time_point>>); + /** + * @symbol ?saveGameData\@LevelStorageManager\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + */ + MCAPI void saveGameData(class std::chrono::time_point>>); /** * @symbol ?saveLevelData\@LevelStorageManager\@\@QEAAXXZ */ MCAPI void saveLevelData(); /** - * @symbol ?shutdown\@LevelStorageManager\@\@QEAAXXZ + * @symbol ?trySaveGameData\@LevelStorageManager\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + */ + MCAPI void trySaveGameData(class std::chrono::time_point>>); + /** + * @symbol ?tryStartGameDataSaveTimerIfNotSet\@LevelStorageManager\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ - MCAPI void shutdown(); + MCAPI void tryStartGameDataSaveTimerIfNotSet(class std::chrono::time_point>>); /** * @symbol ??1LevelStorageManager\@\@QEAA\@XZ */ MCAPI ~LevelStorageManager(); +//private: + /** + * @symbol ?_getGameDataSaveTimer\@LevelStorageManager\@\@AEAAAEAVGameDataSaveTimer\@\@XZ + */ + MCAPI class GameDataSaveTimer & _getGameDataSaveTimer(); + /** + * @symbol ?_onNewDimensionCreated\@LevelStorageManager\@\@AEAAXAEAVDimension\@\@\@Z + */ + MCAPI void _onNewDimensionCreated(class Dimension &); + /** + * @symbol ?_savePlayer\@LevelStorageManager\@\@AEAAXAEAVPlayer\@\@\@Z + */ + MCAPI void _savePlayer(class Player &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp b/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp index a6f00b6646..b4688bd328 100644 --- a/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp @@ -75,14 +75,14 @@ struct BatchEntry { */ MCVAPI ~LevelStorageWriteBatch(); #endif - /** - * @symbol ??0LevelStorageWriteBatch\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI LevelStorageWriteBatch(class LevelStorageWriteBatch &&); /** * @symbol ??0LevelStorageWriteBatch\@\@QEAA\@XZ */ MCAPI LevelStorageWriteBatch(); + /** + * @symbol ??0LevelStorageWriteBatch\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI LevelStorageWriteBatch(class LevelStorageWriteBatch &&); /** * @symbol ?addFlushCallback\@LevelStorageWriteBatch\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelSummary.hpp b/LiteLoader/include/llapi/mc/LevelSummary.hpp index d7d2e880d7..9ed2d89b69 100644 --- a/LiteLoader/include/llapi/mc/LevelSummary.hpp +++ b/LiteLoader/include/llapi/mc/LevelSummary.hpp @@ -5,8 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Social.hpp" #include "Core.hpp" +#include "Social.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -21,10 +21,6 @@ struct LevelSummary { #undef AFTER_EXTRA public: - /** - * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_JW4GameType\@\@W4Difficulty\@\@VLevelSeed64\@\@H_K_N6W4GamePublishSetting\@Social\@\@6W4EducationEditionOffer\@\@AEBVGameVersion\@\@9W4StorageVersion\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@0_NAEBUEduSharedUriResource\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@6\@Z - */ - MCAPI LevelSummary(std::string const &, std::string const &, __int64, enum class GameType, enum class Difficulty, class LevelSeed64, int, unsigned __int64, bool, bool, enum class Social::GamePublishSetting, bool, enum class EducationEditionOffer, class GameVersion const &, class GameVersion const &, enum class StorageVersion, class Core::Path const &, class ContentIdentity const &, std::string const &, bool, struct EduSharedUriResource const &, class Experiments const &, class BaseGameVersion const &, bool); /** * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z */ @@ -37,6 +33,10 @@ struct LevelSummary { * @symbol ??0LevelSummary\@\@QEAA\@XZ */ MCAPI LevelSummary(); + /** + * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_JW4GameType\@\@W4Difficulty\@\@VLevelSeed64\@\@H_K_N6W4GamePublishSetting\@Social\@\@6W4EducationEditionOffer\@\@AEBVGameVersion\@\@9W4StorageVersion\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@0_NAEBUEduSharedUriResource\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@6\@Z + */ + MCAPI LevelSummary(std::string const &, std::string const &, __int64, enum class GameType, enum class Difficulty, class LevelSeed64, int, unsigned __int64, bool, bool, enum class Social::GamePublishSetting, bool, enum class EducationEditionOffer, class GameVersion const &, class GameVersion const &, enum class StorageVersion, class Core::Path const &, class ContentIdentity const &, std::string const &, bool, struct EduSharedUriResource const &, class Experiments const &, class BaseGameVersion const &, bool); /** * @symbol ??4LevelSummary\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LevelUtils.hpp b/LiteLoader/include/llapi/mc/LevelUtils.hpp index d8fff12f35..db463933dd 100644 --- a/LiteLoader/include/llapi/mc/LevelUtils.hpp +++ b/LiteLoader/include/llapi/mc/LevelUtils.hpp @@ -21,6 +21,14 @@ namespace LevelUtils { // Add Member There #undef AFTER_EXTRA + /** + * @symbol ?getDay\@LevelUtils\@\@YAHH\@Z + */ + MCAPI int getDay(int); + /** + * @symbol ?getTimeOfDay\@LevelUtils\@\@YAHH\@Z + */ + MCAPI int getTimeOfDay(int); /** * @symbol ?projectToTimeOfDay\@LevelUtils\@\@YAHHH\@Z */ diff --git a/LiteLoader/include/llapi/mc/LeverBlock.hpp b/LiteLoader/include/llapi/mc/LeverBlock.hpp index 8cb9435e01..a8373367e9 100644 --- a/LiteLoader/include/llapi/mc/LeverBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeverBlock.hpp @@ -36,25 +36,20 @@ class LeverBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class LeverBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class LeverBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class LeverBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class LeverBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,86 +125,96 @@ class LeverBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 * @symbol ?isSignalSource\@LeverBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 57 + * @vftbl 60 * @symbol ?onFillBlock\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@LeverBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 107 + * @vftbl 110 * @symbol ?isAttachedTo\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,92 +226,92 @@ class LeverBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@LeverBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@LeverBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@LeverBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?updateShape\@LeverBlock\@\@UEAAXPEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateShape(class BlockSource *, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/LightBlock.hpp b/LiteLoader/include/llapi/mc/LightBlock.hpp index 8dd79d9f70..f0eb12e868 100644 --- a/LiteLoader/include/llapi/mc/LightBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightBlock.hpp @@ -36,40 +36,30 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@LightBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@LightBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; - /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@LightBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 8 + * @symbol ?getAABB\@LightBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@LightBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@LightBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -81,10 +71,10 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -95,11 +85,6 @@ class LightBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -120,6 +105,11 @@ class LightBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -130,11 +120,6 @@ class LightBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -151,75 +136,85 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 82 + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 85 * @symbol ?isFilteredOut\@LightBlock\@\@UEBA_NW4BlockRenderLayer\@\@\@Z */ virtual bool isFilteredOut(enum class BlockRenderLayer) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 96 * @symbol ?tryToPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z */ virtual bool tryToPlace(class BlockSource &, class BlockPos const &, class Block const &, struct ActorBlockSyncMessage const *) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@LightBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@LightBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 113 + * @vftbl 114 * @symbol ?canBeBuiltOver\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,75 +226,80 @@ class LightBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 133 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@LightBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@LightBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@LightBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@LightBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0LightBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LightningBolt.hpp b/LiteLoader/include/llapi/mc/LightningBolt.hpp index 1ab6713155..aa65d4fbc7 100644 --- a/LiteLoader/include/llapi/mc/LightningBolt.hpp +++ b/LiteLoader/include/llapi/mc/LightningBolt.hpp @@ -46,120 +46,120 @@ class LightningBolt : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@LightningBolt\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@LightningBolt\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@LightningBolt\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@LightningBolt\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LIGHTNINGBOLT /** * @symbol ?shouldAlwaysRender\@LightningBolt\@\@UEAA_NXZ diff --git a/LiteLoader/include/llapi/mc/LightningRodBlock.hpp b/LiteLoader/include/llapi/mc/LightningRodBlock.hpp index 3282ef198d..d2e6670fdc 100644 --- a/LiteLoader/include/llapi/mc/LightningRodBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightningRodBlock.hpp @@ -31,40 +31,35 @@ class LightningRodBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 15 + * @vftbl 12 + * @symbol ?getVisualShape\@LightningRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + */ + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; + /** + * @vftbl 18 * @symbol ?onProjectileHit\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 16 + * @vftbl 19 * @symbol ?onLightningHit\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@LightningRodBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@LightningRodBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +71,10 @@ class LightningRodBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +85,6 @@ class LightningRodBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class LightningRodBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class LightningRodBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -145,71 +135,81 @@ class LightningRodBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 * @symbol ?isSignalSource\@LightningRodBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@LightningRodBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@LightningRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@LightningRodBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@LightningRodBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,75 +221,75 @@ class LightningRodBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@LightningRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@LightningRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0LightningRodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp index 73687d0c4f..d4bde2ad3e 100644 --- a/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp @@ -53,10 +53,10 @@ class LingeringPotionItem : public PotionItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@LingeringPotionItem\@\@UEBA_NXZ @@ -148,7 +148,7 @@ class LingeringPotionItem : public PotionItem { */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getPotionType\@LingeringPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ */ virtual enum class Potion::PotionType getPotionType() const; diff --git a/LiteLoader/include/llapi/mc/LiquidBlock.hpp b/LiteLoader/include/llapi/mc/LiquidBlock.hpp index 1309e9cba0..85fd0b6180 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlock.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlock.hpp @@ -36,25 +36,15 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@LiquidBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class LiquidBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class LiquidBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class LiquidBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,65 +121,70 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@LiquidBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@LiquidBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 89 + * @vftbl 92 * @symbol ?mayPick\@LiquidBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 109 - * @symbol ?handleEntityInside\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z - */ - virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,87 +196,92 @@ class LiquidBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@LiquidBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColorAtPos\@LiquidBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@LiquidBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@LiquidBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@LiquidBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp index 3c049c32d8..f9df45361a 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp @@ -36,20 +36,10 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class LiquidBlockDynamic : public LiquidBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class LiquidBlockDynamic : public LiquidBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class LiquidBlockDynamic : public LiquidBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,50 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_63(); /** - * @vftbl 112 - * @symbol ?entityInside\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,65 +171,75 @@ class LiquidBlockDynamic : public LiquidBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** * @symbol ??0LiquidBlockDynamic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp index 5c5ad1d453..d6e79f1ef0 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp @@ -36,20 +36,10 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class LiquidBlockStatic : public LiquidBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class LiquidBlockStatic : public LiquidBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class LiquidBlockStatic : public LiquidBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,55 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 98 - * @symbol ?neighborChanged\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 112 - * @symbol ?entityInside\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + virtual void __unk_vfn_84(); + /** + * @vftbl 101 + * @symbol ?neighborChanged\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + */ + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,60 +176,70 @@ class LiquidBlockStatic : public LiquidBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 + */ + virtual void __unk_vfn_128(); + /** + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_153(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_162(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 */ virtual void __unk_vfn_164(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 - */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_167(); /** * @vftbl 169 - * @symbol __unk_vfn_169 + * @symbol ?randomTick\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ - virtual void __unk_vfn_169(); + virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** * @vftbl 171 - * @symbol ?randomTick\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol __unk_vfn_171 */ - virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; + virtual void __unk_vfn_171(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_183(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 188 + * @symbol ?entityInside\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ - virtual void __unk_vfn_186(); + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** * @symbol ??0LiquidBlockStatic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp b/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp index 2ac822e7a2..c5cd3f7499 100644 --- a/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp +++ b/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp @@ -21,9 +21,13 @@ namespace LiquidPhysicsSystem { */ MCAPI void _liquidBlockFetch(class StrictEntityContext const &, struct StateVectorComponent &, struct UpdateWaterStateRequestComponent &, struct AABBShapeComponent const &, struct SubBBsComponent const &, class Optional const>, std::vector &, class IConstBlockSource const &); /** - * @symbol ?applyPhysics\@LiquidPhysicsSystem\@\@YA_NW4MaterialType\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?_markForLiquidFlow\@LiquidPhysicsSystem\@\@YAXAEAUUpdateWaterStateRequestComponent\@\@AEBV?$Optional\@$$CBUAbilitiesComponent\@\@\@\@\@Z */ - MCAPI bool applyPhysics(enum class MaterialType, class IConstBlockSource const &, class AABB const &, struct StateVectorComponent &); + MCAPI void _markForLiquidFlow(struct UpdateWaterStateRequestComponent &, class Optional const &); + /** + * @symbol ?_tickLiquidBlocksFetch\@LiquidPhysicsSystem\@\@YAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UStateVectorComponent\@\@UUpdateWaterStateRequestComponent\@\@$$CBUAABBShapeComponent\@\@$$CBUSubBBsComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UItemActorFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@\@Z + */ + MCAPI void _tickLiquidBlocksFetch(class ViewT const>>, class ViewT, class OptionalGlobalT); /** * @symbol ?createFilterSystem\@LiquidPhysicsSystem\@\@YA?AUTickingSystemWithInfo\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp b/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp index f62685bb52..259b0626a4 100644 --- a/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp @@ -31,10 +31,6 @@ class LiquidPhysicsSystemImpl { * @symbol ?_applyFlow\@LiquidPhysicsSystemImpl\@\@SAXAEAUStateVectorComponent\@\@VVec3\@\@W4MaterialType\@\@\@Z */ MCAPI static void _applyFlow(struct StateVectorComponent &, class Vec3, enum class MaterialType); - /** - * @symbol ?_getLiquidBlocksInAABB\@LiquidPhysicsSystemImpl\@\@SAXAEAV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@W4MaterialType\@\@\@Z - */ - MCAPI static void _getLiquidBlocksInAABB(std::vector &, class IConstBlockSource const &, class AABB const &, enum class MaterialType); /** * @symbol ?_hasAdjacentFlowingBlock\@LiquidPhysicsSystemImpl\@\@SA_NAEBV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@W4MaterialType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ListCommand.hpp b/LiteLoader/include/llapi/mc/ListCommand.hpp index 5f50efd127..b2453b5c39 100644 --- a/LiteLoader/include/llapi/mc/ListCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListCommand.hpp @@ -36,7 +36,7 @@ class ListCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ListDCommand.hpp b/LiteLoader/include/llapi/mc/ListDCommand.hpp index 3f4b3e6cca..e99d9b0ac5 100644 --- a/LiteLoader/include/llapi/mc/ListDCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListDCommand.hpp @@ -36,7 +36,7 @@ class ListDCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ListDCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ListTag.hpp b/LiteLoader/include/llapi/mc/ListTag.hpp index af26c171b1..8d33135556 100644 --- a/LiteLoader/include/llapi/mc/ListTag.hpp +++ b/LiteLoader/include/llapi/mc/ListTag.hpp @@ -75,9 +75,9 @@ class ListTag : public Tag { virtual void deleteChildren(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@ListTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@ListTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -114,10 +114,6 @@ class ListTag : public Tag { */ virtual unsigned __int64 hash() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LISTTAG - /** - * @symbol ?write\@ListTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/Llama.hpp b/LiteLoader/include/llapi/mc/Llama.hpp index 41fe5d5d06..264a87b882 100644 --- a/LiteLoader/include/llapi/mc/Llama.hpp +++ b/LiteLoader/include/llapi/mc/Llama.hpp @@ -37,145 +37,145 @@ class Llama : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 120 + * @vftbl 109 * @symbol ?onFailedTame\@Llama\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@Llama\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Llama\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Llama\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@Llama\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Llama\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LlamaSpit.hpp b/LiteLoader/include/llapi/mc/LlamaSpit.hpp index c6c9cd1668..4077f7ebb7 100644 --- a/LiteLoader/include/llapi/mc/LlamaSpit.hpp +++ b/LiteLoader/include/llapi/mc/LlamaSpit.hpp @@ -37,130 +37,130 @@ class LlamaSpit : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@LlamaSpit\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@LlamaSpit\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 85 + * @vftbl 76 * @symbol ?getBrightness\@LlamaSpit\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@LlamaSpit\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 140 + * @vftbl 128 * @symbol ?getPickRadius\@LlamaSpit\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@LlamaSpit\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0LlamaSpit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LocateCommand.hpp b/LiteLoader/include/llapi/mc/LocateCommand.hpp index 30ed29a39f..dfefac7001 100644 --- a/LiteLoader/include/llapi/mc/LocateCommand.hpp +++ b/LiteLoader/include/llapi/mc/LocateCommand.hpp @@ -36,7 +36,7 @@ class LocateCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@LocateCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp index 511c2e0961..e44079d90d 100644 --- a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp @@ -36,20 +36,10 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class LodestoneBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class LodestoneBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class LodestoneBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 100 - * @symbol ?playerWillDestroy\@LodestoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 103 + * @symbol ?playerWillDestroy\@LodestoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_122(); + virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,55 +176,60 @@ class LodestoneBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0LodestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp b/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp index 06c3947b33..8ee4acd082 100644 --- a/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp @@ -65,6 +65,11 @@ class LodestoneBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -91,17 +96,22 @@ class LodestoneBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@LodestoneBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@LodestoneBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp index 8c4126dd99..11707fdd67 100644 --- a/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp @@ -52,10 +52,10 @@ class LodestoneCompassItem : public AbstractCompassItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,7 +117,7 @@ class LodestoneCompassItem : public AbstractCompassItem { */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@LodestoneCompassItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; @@ -130,4 +130,12 @@ class LodestoneCompassItem : public AbstractCompassItem { */ MCAPI static bool linkCompassToLodestone(class ItemStack &, class BlockSource &, class BlockPos); +//private: + /** + * @symbol ?_tryGetOrAddComponent\@LodestoneCompassItem\@\@CAPEAVLodestoneCompassComponent\@\@PEAVTrackingRecord\@PositionTrackingDB\@\@AEBV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI static class LodestoneCompassComponent * _tryGetOrAddComponent(class PositionTrackingDB::TrackingRecord *, class std::variant>> const &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/LogBlock.hpp b/LiteLoader/include/llapi/mc/LogBlock.hpp index 5e85664878..55323ddd60 100644 --- a/LiteLoader/include/llapi/mc/LogBlock.hpp +++ b/LiteLoader/include/llapi/mc/LogBlock.hpp @@ -36,20 +36,10 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class LogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class LogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class LogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,77 +171,82 @@ class LogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@LogBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@LogBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@LogBlock\@\@MEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@LogBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@LogBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/LoginPacket.hpp b/LiteLoader/include/llapi/mc/LoginPacket.hpp index d73494d47c..ac6fa08de2 100644 --- a/LiteLoader/include/llapi/mc/LoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/LoginPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -59,9 +60,9 @@ class LoginPacket : public Packet { virtual bool disallowBatching() const; /** * @vftbl 7 - * @symbol ?_read\@LoginPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@LoginPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0LoginPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/LookControlComponent.hpp b/LiteLoader/include/llapi/mc/LookControlComponent.hpp index 5c0c1b8faa..005c800bab 100644 --- a/LiteLoader/include/llapi/mc/LookControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/LookControlComponent.hpp @@ -76,14 +76,14 @@ class LookControlComponent { * @symbol ?setInternalType\@LookControlComponent\@\@QEAAXV?$unique_ptr\@VLookControl\@\@U?$default_delete\@VLookControl\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setInternalType(std::unique_ptr); - /** - * @symbol ?setLookAtPosition\@LookControlComponent\@\@QEAAXAEBVVec3\@\@MM\@Z - */ - MCAPI void setLookAtPosition(class Vec3 const &, float, float); /** * @symbol ?setLookAtPosition\@LookControlComponent\@\@QEAAXPEBVActor\@\@MM\@Z */ MCAPI void setLookAtPosition(class Actor const *, float, float); + /** + * @symbol ?setLookAtPosition\@LookControlComponent\@\@QEAAXAEBVVec3\@\@MM\@Z + */ + MCAPI void setLookAtPosition(class Vec3 const &, float, float); /** * @symbol ?setLookAtRotation\@LookControlComponent\@\@QEAAXAEBVVec3\@\@MM\@Z */ diff --git a/LiteLoader/include/llapi/mc/LoomBlock.hpp b/LiteLoader/include/llapi/mc/LoomBlock.hpp index b6005aba21..7afedfe71f 100644 --- a/LiteLoader/include/llapi/mc/LoomBlock.hpp +++ b/LiteLoader/include/llapi/mc/LoomBlock.hpp @@ -36,20 +36,10 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class LoomBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class LoomBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class LoomBlock : public FaceDirectionalBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +171,65 @@ class LoomBlock : public FaceDirectionalBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@LoomBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOMBLOCK /** * @symbol ?isCraftingBlock\@LoomBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/LootCommand.hpp b/LiteLoader/include/llapi/mc/LootCommand.hpp index 29d82dccb6..8f74499d0f 100644 --- a/LiteLoader/include/llapi/mc/LootCommand.hpp +++ b/LiteLoader/include/llapi/mc/LootCommand.hpp @@ -35,7 +35,7 @@ class LootCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@LootCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/LootItemFunction.hpp b/LiteLoader/include/llapi/mc/LootItemFunction.hpp index 1d4efd77ec..31395ec107 100644 --- a/LiteLoader/include/llapi/mc/LootItemFunction.hpp +++ b/LiteLoader/include/llapi/mc/LootItemFunction.hpp @@ -37,7 +37,7 @@ class LootItemFunction { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &) = 0; /** @@ -47,7 +47,7 @@ class LootItemFunction { virtual int apply(class ItemStack &, class Random &, struct Trade const &, class LootTableContext &); /** * @vftbl 3 - * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &) = 0; /** diff --git a/LiteLoader/include/llapi/mc/MagmaBlock.hpp b/LiteLoader/include/llapi/mc/MagmaBlock.hpp index f0feb050cc..fadd22cd10 100644 --- a/LiteLoader/include/llapi/mc/MagmaBlock.hpp +++ b/LiteLoader/include/llapi/mc/MagmaBlock.hpp @@ -36,20 +36,10 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class MagmaBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class MagmaBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class MagmaBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 98 - * @symbol ?neighborChanged\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 101 + * @symbol ?neighborChanged\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ - virtual void __unk_vfn_104(); + virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,109 +176,85 @@ class MagmaBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@MagmaBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 184 + * @vftbl 181 * @symbol ?getEmissiveBrightness\@MagmaBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 - */ - virtual void __unk_vfn_197(); - /** - * @vftbl 198 - * @symbol __unk_vfn_198 - */ - virtual void __unk_vfn_198(); - /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 183 + * @symbol __unk_vfn_183 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAGMABLOCK /** * @symbol ?shouldTickOnSetBlock\@MagmaBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/MangroveLeavesBlock.hpp b/LiteLoader/include/llapi/mc/MangroveLeavesBlock.hpp index 3544e05131..8ba554204e 100644 --- a/LiteLoader/include/llapi/mc/MangroveLeavesBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangroveLeavesBlock.hpp @@ -31,20 +31,10 @@ class MangroveLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class MangroveLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class MangroveLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class MangroveLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class MangroveLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,50 +111,60 @@ class MangroveLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@MangroveLeavesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@MangroveLeavesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,62 +176,67 @@ class MangroveLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@MangroveLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@MangroveLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/MangrovePropaguleBlock.hpp b/LiteLoader/include/llapi/mc/MangrovePropaguleBlock.hpp index 1d0ccb55fb..c523f4caca 100644 --- a/LiteLoader/include/llapi/mc/MangrovePropaguleBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangrovePropaguleBlock.hpp @@ -32,29 +32,24 @@ class MangrovePropaguleBlock : public BushBlock { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@MangrovePropaguleBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@MangrovePropaguleBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@MangrovePropaguleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@MangrovePropaguleBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class MangrovePropaguleBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class MangrovePropaguleBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class MangrovePropaguleBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class MangrovePropaguleBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +126,70 @@ class MangrovePropaguleBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@MangrovePropaguleBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@MangrovePropaguleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@MangrovePropaguleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@MangrovePropaguleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,92 +201,92 @@ class MangrovePropaguleBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@MangrovePropaguleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@MangrovePropaguleBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@MangrovePropaguleBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@MangrovePropaguleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@MangrovePropaguleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@MangrovePropaguleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@MangrovePropaguleBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@MangrovePropaguleBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/MangroveRootsBlock.hpp b/LiteLoader/include/llapi/mc/MangroveRootsBlock.hpp index faedd38680..dbc0f858dd 100644 --- a/LiteLoader/include/llapi/mc/MangroveRootsBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangroveRootsBlock.hpp @@ -31,25 +31,15 @@ class MangroveRootsBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@MangroveRootsBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class MangroveRootsBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class MangroveRootsBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class MangroveRootsBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class MangroveRootsBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class MangroveRootsBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 - * @symbol ?canContainLiquid\@MangroveRootsBlock\@\@UEBA_NXZ + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canContainLiquid() const; + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 64 + * @symbol ?canContainLiquid\@MangroveRootsBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,55 +176,60 @@ class MangroveRootsBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0MangroveRootsBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp index 143a9866a3..985f10e658 100644 --- a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class MapCreateLockedCopyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MapCreateLockedCopyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MapCreateLockedCopyPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAPCREATELOCKEDCOPYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MapDataManager.hpp b/LiteLoader/include/llapi/mc/MapDataManager.hpp new file mode 100644 index 0000000000..965f05a696 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MapDataManager.hpp @@ -0,0 +1,36 @@ +/** + * @file MapDataManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MapDataManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MAPDATAMANAGER +public: + class MapDataManager& operator=(class MapDataManager const &) = delete; + MapDataManager(class MapDataManager const &) = delete; + MapDataManager() = delete; +#endif + +public: + /** + * @symbol ?getAllMapData\@MapDataManager\@\@QEAAAEAV?$unordered_map\@UActorUniqueID\@\@V?$unique_ptr\@VMapItemSavedData\@\@U?$default_delete\@VMapItemSavedData\@\@\@std\@\@\@std\@\@U?$hash\@UActorUniqueID\@\@\@3\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@U?$pair\@$$CBUActorUniqueID\@\@V?$unique_ptr\@VMapItemSavedData\@\@U?$default_delete\@VMapItemSavedData\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + */ + MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> & getAllMapData(); + /** + * @symbol ??1MapDataManager\@\@QEAA\@XZ + */ + MCAPI ~MapDataManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp index 524ccd1baf..48e368fc77 100644 --- a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class MapInfoRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MapInfoRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MapInfoRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAPINFOREQUESTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MapItem.hpp b/LiteLoader/include/llapi/mc/MapItem.hpp index 8ec3a44199..3e8f6f1f7f 100644 --- a/LiteLoader/include/llapi/mc/MapItem.hpp +++ b/LiteLoader/include/llapi/mc/MapItem.hpp @@ -53,10 +53,10 @@ class MapItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -153,7 +153,7 @@ class MapItem : public Item { */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 135 + * @vftbl 136 * @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 &, class Level &, class Actor &) const; diff --git a/LiteLoader/include/llapi/mc/MaxStackSizeItemComponent.hpp b/LiteLoader/include/llapi/mc/MaxStackSizeItemComponent.hpp new file mode 100644 index 0000000000..5c81c4eadd --- /dev/null +++ b/LiteLoader/include/llapi/mc/MaxStackSizeItemComponent.hpp @@ -0,0 +1,76 @@ +/** + * @file MaxStackSizeItemComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MaxStackSizeItemComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MAXSTACKSIZEITEMCOMPONENT +public: + class MaxStackSizeItemComponent& operator=(class MaxStackSizeItemComponent const &) = delete; + MaxStackSizeItemComponent(class MaxStackSizeItemComponent const &) = delete; + MaxStackSizeItemComponent() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VMaxStackSizeItemComponent\@\@\@\@UEBA_NXZ + */ + virtual bool isNetworkComponent() const; + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VMaxStackSizeItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + */ + virtual std::unique_ptr buildNetworkTag() const; + /** + * @vftbl 5 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VMaxStackSizeItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + */ + virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @vftbl 6 + * @symbol __unk_vfn_6 + */ + virtual void __unk_vfn_6(); + /** + * @vftbl 7 + * @symbol ?initializeComponent\@MaxStackSizeItemComponent\@\@UEBAXXZ + */ + virtual void initializeComponent() const; + /** + * @symbol ?bindType\@MaxStackSizeItemComponent\@\@SAXXZ + */ + MCAPI static void bindType(); + /** + * @symbol ?getIdentifier\@MaxStackSizeItemComponent\@\@SAAEBVHashedString\@\@XZ + */ + MCAPI static class HashedString const & getIdentifier(); + +}; diff --git a/LiteLoader/include/llapi/mc/MeCommand.hpp b/LiteLoader/include/llapi/mc/MeCommand.hpp index db5b61d00e..4885e228e4 100644 --- a/LiteLoader/include/llapi/mc/MeCommand.hpp +++ b/LiteLoader/include/llapi/mc/MeCommand.hpp @@ -36,7 +36,7 @@ class MeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@MeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/MedicineItem.hpp b/LiteLoader/include/llapi/mc/MedicineItem.hpp index 0843421f2a..d69f308beb 100644 --- a/LiteLoader/include/llapi/mc/MedicineItem.hpp +++ b/LiteLoader/include/llapi/mc/MedicineItem.hpp @@ -52,10 +52,10 @@ class MedicineItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/MelonBlock.hpp b/LiteLoader/include/llapi/mc/MelonBlock.hpp index ca5b3878ae..5efa028158 100644 --- a/LiteLoader/include/llapi/mc/MelonBlock.hpp +++ b/LiteLoader/include/llapi/mc/MelonBlock.hpp @@ -36,25 +36,15 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@MelonBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class MelonBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class MelonBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class MelonBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,40 +121,50 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,62 +176,67 @@ class MelonBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@MelonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@MelonBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp index 53276f2b25..9876871b63 100644 --- a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp @@ -47,14 +47,14 @@ class MerchantRecipe { #endif public: - /** - * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@00\@Z - */ - MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); /** * @symbol ??0MerchantRecipe\@\@QEAA\@AEBV0\@\@Z */ MCAPI MerchantRecipe(class MerchantRecipe const &); + /** + * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@00\@Z + */ + MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); /** * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z */ diff --git a/LiteLoader/include/llapi/mc/MetalBlock.hpp b/LiteLoader/include/llapi/mc/MetalBlock.hpp index 3a3b90aa51..8034cffa59 100644 --- a/LiteLoader/include/llapi/mc/MetalBlock.hpp +++ b/LiteLoader/include/llapi/mc/MetalBlock.hpp @@ -36,20 +36,10 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class MetalBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class MetalBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class MetalBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class MetalBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0MetalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/Minecart.hpp b/LiteLoader/include/llapi/mc/Minecart.hpp index 739a590568..256f4e8100 100644 --- a/LiteLoader/include/llapi/mc/Minecart.hpp +++ b/LiteLoader/include/llapi/mc/Minecart.hpp @@ -46,197 +46,197 @@ class Minecart : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 32 + * @vftbl 29 * @symbol ?getInterpolatedBodyYaw\@Minecart\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@Minecart\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Minecart\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Minecart\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Minecart\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 137 + * @vftbl 125 * @symbol ?onBounceStarted\@Minecart\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 178 + * @vftbl 166 * @symbol ?getControllingPlayer\@Minecart\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 236 + * @vftbl 223 * @symbol ?kill\@Minecart\@\@MEAAXXZ */ virtual void kill(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Minecart\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Minecart\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Minecart\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Minecart\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?destroy\@Minecart\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 269 - * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 255 + * @symbol ?getType\@MinecartChest\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType() = 0; /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getDefaultDisplayBlock\@Minecart\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 271 - * @symbol __unk_vfn_271 + * @vftbl 257 + * @symbol __unk_vfn_257 */ - virtual void __unk_vfn_271(); + virtual void __unk_vfn_257(); /** - * @vftbl 272 + * @vftbl 258 * @symbol ?getDefaultDisplayOffset\@Minecart\@\@UEBAHXZ */ virtual int getDefaultDisplayOffset() const; /** - * @vftbl 273 + * @vftbl 259 * @symbol ?applyNaturalSlowdown\@Minecart\@\@MEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @vftbl 274 + * @vftbl 260 * @symbol ?_lazyInitDisplayBlock\@Minecart\@\@EEAAXXZ */ virtual void _lazyInitDisplayBlock(); diff --git a/LiteLoader/include/llapi/mc/MinecartChest.hpp b/LiteLoader/include/llapi/mc/MinecartChest.hpp index 4d8601b680..58f6595136 100644 --- a/LiteLoader/include/llapi/mc/MinecartChest.hpp +++ b/LiteLoader/include/llapi/mc/MinecartChest.hpp @@ -37,127 +37,127 @@ class MinecartChest : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?destroy\@MinecartChest\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getType\@MinecartChest\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getDefaultDisplayBlock\@MinecartChest\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 271 - * @symbol __unk_vfn_271 + * @vftbl 257 + * @symbol __unk_vfn_257 */ - virtual void __unk_vfn_271(); + virtual void __unk_vfn_257(); /** - * @vftbl 273 + * @vftbl 259 * @symbol ?applyNaturalSlowdown\@MinecartChest\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp b/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp index 1bf055ce64..03372e5d9a 100644 --- a/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp @@ -42,142 +42,142 @@ class MinecartCommandBlock : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 60 + * @vftbl 54 * @symbol ?canShowNameTag\@MinecartCommandBlock\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@MinecartCommandBlock\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@MinecartCommandBlock\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getType\@MinecartCommandBlock\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getDefaultDisplayBlock\@MinecartCommandBlock\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 271 - * @symbol __unk_vfn_271 + * @vftbl 257 + * @symbol __unk_vfn_257 */ - virtual void __unk_vfn_271(); + virtual void __unk_vfn_257(); /** - * @vftbl 273 + * @vftbl 259 * @symbol ?applyNaturalSlowdown\@MinecartCommandBlock\@\@MEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @vftbl 274 + * @vftbl 260 * @symbol ?_lazyInitDisplayBlock\@MinecartCommandBlock\@\@EEAAXXZ */ virtual void _lazyInitDisplayBlock(); diff --git a/LiteLoader/include/llapi/mc/MinecartHopper.hpp b/LiteLoader/include/llapi/mc/MinecartHopper.hpp index 5458c3be91..f9c4b76f35 100644 --- a/LiteLoader/include/llapi/mc/MinecartHopper.hpp +++ b/LiteLoader/include/llapi/mc/MinecartHopper.hpp @@ -37,132 +37,132 @@ class MinecartHopper : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?destroy\@MinecartHopper\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getType\@MinecartHopper\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getDefaultDisplayBlock\@MinecartHopper\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 271 - * @symbol __unk_vfn_271 + * @vftbl 257 + * @symbol __unk_vfn_257 */ - virtual void __unk_vfn_271(); + virtual void __unk_vfn_257(); /** - * @vftbl 272 + * @vftbl 258 * @symbol ?getDefaultDisplayOffset\@MinecartHopper\@\@UEBAHXZ */ virtual int getDefaultDisplayOffset() const; /** - * @vftbl 273 + * @vftbl 259 * @symbol ?applyNaturalSlowdown\@MinecartHopper\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/MinecartItem.hpp b/LiteLoader/include/llapi/mc/MinecartItem.hpp index 415d112668..7b87b758d9 100644 --- a/LiteLoader/include/llapi/mc/MinecartItem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartItem.hpp @@ -52,10 +52,10 @@ class MinecartItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,7 +122,7 @@ class MinecartItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@MinecartItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp b/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp index 7557494f9d..a214b6575f 100644 --- a/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp @@ -61,10 +61,6 @@ class MinecartMoveAlongRailSystem { * @symbol ?_preRailMovementCalculateMinecartPositionSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUOffsetsComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@AEAUSnapOnRailComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorSetPositionRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void _preRailMovementCalculateMinecartPositionSystem(class StrictEntityContext const &, struct OffsetsComponent const &, struct StateVectorComponent const &, struct FallDistanceComponent &, struct SnapOnRailComponent &, class EntityModifierT, class IConstBlockSource const &); - /** - * @symbol ?_tickCalculateRailMovementSystem\@MinecartMoveAlongRailSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRailMovementComponent\@\@USnapOnRailComponent\@\@UStateVectorComponent\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z - */ - MCAPI static void _tickCalculateRailMovementSystem(class ViewT>, class ViewT>, struct ActorRotationComponent const, struct LocalMoveVelocityComponent const>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp index a94c238f7c..53993d6db7 100644 --- a/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp @@ -37,10 +37,6 @@ class MinecartPreNormalTickSystem { * @symbol ?_doMinecartPreNormalTickSystem\@MinecartPreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMinecartPreNormalTickBlockPosComponent\@\@\@\@\@Z */ MCAPI static void _doMinecartPreNormalTickSystem(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT); - /** - * @symbol ?_tickMinecartPreNormalTickSystem\@MinecartPreNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMinecartFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMinecartPreNormalTickBlockPosComponent\@\@\@\@\@Z - */ - MCAPI static void _tickMinecartPreNormalTickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/MinecartRideable.hpp b/LiteLoader/include/llapi/mc/MinecartRideable.hpp index 980cd62bdf..621a77909c 100644 --- a/LiteLoader/include/llapi/mc/MinecartRideable.hpp +++ b/LiteLoader/include/llapi/mc/MinecartRideable.hpp @@ -37,115 +37,115 @@ class MinecartRideable : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getType\@MinecartRideable\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 271 - * @symbol __unk_vfn_271 + * @vftbl 257 + * @symbol __unk_vfn_257 */ - virtual void __unk_vfn_271(); + virtual void __unk_vfn_257(); /** * @symbol ??0MinecartRideable\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MinecartTNT.hpp b/LiteLoader/include/llapi/mc/MinecartTNT.hpp index 75a52ad8f4..fec1b3ffec 100644 --- a/LiteLoader/include/llapi/mc/MinecartTNT.hpp +++ b/LiteLoader/include/llapi/mc/MinecartTNT.hpp @@ -37,145 +37,145 @@ class MinecartTNT : public Minecart { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@MinecartTNT\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@MinecartTNT\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@MinecartTNT\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@MinecartTNT\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?destroy\@MinecartTNT\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getDefaultDisplayBlock\@MinecartTNT\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 271 - * @symbol __unk_vfn_271 + * @vftbl 257 + * @symbol __unk_vfn_257 */ - virtual void __unk_vfn_271(); + virtual void __unk_vfn_257(); /** * @symbol ??0MinecartTNT\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Minecraft.hpp b/LiteLoader/include/llapi/mc/Minecraft.hpp index 7b770004e6..52874f5816 100644 --- a/LiteLoader/include/llapi/mc/Minecraft.hpp +++ b/LiteLoader/include/llapi/mc/Minecraft.hpp @@ -93,9 +93,9 @@ class Minecraft { */ MCAPI void configureGameTest(class Level &, class Experiments const &); /** - * @symbol ?disconnectClient\@Minecraft\@\@QEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?disconnectClient\@Minecraft\@\@QEAAXAEBVNetworkIdentifier\@\@W4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void disconnectClient(class NetworkIdentifier const &, std::string const &); + MCAPI void disconnectClient(class NetworkIdentifier const &, enum class Connection::DisconnectFailReason, std::string const &); /** * @symbol ?earlyShutdownMainthread\@Minecraft\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/MinecraftCommands.hpp b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp index 00509d35ce..29b0822e3a 100644 --- a/LiteLoader/include/llapi/mc/MinecraftCommands.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp @@ -112,14 +112,14 @@ class MinecraftCommands { * @symbol ?runCommand\@MinecraftCommands\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z */ MCAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CurrentCmdVersion); - /** - * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXV?$not_null\@PEAVCommand\@\@\@gsl\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z - */ - MCAPI void runOrDeferCommand(class gsl::not_null, class CommandOrigin &, enum class CurrentCmdVersion); /** * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z */ MCAPI void runOrDeferCommand(class HashedString const &, class CommandOrigin &, enum class CurrentCmdVersion); + /** + * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXV?$not_null\@PEAVCommand\@\@\@gsl\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z + */ + MCAPI void runOrDeferCommand(class gsl::not_null, class CommandOrigin &, enum class CurrentCmdVersion); /** * @symbol ?setRegistryNetworkUpdateCallback\@MinecraftCommands\@\@QEBAXV?$function\@$$A6AXAEBVPacket\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp index fd1e1fe6c3..6ec138f8f3 100644 --- a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp @@ -56,9 +56,9 @@ enum class AcquisitionMethod; */ MCVAPI void fileEventCloudWorldPullFailed(std::string const &, std::string const &, bool); /** - * @symbol ?fireBannedSkinVerificationEvent\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z + * @symbol ?fireBannedSkinVerificationEvent\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ - MCVAPI void fireBannedSkinVerificationEvent(unsigned int const &, std::string const &, std::string const &, bool); + MCVAPI void fireBannedSkinVerificationEvent(unsigned int const &, std::string const &, std::string const &); /** * @symbol ?fireChatUsedEvent\@MinecraftEventing\@\@UEAAXI_N\@Z */ @@ -304,9 +304,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventEduContentVerificationFailed() const; /** - * @symbol ?fireEventEduDemoConversion\@MinecraftEventing\@\@UEAAXW4ADRole\@\@W4LastClickedSource\@\@\@Z + * @symbol ?fireEventEduDemoConversion\@MinecraftEventing\@\@UEAAXW4Role\@edu\@\@W4LastClickedSource\@\@\@Z */ - MCVAPI void fireEventEduDemoConversion(enum class ADRole, enum class LastClickedSource); + MCVAPI void fireEventEduDemoConversion(enum class edu::Role, enum class LastClickedSource); /** * @symbol ?fireEventEduResources\@MinecraftEventing\@\@UEBAXXZ */ @@ -343,6 +343,10 @@ enum class AcquisitionMethod; * @symbol ?fireEventFeedbackSubmitted\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ MCVAPI void fireEventFeedbackSubmitted(std::string const &, bool, bool); + /** + * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCVAPI void fireEventGameRulesUpdated(float, float, std::string const &); /** * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAX_N0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -351,10 +355,6 @@ enum class AcquisitionMethod; * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventGameRulesUpdated(int, int, std::string const &); - /** - * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCVAPI void fireEventGameRulesUpdated(float, float, std::string const &); /** * @symbol ?fireEventGoogleAccountHoldWarning\@MinecraftEventing\@\@UEAAX_N\@Z */ @@ -455,10 +455,6 @@ enum class AcquisitionMethod; * @symbol ?fireEventNpcPropertiesUpdated\@MinecraftEventing\@\@UEAAXAEAVActor\@\@_N\@Z */ MCVAPI void fireEventNpcPropertiesUpdated(class Actor &, bool); - /** - * @symbol ?fireEventOSKTextTruncation\@MinecraftEventing\@\@UEAAXI\@Z - */ - MCVAPI void fireEventOSKTextTruncation(unsigned int); /** * @symbol ?fireEventOfferRated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHHN\@Z */ @@ -475,6 +471,10 @@ enum class AcquisitionMethod; * @symbol ?fireEventOnAppSuspend\@MinecraftEventing\@\@UEAAXV?$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\@\@std\@\@_N\@Z */ MCVAPI void fireEventOnAppSuspend(std::vector>, bool); + /** + * @symbol ?fireEventOnClientDisconnect\@MinecraftEventing\@\@UEAAXW4SubClientId\@\@_NW4DisconnectFailReason\@Connection\@\@\@Z + */ + MCVAPI void fireEventOnClientDisconnect(enum class SubClientId, bool, enum class Connection::DisconnectFailReason); /** * @symbol ?fireEventOnDeviceLost\@MinecraftEventing\@\@UEAAXV?$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\@\@std\@\@\@Z */ @@ -512,9 +512,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventPackUpgradeAttempt(class PackManifest const &, class PackReport const &); /** - * @symbol ?fireEventPacketViolationDetected\@MinecraftEventing\@\@UEAAXAEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?fireEventPacketViolationDetected\@MinecraftEventing\@\@UEAAX_KV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z */ - MCVAPI void fireEventPacketViolationDetected(struct ExtendedStreamReadResult const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); + MCVAPI void fireEventPacketViolationDetected(unsigned __int64, std::string, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); /** * @symbol ?fireEventPerformanceContext\@MinecraftEventing\@\@UEAAXAEBVPerfContextTrackerReport\@\@\@Z */ @@ -575,6 +575,10 @@ enum class AcquisitionMethod; * @symbol ?fireEventPlayIntegrityCheck\@MinecraftEventing\@\@UEAAXHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCVAPI void fireEventPlayIntegrityCheck(int, std::string const &, std::string const &, std::string const &, std::string const &); + /** + * @symbol ?fireEventPlayerActionComparisonFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCVAPI void fireEventPlayerActionComparisonFailed(std::string const &); /** * @symbol ?fireEventPlayerAttemptingExploit\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@W4ExploitType\@IMinecraftEventing\@\@\@Z */ @@ -592,13 +596,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventPlayerDamaged(class Player *, enum class ActorDamageCause); /** - * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@_NW4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z + * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@_NV?$optional\@_N\@std\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z */ - MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, bool, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class Connection::DisconnectFailReason, enum class TransportLayer); - /** - * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@_NW4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@Z - */ - MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, bool, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class TransportLayer); + MCVAPI void fireEventPlayerJoinWorld(unsigned int const &, enum class SubClientId, bool, class std::optional, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class Connection::DisconnectFailReason, enum class TransportLayer); /** * @symbol ?fireEventPlayerKicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ @@ -787,10 +787,6 @@ enum class AcquisitionMethod; * @symbol ?fireEventSetValidForAchievements\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@_N\@Z */ MCVAPI void fireEventSetValidForAchievements(class Player *, bool); - /** - * @symbol ?fireEventSideBySideValidationError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0000_N11\@Z - */ - MCVAPI void fireEventSideBySideValidationError(std::string const &, std::string const &, std::string const &, std::string const &, std::string const &, bool, bool, bool); /** * @symbol ?fireEventSidebarNavigation\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1H_N22\@Z */ @@ -800,17 +796,17 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventSidebarVerboseToggled(unsigned int const &, std::string const &, std::string const &, bool); /** - * @symbol ?fireEventSignInEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@W4EduSignInStage\@IMinecraftEventing\@\@00AEBV?$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\@\@3\@\@Z + * @symbol ?fireEventSignInEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Role\@edu\@\@W4EduSignInStage\@IMinecraftEventing\@\@00AEBV?$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\@\@3\@\@Z */ - MCVAPI void fireEventSignInEdu(std::string const &, enum class ADRole, enum class IMinecraftEventing::EduSignInStage, std::string const &, std::string const &, std::vector> const &); + MCVAPI void fireEventSignInEdu(std::string const &, enum class edu::Role, enum class IMinecraftEventing::EduSignInStage, std::string const &, std::string const &, std::vector> const &); /** * @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(enum class IMinecraftEventing::SignInAccountType, enum class IMinecraftEventing::SignInTrigger, bool, enum class IMinecraftEventing::SignInStage, enum class 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\@\@W4ADRole\@\@00\@Z + * @symbol ?fireEventSignOutEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Role\@edu\@\@00\@Z */ - MCVAPI void fireEventSignOutEdu(std::string const &, enum class ADRole, std::string const &, std::string const &); + MCVAPI void fireEventSignOutEdu(std::string const &, enum class edu::Role, 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 */ @@ -884,9 +880,9 @@ enum class AcquisitionMethod; */ MCVAPI void fireEventStructureExport(struct glTFExportData const &, enum class IMinecraftEventing::ExportOutcome, enum class IMinecraftEventing::ExportStage) const; /** - * @symbol ?fireEventSwitchAccountEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@0\@Z + * @symbol ?fireEventSwitchAccountEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Role\@edu\@\@0\@Z */ - MCVAPI void fireEventSwitchAccountEdu(std::string const &, enum class ADRole, std::string const &); + MCVAPI void fireEventSwitchAccountEdu(std::string const &, enum class edu::Role, std::string const &); /** * @symbol ?fireEventTagButtonPressed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ @@ -1293,9 +1289,9 @@ enum class AcquisitionMethod; */ MCAPI void init(class Bedrock::NonOwnerPointer const &); /** - * @symbol ?initForDedicatedServer\@MinecraftEventing\@\@QEAAXAEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@_N1\@Z + * @symbol ?initForDedicatedServer\@MinecraftEventing\@\@QEAAXAEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@_N\@Z */ - MCAPI void initForDedicatedServer(class Bedrock::NonOwnerPointer const &, bool, bool); + MCAPI void initForDedicatedServer(class Bedrock::NonOwnerPointer const &, bool); /** * @symbol ?fireEventAwardAchievement\@MinecraftEventing\@\@SAXPEAVPlayer\@\@W4AchievementIds\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp index f817ab0794..86336c002c 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp @@ -169,14 +169,14 @@ class MinecraftGameTest : public BlockSourceListener { * @symbol ?registerNativeGameTests\@MinecraftGameTest\@\@QEAAXXZ */ MCAPI void registerNativeGameTests(); - /** - * @symbol ?runTest\@MinecraftGameTest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEAVDimension\@\@AEBUTestParameters\@gametest\@\@\@Z - */ - MCAPI std::string runTest(std::string const &, class Dimension &, struct gametest::TestParameters const &); /** * @symbol ?runTest\@MinecraftGameTest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEAVDimension\@\@AEBUTestParameters\@gametest\@\@V?$vector\@V?$shared_ptr\@VIGameTestListener\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VIGameTestListener\@gametest\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI std::string runTest(std::string const &, class Dimension &, struct gametest::TestParameters const &, std::vector>); + /** + * @symbol ?runTest\@MinecraftGameTest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEAVDimension\@\@AEBUTestParameters\@gametest\@\@\@Z + */ + MCAPI std::string runTest(std::string const &, class Dimension &, struct gametest::TestParameters const &); /** * @symbol ?runTestAt\@MinecraftGameTest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@V?$optional\@W4Rotation\@\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MingleGoal.hpp b/LiteLoader/include/llapi/mc/MingleGoal.hpp index 4c2c52dd6e..519aa56fac 100644 --- a/LiteLoader/include/llapi/mc/MingleGoal.hpp +++ b/LiteLoader/include/llapi/mc/MingleGoal.hpp @@ -90,10 +90,18 @@ class MingleGoal : public MoveToPOIGoal { * @symbol ?_findNewPartner\@MingleGoal\@\@AEAAXUActorUniqueID\@\@\@Z */ MCAPI void _findNewPartner(struct ActorUniqueID); + /** + * @symbol ?_getMingleComponent\@MingleGoal\@\@AEBAAEAVMingleComponent\@\@XZ + */ + MCAPI class MingleComponent & _getMingleComponent() const; /** * @symbol ?_isWithinInteractRange\@MingleGoal\@\@AEBA_NAEAVActor\@\@\@Z */ MCAPI bool _isWithinInteractRange(class Actor &) const; + /** + * @symbol ?_tryGetMingleComponent\@MingleGoal\@\@CAPEAVMingleComponent\@\@AEAVActor\@\@\@Z + */ + MCAPI static class MingleComponent * _tryGetMingleComponent(class Actor &); private: /** diff --git a/LiteLoader/include/llapi/mc/Mob.hpp b/LiteLoader/include/llapi/mc/Mob.hpp index 8c9936c10e..c182b643da 100644 --- a/LiteLoader/include/llapi/mc/Mob.hpp +++ b/LiteLoader/include/llapi/mc/Mob.hpp @@ -77,727 +77,692 @@ struct JumpPreventionResult { */ virtual void __unk_vfn_16(); /** - * @vftbl 30 + * @vftbl 27 * @symbol ?getInterpolatedBodyRot\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyRot(float) const; /** - * @vftbl 31 + * @vftbl 28 * @symbol ?getInterpolatedHeadRot\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedHeadRot(float) const; /** - * @vftbl 32 + * @vftbl 29 * @symbol ?getInterpolatedBodyYaw\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 33 + * @vftbl 30 * @symbol ?getYawSpeedInDegreesPerSecond\@Mob\@\@UEBAMXZ */ virtual float getYawSpeedInDegreesPerSecond() const; /** - * @vftbl 36 + * @vftbl 33 * @symbol ?resetInterpolated\@Mob\@\@UEAAXXZ */ virtual void resetInterpolated(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 41 + * @vftbl 36 * @symbol ?blockedByShield\@Mob\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@Mob\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Mob\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 49 + * @vftbl 44 * @symbol ?baseTick\@Mob\@\@UEAAXXZ */ virtual void baseTick(); /** - * @vftbl 52 + * @vftbl 47 * @symbol ?startRiding\@Mob\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 53 + * @vftbl 48 * @symbol ?addPassenger\@Mob\@\@UEAAXAEAVActor\@\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 90 + * @vftbl 79 * @symbol ?isImmobile\@Mob\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Mob\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 95 + * @vftbl 84 * @symbol ?isSleeping\@Mob\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 96 + * @vftbl 85 * @symbol ?setSleeping\@Mob\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 99 + * @vftbl 88 * @symbol ?isBlocking\@Mob\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 101 + * @vftbl 90 * @symbol ?isAlive\@Mob\@\@UEBA_NXZ */ virtual bool isAlive() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 105 + * @vftbl 94 * @symbol ?isSurfaceMob\@Mob\@\@UEBA_NXZ */ virtual bool isSurfaceMob() const; /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 112 + * @vftbl 101 * @symbol ?setTarget\@Mob\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 114 + * @vftbl 103 * @symbol ?attack\@Mob\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 125 + * @vftbl 114 * @symbol ?canPowerJump\@Mob\@\@UEBA_NXZ */ virtual bool canPowerJump() const; /** - * @vftbl 133 + * @vftbl 121 * @symbol ?getBlockDamageCause\@Mob\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z */ virtual enum class ActorDamageCause getBlockDamageCause(class Block const &) const; /** - * @vftbl 134 + * @vftbl 122 * @symbol ?animateHurt\@Mob\@\@UEAAXXZ */ virtual void animateHurt(); /** - * @vftbl 135 + * @vftbl 123 * @symbol ?doFireHurt\@Mob\@\@UEAA_NH\@Z */ virtual bool doFireHurt(int); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Mob\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 151 + * @vftbl 139 * @symbol ?getArmorMaterialTypeInSlot\@Mob\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorMaterialType getArmorMaterialTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 152 + * @vftbl 140 * @symbol ?getArmorMaterialTextureTypeInSlot\@Mob\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorTextureType getArmorMaterialTextureTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 153 + * @vftbl 141 * @symbol ?getArmorColorInSlot\@Mob\@\@UEBAMW4ArmorSlot\@\@H\@Z */ virtual float getArmorColorInSlot(enum class ArmorSlot, int) const; /** - * @vftbl 155 + * @vftbl 143 * @symbol ?setEquippedSlot\@Mob\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setEquippedSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 169 + * @vftbl 157 * @symbol ?canFreeze\@Mob\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@Mob\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@Mob\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 188 + * @vftbl 176 * @symbol ?canBePulledIntoVehicle\@Mob\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 189 + * @vftbl 177 * @symbol ?inCaravan\@Mob\@\@UEBA_NXZ */ virtual bool inCaravan() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 - */ - virtual void __unk_vfn_190(); - /** - * @vftbl 194 - * @symbol ?stopRiding\@Mob\@\@UEAAX_N00\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void stopRiding(bool, bool, bool); + virtual void __unk_vfn_178(); /** - * @vftbl 197 + * @vftbl 184 * @symbol ?buildDebugInfo\@Mob\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 202 + * @vftbl 189 * @symbol ?getDeathTime\@Mob\@\@UEBAHXZ */ virtual int getDeathTime() const; /** - * @vftbl 213 + * @vftbl 200 * @symbol ?swing\@Mob\@\@UEAAXXZ */ virtual void swing(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 236 + * @vftbl 223 * @symbol ?kill\@Mob\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@Mob\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 238 + * @vftbl 225 * @symbol ?shouldDropDeathLoot\@Mob\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Mob\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Mob\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Mob\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Mob\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Mob\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 265 + * @vftbl 251 * @symbol ?_removePassenger\@Mob\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z */ virtual void _removePassenger(struct ActorUniqueID const &, bool, bool, bool); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Mob\@\@MEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?knockback\@Mob\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?spawnAnim\@Mob\@\@UEAAXXZ */ virtual void spawnAnim(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?setSprinting\@Mob\@\@UEAAX_N\@Z */ virtual void setSprinting(bool); /** - * @vftbl 271 + * @vftbl 257 * @symbol ?getHurtSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getHurtSound(); /** - * @vftbl 272 + * @vftbl 258 * @symbol ?getDeathSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getDeathSound(); /** - * @vftbl 273 + * @vftbl 259 * @symbol ?getSpeed\@Mob\@\@UEBAMXZ */ virtual float getSpeed() const; /** - * @vftbl 274 + * @vftbl 260 * @symbol ?setSpeed\@Mob\@\@UEAAXM\@Z */ virtual void setSpeed(float); /** - * @vftbl 275 + * @vftbl 261 * @symbol ?hurtEffects\@Mob\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 276 + * @vftbl 262 * @symbol ?getMeleeWeaponDamageBonus\@Mob\@\@UEAAMPEAV1\@\@Z */ virtual float getMeleeWeaponDamageBonus(class Mob *); /** - * @vftbl 277 + * @vftbl 263 * @symbol ?getMeleeKnockbackBonus\@Mob\@\@UEAAHXZ */ virtual int getMeleeKnockbackBonus(); /** - * @vftbl 278 - * @symbol ?travel\@Mob\@\@UEAAXMMM_N\@Z - */ - virtual void travel(float, float, float, bool); - /** - * @vftbl 279 - * @symbol ?applyFinalFriction\@Mob\@\@UEAAXM_N\@Z - */ - virtual void applyFinalFriction(float, bool); - /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Mob\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 281 + * @vftbl 265 * @symbol ?aiStep\@Mob\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z */ virtual void aiStep(struct IMobMovementProxy &) const; /** - * @vftbl 282 + * @vftbl 266 * @symbol ?pushActors\@Mob\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 283 + * @vftbl 267 * @symbol ?lookAt\@Mob\@\@UEAAXPEAVActor\@\@MM\@Z */ virtual void lookAt(class Actor *, float, float); /** - * @vftbl 284 - * @symbol ?isLookingAtAnEntity\@Mob\@\@UEAA_NXZ - */ - virtual bool isLookingAtAnEntity(); - /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Mob\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 286 + * @vftbl 269 * @symbol ?checkSpawnObstruction\@Mob\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 287 + * @vftbl 270 * @symbol ?getAttackAnim\@Mob\@\@UEAAMM\@Z */ virtual float getAttackAnim(float); /** - * @vftbl 288 + * @vftbl 271 * @symbol ?getItemUseDuration\@Mob\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 289 + * @vftbl 272 * @symbol ?getItemUseStartupProgress\@Mob\@\@UEBAMXZ */ virtual float getItemUseStartupProgress() const; /** - * @vftbl 290 + * @vftbl 273 * @symbol ?getItemUseIntervalProgress\@Mob\@\@UEBAMXZ */ virtual float getItemUseIntervalProgress() const; /** - * @vftbl 291 + * @vftbl 274 * @symbol ?getItemUseIntervalAxis\@Mob\@\@UEBAHXZ */ virtual int getItemUseIntervalAxis() const; /** - * @vftbl 292 + * @vftbl 275 * @symbol ?getTimeAlongSwing\@Mob\@\@UEBAHXZ */ virtual int getTimeAlongSwing() const; /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 294 + * @vftbl 277 * @symbol ?getMaxHeadXRot\@Mob\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 295 + * @vftbl 278 * @symbol ?isAlliedTo\@Mob\@\@UEAA_NPEAV1\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 296 + * @vftbl 279 * @symbol ?doHurtTarget\@Mob\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 298 + * @vftbl 281 * @symbol ?leaveCaravan\@Mob\@\@UEAAXXZ */ virtual void leaveCaravan(); /** - * @vftbl 299 + * @vftbl 282 * @symbol ?joinCaravan\@Mob\@\@UEAAXPEAV1\@\@Z */ virtual void joinCaravan(class Mob *); /** - * @vftbl 300 + * @vftbl 283 * @symbol ?hasCaravanTail\@Mob\@\@UEBA_NXZ */ virtual bool hasCaravanTail() const; /** - * @vftbl 301 + * @vftbl 284 * @symbol ?getCaravanHead\@Mob\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getCaravanHead() const; /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@Mob\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 303 + * @vftbl 286 * @symbol ?getArmorCoverPercentage\@Mob\@\@UEBAMXZ */ virtual float getArmorCoverPercentage() const; /** - * @vftbl 304 + * @vftbl 287 * @symbol ?getToughnessValue\@Mob\@\@UEBAHXZ */ virtual int getToughnessValue() const; /** - * @vftbl 305 + * @vftbl 288 * @symbol ?hurtArmorSlots\@Mob\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z */ virtual void hurtArmorSlots(class ActorDamageSource const &, int, class std::bitset<4>); /** - * @vftbl 306 + * @vftbl 289 * @symbol ?setDamagedArmor\@Mob\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setDamagedArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 307 + * @vftbl 290 * @symbol ?sendArmorDamage\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmorDamage(class std::bitset<4>); /** - * @vftbl 308 + * @vftbl 291 * @symbol ?sendArmor\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmor(class std::bitset<4>); /** - * @vftbl 309 + * @vftbl 292 * @symbol ?containerChanged\@Mob\@\@UEAAXH\@Z */ virtual void containerChanged(int); /** - * @vftbl 310 + * @vftbl 293 * @symbol ?updateEquipment\@Mob\@\@UEAAXXZ */ virtual void updateEquipment(); /** - * @vftbl 311 + * @vftbl 294 * @symbol ?clearEquipment\@Mob\@\@UEAAHXZ */ virtual int clearEquipment(); /** - * @vftbl 312 + * @vftbl 295 * @symbol ?getAllArmorID\@Mob\@\@UEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ */ virtual std::vector getAllArmorID() const; /** - * @vftbl 313 + * @vftbl 296 * @symbol ?getAllHand\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllHand() const; /** - * @vftbl 314 + * @vftbl 297 * @symbol ?getAllEquipment\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllEquipment() const; /** - * @vftbl 315 + * @vftbl 298 * @symbol ?getArmorTypeHash\@Mob\@\@UEAAHXZ */ virtual int getArmorTypeHash(); /** - * @vftbl 316 + * @vftbl 299 * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXAEBVActorDamageSource\@\@H\@Z */ virtual void dropEquipmentOnDeath(class ActorDamageSource const &, int); /** - * @vftbl 317 + * @vftbl 300 * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXXZ */ virtual void dropEquipmentOnDeath(); /** - * @vftbl 318 + * @vftbl 301 * @symbol ?clearVanishEnchantedItemsOnDeath\@Mob\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 319 + * @vftbl 302 * @symbol ?sendInventory\@Mob\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 320 + * @vftbl 303 * @symbol ?getDamageAfterEnchantReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterEnchantReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 321 + * @vftbl 304 * @symbol ?getDamageAfterArmorReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterArmorReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 322 + * @vftbl 305 * @symbol ?getDamageAfterResistanceEffect\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterResistanceEffect(class ActorDamageSource const &, float) const; /** - * @vftbl 323 + * @vftbl 306 * @symbol ?createAIGoals\@Mob\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 324 + * @vftbl 307 * @symbol ?onBorn\@Mob\@\@UEAAXAEAVActor\@\@0\@Z */ virtual void onBorn(class Actor &, class Actor &); /** - * @vftbl 325 + * @vftbl 308 * @symbol ?setItemSlot\@Mob\@\@UEAA_NW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool setItemSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 326 + * @vftbl 309 * @symbol ?setTransitioningSitting\@Mob\@\@UEAAX_N\@Z */ virtual void setTransitioningSitting(bool); /** - * @vftbl 327 + * @vftbl 310 * @symbol ?attackAnimation\@Mob\@\@UEAAXPEAVActor\@\@M\@Z */ virtual void attackAnimation(class Actor *, float); /** - * @vftbl 328 + * @vftbl 311 * @symbol ?getAttackTime\@Mob\@\@UEAAHXZ */ virtual int getAttackTime(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Mob\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 330 + * @vftbl 313 * @symbol ?canExistWhenDisallowMob\@Mob\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 331 - * @symbol ?ascendLadder\@Mob\@\@UEAAXXZ - */ - virtual void ascendLadder(); - /** - * @vftbl 332 + * @vftbl 314 * @symbol ?ascendBlockByJumping\@Mob\@\@UEAAXXZ */ virtual void ascendBlockByJumping(); /** - * @vftbl 333 + * @vftbl 315 * @symbol ?descendBlockByCrouching\@Mob\@\@UEAAXXZ */ virtual void descendBlockByCrouching(); /** - * @vftbl 334 + * @vftbl 316 * @symbol ?dropContainer\@Mob\@\@UEAAXXZ */ virtual void dropContainer(); /** - * @vftbl 335 + * @vftbl 317 * @symbol ?initBodyControl\@Mob\@\@MEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 336 - * @symbol ?jumpFromGround\@Mob\@\@MEAAXAEBVIConstBlockSource\@\@\@Z - */ - virtual void jumpFromGround(class IConstBlockSource const &); - /** - * @vftbl 337 - * @symbol ?jumpFromGround\@Mob\@\@MEBAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - virtual void jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &) const; - /** - * @vftbl 338 + * @vftbl 318 * @symbol ?newServerAiStep\@Mob\@\@MEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 339 + * @vftbl 319 * @symbol ?_serverAiMobStep\@Mob\@\@MEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 340 + * @vftbl 320 * @symbol ?dropBags\@Mob\@\@MEAAXXZ */ virtual void dropBags(); /** - * @vftbl 341 + * @vftbl 321 * @symbol ?tickDeath\@Mob\@\@MEAAXXZ */ virtual void tickDeath(); /** - * @vftbl 342 + * @vftbl 322 * @symbol ?updateGliding\@Mob\@\@MEAAXXZ */ virtual void updateGliding(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 344 + * @vftbl 324 * @symbol ?_getAdjustedAABBForSpawnCheck\@Mob\@\@MEBA?AVAABB\@\@AEBV2\@AEBVVec3\@\@\@Z */ virtual class AABB _getAdjustedAABBForSpawnCheck(class AABB const &, class Vec3 const &) const; @@ -879,6 +844,10 @@ struct JumpPreventionResult { * @symbol ?getEatCounter\@Mob\@\@QEBAHXZ */ MCAPI int getEatCounter() const; + /** + * @symbol ?getExpectedFallDamage\@Mob\@\@QEBAMMM\@Z + */ + MCAPI float getExpectedFallDamage(float, float) const; /** * @symbol ?getFirstCaravanHead\@Mob\@\@QEAAPEAV1\@XZ */ @@ -899,18 +868,10 @@ struct JumpPreventionResult { * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMXZ */ MCAPI float getJumpMultiplier(); - /** - * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMAEBVIConstBlockSource\@\@\@Z - */ - MCAPI float getJumpMultiplier(class IConstBlockSource const &); /** * @symbol ?getJumpPower\@Mob\@\@QEBAMXZ */ MCAPI float getJumpPower() const; - /** - * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI struct JumpPreventionResult getJumpPrevention(class IConstBlockSource const &); /** * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@XZ */ @@ -1047,14 +1008,6 @@ struct JumpPreventionResult { * @symbol ?setNaturallySpawned\@Mob\@\@QEAAX_N\@Z */ MCAPI void setNaturallySpawned(bool); - /** - * @symbol ?setPassengerLockedBodyRot\@Mob\@\@QEAAXM\@Z - */ - MCAPI void setPassengerLockedBodyRot(float); - /** - * @symbol ?setPassengerRotLimit\@Mob\@\@QEAAXM\@Z - */ - MCAPI void setPassengerRotLimit(float); /** * @symbol ?setRolling\@Mob\@\@QEAAX_N\@Z */ @@ -1183,30 +1136,10 @@ struct JumpPreventionResult { * @symbol ?_calcMoveRelativeSpeed\@Mob\@\@SAMAEAUIMobMovementProxy\@\@W4TravelType\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static float _calcMoveRelativeSpeed(struct IMobMovementProxy &, enum class TravelType, class IConstBlockSource const &); - /** - * @symbol ?_travel\@Mob\@\@SAXAEAUIMobMovementProxy\@\@MMM_N\@Z - */ - MCAPI static void _travel(struct IMobMovementProxy &, float, float, float, bool); - /** - * @symbol ?_updateMobTravel\@Mob\@\@SAXAEAUIMobMovementProxy\@\@_N\@Z - */ - MCAPI static void _updateMobTravel(struct IMobMovementProxy &, bool); - /** - * @symbol ?calculateJumpImpulse\@Mob\@\@SAMAEBUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static float calculateJumpImpulse(struct IMobMovementProxy const &, class IConstBlockSource const &); - /** - * @symbol ?getJumpEffectAmplifierValue\@Mob\@\@SAMAEBUIMobMovementProxy\@\@\@Z - */ - MCAPI static float getJumpEffectAmplifierValue(struct IMobMovementProxy const &); /** * @symbol ?getJumpPrevention\@Mob\@\@SA?AUJumpPreventionResult\@\@AEBUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static struct JumpPreventionResult getJumpPrevention(struct IMobMovementProxy const &, class IConstBlockSource const &); - /** - * @symbol ?getTravelType\@Mob\@\@SA?AW4TravelType\@\@AEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static enum class TravelType getTravelType(struct IMobMovementProxy &, class IConstBlockSource const &); /** * @symbol ?isImmobile\@Mob\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ @@ -1249,6 +1182,10 @@ struct JumpPreventionResult { * @symbol ?getCurrentSwingDuration\@Mob\@\@IEAAHXZ */ MCAPI int getCurrentSwingDuration(); + /** + * @symbol ?jumpFromGround\@Mob\@\@IEAAXAEBVIConstBlockSource\@\@\@Z + */ + MCAPI void jumpFromGround(class IConstBlockSource const &); /** * @symbol ?saveOffhand\@Mob\@\@IEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ @@ -1269,10 +1206,6 @@ struct JumpPreventionResult { * @symbol ?updateGlidingDurability\@Mob\@\@IEAA_NXZ */ MCAPI bool updateGlidingDurability(); - /** - * @symbol ?_jumpFromGround\@Mob\@\@KAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static void _jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &); //private: /** @@ -1295,14 +1228,6 @@ struct JumpPreventionResult { * @symbol ?_verifyAttributes\@Mob\@\@AEAAXXZ */ MCAPI void _verifyAttributes(); - /** - * @symbol ?_executeDash\@Mob\@\@CAXAEAV1\@AEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static void _executeDash(class Mob &, struct IMobMovementProxy &, class IConstBlockSource const &); - /** - * @symbol ?_tryApplyingLevitation\@Mob\@\@CA_NAEBUIMobMovementProxy\@\@AEAVVec3\@\@\@Z - */ - MCAPI static bool _tryApplyingLevitation(struct IMobMovementProxy const &, class Vec3 &); protected: /** diff --git a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp index b1d5ea6db4..489d9f993a 100644 --- a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class MobArmorEquipmentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MobArmorEquipmentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MobArmorEquipmentPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBARMOREQUIPMENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp index 46c1f7ae97..ceb755e644 100644 --- a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp @@ -31,21 +31,17 @@ char filler[122]; public: /** - * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z */ - MCAPI MobEffectInstance(unsigned int); + MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool); /** * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z */ MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z - */ - MCAPI MobEffectInstance(unsigned int, int, int); - /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z */ - MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool); + MCAPI MobEffectInstance(unsigned int, int); /** * @symbol ??0MobEffectInstance\@\@QEAA\@$$QEAV0\@\@Z */ @@ -55,9 +51,13 @@ char filler[122]; */ MCAPI MobEffectInstance(class MobEffectInstance const &); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z */ - MCAPI MobEffectInstance(unsigned int, int); + MCAPI MobEffectInstance(unsigned int, int, int); + /** + * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z + */ + MCAPI MobEffectInstance(unsigned int); /** * @symbol ?applyEffects\@MobEffectInstance\@\@QEAAXPEAVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp index 8b2720cd5a..8817f77db9 100644 --- a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -20,6 +21,21 @@ class MobEffectPacket : public Packet { #define AFTER_EXTRA // Add Member There +public: + enum class Event : char + { + Invalid_21 = 0x0, + Add_1 = 0x1, + Update_0 = 0x2, + Remove_0 = 0x3, + }; + + ActorRuntimeID mRuntimeId; + int mEffectDurationTicks; + MobEffectPacket::Event mEventId; + int mEffectId; + int mEffectAmplifier; + bool mShowParticles; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOBEFFECTPACKET @@ -51,9 +67,9 @@ class MobEffectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MobEffectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MobEffectPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEFFECTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp b/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp index 17c1c5a2c8..21972085c1 100644 --- a/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp @@ -31,9 +31,5 @@ struct MobEffectsComponent { * @symbol ??4MobEffectsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct MobEffectsComponent & operator=(struct MobEffectsComponent &&); - /** - * @symbol ??1MobEffectsComponent\@\@QEAA\@XZ - */ - MCAPI ~MobEffectsComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp index 02440b7cf7..fc260a51a5 100644 --- a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -54,9 +55,9 @@ class MobEquipmentPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MobEquipmentPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MobEquipmentPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEQUIPMENTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MobEventCommand.hpp b/LiteLoader/include/llapi/mc/MobEventCommand.hpp index 606d31fa85..6dacae162b 100644 --- a/LiteLoader/include/llapi/mc/MobEventCommand.hpp +++ b/LiteLoader/include/llapi/mc/MobEventCommand.hpp @@ -42,7 +42,7 @@ struct InitProxy { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@MobEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/MobEvents.hpp b/LiteLoader/include/llapi/mc/MobEvents.hpp index dbc8e00566..9d61ef9700 100644 --- a/LiteLoader/include/llapi/mc/MobEvents.hpp +++ b/LiteLoader/include/llapi/mc/MobEvents.hpp @@ -45,6 +45,10 @@ class MobEvents { * @symbol ?getIndexFromName\@MobEvents\@\@QEBA?AW4MobEventsIndex\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class MobEventsIndex getIndexFromName(std::string const &) const; + /** + * @symbol ?initializeWithLevelStorageManager\@MobEvents\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void initializeWithLevelStorageManager(class LevelStorageManager &); /** * @symbol ?isEnabled\@MobEvents\@\@QEBA_NW4MobEventsIndex\@\@\@Z */ @@ -82,4 +86,12 @@ class MobEvents { */ MCAPI static std::string const EVENTS_ENABLED_STRING; +//private: + /** + * @symbol ?_onSaveEvent\@MobEvents\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _onSaveEvent(class LevelStorage &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp index 925381da9e..0926213280 100644 --- a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp @@ -28,16 +28,12 @@ class MobIsImmobileFilterSystem { * @symbol ?createSystem\@MobIsImmobileFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@MobIsImmobileFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsImmobileFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT const, class FlagComponent const>>, class ViewT>>, class ViewT>, struct AttributesComponent const, class Optional>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>, class EntityModifierT>); //private: /** - * @symbol ?tickImmobileFilter\@MobIsImmobileFilterSystem\@\@CAXAEAVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsImmobileFlag\@\@\@\@\@\@\@Z + * @symbol ?tickImmobileFilter\@MobIsImmobileFilterSystem\@\@CAXU?$type_list\@U?$Include\@$$CBV?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@\@entt\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsImmobileFlag\@\@\@\@\@\@\@Z */ - MCAPI static void tickImmobileFilter(class StrictEntityContext &, class ViewT>>, class ViewT>, struct AttributesComponent const, class Optional>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>, class EntityModifierT>); + MCAPI static void tickImmobileFilter(struct entt::type_list const, class FlagComponent const>>, class StrictEntityContext const &, class ViewT>>, class ViewT>, struct AttributesComponent const, class Optional>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>, class EntityModifierT>); private: diff --git a/LiteLoader/include/llapi/mc/MobJump.hpp b/LiteLoader/include/llapi/mc/MobJump.hpp index ab5eeedcb6..a2d6f3b074 100644 --- a/LiteLoader/include/llapi/mc/MobJump.hpp +++ b/LiteLoader/include/llapi/mc/MobJump.hpp @@ -16,18 +16,10 @@ namespace MobJump { #define AFTER_EXTRA #undef AFTER_EXTRA - /** - * @symbol ?getJumpPendingScale\@MobJump\@\@YAMAEBVEntityContext\@\@\@Z - */ - MCAPI float getJumpPendingScale(class EntityContext const &); /** * @symbol ?getJumpStartPosition\@MobJump\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getJumpStartPosition(class EntityContext const &); - /** - * @symbol ?getJumpVelRedux\@MobJump\@\@YA_NAEBVEntityContext\@\@\@Z - */ - MCAPI bool getJumpVelRedux(class EntityContext const &); /** * @symbol ?getNoJumpDelay\@MobJump\@\@YAHAEBVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobJumpFromGroundSystemImpl.hpp b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystemImpl.hpp index 405bb4f1ca..cdfbf16954 100644 --- a/LiteLoader/include/llapi/mc/MobJumpFromGroundSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystemImpl.hpp @@ -21,13 +21,13 @@ namespace MobJumpFromGroundSystemImpl { */ MCAPI void doFilter(class StrictEntityContext const &, class Optional> const &, class Optional> const &, class Optional> const &, class EntityModifierT, class FlagComponent, class FlagComponent, class FlagComponent>); /** - * @symbol ?doLavaSlimeJumpFromGround\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UTriggerJumpRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?doLavaSlimeJumpFromGround\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUStateVectorComponent\@\@AEBUMobEffectsComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UTriggerJumpRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI void doLavaSlimeJumpFromGround(class StrictEntityContext const &, struct AABBShapeComponent const &, struct SynchedActorDataComponent const &, struct StateVectorComponent &, class EntityModifierT &, class IConstBlockSource const &); + MCAPI void doLavaSlimeJumpFromGround(class StrictEntityContext const &, struct AABBShapeComponent const &, struct SynchedActorDataComponent const &, struct StateVectorComponent &, struct MobEffectsComponent const &, class EntityModifierT &, class IConstBlockSource const &); /** - * @symbol ?doLocalPlayerJumpFromGround\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@$$CBVJumpControlComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUActorRotationComponent\@\@AEBUMobEffectsComponent\@\@AEAUMobJumpComponent\@\@AEAUStateVectorComponent\@\@AEAUPlayerActionComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UMobEffectsComponent\@\@USynchedActorDataComponent\@\@VJumpControlComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMobJumpComponent\@\@UStateVectorComponent\@\@UPlayerActionComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UTriggerJumpRequestComponent\@\@\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?doLocalPlayerJumpFromGround\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@$$CBVJumpControlComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUActorRotationComponent\@\@AEBUMobEffectsComponent\@\@AEAUMobJumpComponent\@\@AEAUStateVectorComponent\@\@AEAUPlayerActionComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@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 &, class Optional const &, struct AABBShapeComponent const &, struct SynchedActorDataComponent const &, struct ActorRotationComponent const &, struct MobEffectsComponent const &, struct MobJumpComponent &, struct StateVectorComponent &, struct PlayerActionComponent &, class EntityModifierT &, 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 IConstBlockSource const &); + MCAPI void doLocalPlayerJumpFromGround(class StrictEntityContext const &, class Optional const &, struct AABBShapeComponent const &, struct SynchedActorDataComponent const &, struct ActorRotationComponent const &, struct MobEffectsComponent const &, struct MobJumpComponent &, struct StateVectorComponent &, struct PlayerActionComponent &, class EntityModifierT &, 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, class Optional, struct AABBShapeComponent, struct ActorRotationComponent, struct MobEffectsComponent, struct SynchedActorDataComponent, class JumpControlComponent, struct DimensionTypeComponent>, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); /** * @symbol ?doOtherMobJumpFromGround\@MobJumpFromGroundSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@$$CBVJumpControlComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUActorRotationComponent\@\@AEBUMobEffectsComponent\@\@AEAUMobJumpComponent\@\@AEAUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UTriggerJumpRequestComponent\@\@\@\@_NAEBVIConstBlockSource\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobJumpSystemImpl.hpp b/LiteLoader/include/llapi/mc/MobJumpSystemImpl.hpp index 2d082fc027..1915d57c09 100644 --- a/LiteLoader/include/llapi/mc/MobJumpSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/MobJumpSystemImpl.hpp @@ -17,9 +17,9 @@ namespace MobJumpSystemImpl { #undef AFTER_EXTRA /** - * @symbol ?doDecrementNoJumpDelaySystem\@MobJumpSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEAUMobJumpComponent\@\@\@Z + * @symbol ?doDecrementNoJumpDelaySystem\@MobJumpSystemImpl\@\@YAXAEAUMobJumpComponent\@\@\@Z */ - MCAPI void doDecrementNoJumpDelaySystem(class StrictEntityContext &, struct MobJumpComponent &); + MCAPI void doDecrementNoJumpDelaySystem(struct MobJumpComponent &); /** * @symbol ?doMobJumpSystem\@MobJumpSystemImpl\@\@YAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBVJumpControlComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USquidFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasAutoJumpingFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UImmuneToLavaDragFlag\@\@\@\@\@\@AEBUAABBShapeComponent\@\@AEBUSwimAmountComponent\@\@AEBUMobEffectsComponent\@\@AEBUSubBBsComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUMobJumpComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UJumpFromGroundRequestFlag\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp b/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp index a46333f81f..b67cb173b9 100644 --- a/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp @@ -31,17 +31,5 @@ class MobResetPassengerYRotLimitSystem { * @symbol ?createSystem\@MobResetPassengerYRotLimitSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@MobResetPassengerYRotLimitSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@UPassengerYRotLimitComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT>, struct PassengerYRotLimitComponent>); - -//private: - /** - * @symbol ?_tickPassengerView\@MobResetPassengerYRotLimitSystem\@\@CAXAEAVStrictEntityContext\@\@AEAUPassengerYRotLimitComponent\@\@\@Z - */ - MCAPI static void _tickPassengerView(class StrictEntityContext &, struct PassengerYRotLimitComponent &); - -private: }; diff --git a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp index a139361743..44b858cf26 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp @@ -28,17 +28,17 @@ class MobSpawnRules { public: /** - * @symbol ??0MobSpawnRules\@\@QEAA\@XZ + * @symbol ??0MobSpawnRules\@\@QEAA\@AEBV0\@\@Z */ - MCAPI MobSpawnRules(); + MCAPI MobSpawnRules(class MobSpawnRules const &); /** * @symbol ??0MobSpawnRules\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI MobSpawnRules(class MobSpawnRules &&); /** - * @symbol ??0MobSpawnRules\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MobSpawnRules\@\@QEAA\@XZ */ - MCAPI MobSpawnRules(class MobSpawnRules const &); + MCAPI MobSpawnRules(); /** * @symbol ?addHerd\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp index c457c2c1bf..46163bbb81 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp @@ -36,25 +36,15 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@MobSpawnerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class MobSpawnerBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class MobSpawnerBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class MobSpawnerBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +121,55 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 - * @symbol ?canContainLiquid\@MobSpawnerBlock\@\@UEBA_NXZ + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canContainLiquid() const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 64 + * @symbol ?canContainLiquid\@MobSpawnerBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,62 +181,67 @@ class MobSpawnerBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@MobSpawnerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@MobSpawnerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp b/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp index 8b42c9775d..380281bbaa 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp @@ -65,6 +65,11 @@ class MobSpawnerBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -91,17 +96,22 @@ class MobSpawnerBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@MobSpawnerBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@MobSpawnerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); @@ -113,5 +123,9 @@ class MobSpawnerBlockActor : public BlockActor { * @symbol ?getSpawner\@MobSpawnerBlockActor\@\@QEAAAEAVBaseMobSpawner\@\@XZ */ MCAPI class BaseMobSpawner & getSpawner(); + /** + * @symbol ?setMob\@MobSpawnerBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@\@Z + */ + MCAPI void setMob(class BlockSource &, struct ActorDefinitionIdentifier const &, class Actor *); }; diff --git a/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp index 6b8d28f049..24acdf53ca 100644 --- a/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp @@ -20,9 +20,5 @@ namespace MobTravelFilterSystem { * @symbol ?createSystem\@MobTravelFilterSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?createUpdateSystem\@MobTravelFilterSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createUpdateSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobTravelImmobileFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelImmobileFilterSystem.hpp index 19ab9f6454..e7dca35122 100644 --- a/LiteLoader/include/llapi/mc/MobTravelImmobileFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobTravelImmobileFilterSystem.hpp @@ -28,5 +28,9 @@ class MobTravelImmobileFilterSystem { * @symbol ?create\@MobTravelImmobileFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?tick\@MobTravelImmobileFilterSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UMobTravelComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobTravelComponent\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT>, class ViewT>>, class ViewT>, struct AttributesComponent const, class Optional>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/MobTravelIntentSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelIntentSystem.hpp index 85fb504003..d42a43452f 100644 --- a/LiteLoader/include/llapi/mc/MobTravelIntentSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobTravelIntentSystem.hpp @@ -20,9 +20,5 @@ namespace MobTravelIntentSystem { * @symbol ?createSystem\@MobTravelIntentSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?createUpdateSystem\@MobTravelIntentSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createUpdateSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobTravelPlaceholderFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelPlaceholderFilterSystem.hpp index b5f8faecb1..11927d6ba8 100644 --- a/LiteLoader/include/llapi/mc/MobTravelPlaceholderFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobTravelPlaceholderFilterSystem.hpp @@ -28,10 +28,6 @@ class MobTravelPlaceholderFilterSystem { * @symbol ?create\@MobTravelPlaceholderFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); - /** - * @symbol ?createSideBySide\@MobTravelPlaceholderFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); /** * @symbol ?tick\@MobTravelPlaceholderFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobTravelComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp index 338e4b2261..9d2a6ef731 100644 --- a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -54,22 +55,22 @@ class ModalFormRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ModalFormRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ModalFormRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MODALFORMREQUESTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ModalFormRequestPacket(); #endif - /** - * @symbol ??0ModalFormRequestPacket\@\@QEAA\@XZ - */ - MCAPI ModalFormRequestPacket(); /** * @symbol ??0ModalFormRequestPacket\@\@QEAA\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ModalFormRequestPacket(unsigned int, std::string const &); + /** + * @symbol ??0ModalFormRequestPacket\@\@QEAA\@XZ + */ + MCAPI ModalFormRequestPacket(); }; diff --git a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp index 3922f0f8bf..06c6664bba 100644 --- a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -55,9 +56,9 @@ class ModalFormResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ModalFormResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ModalFormResponsePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ModalFormResponsePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MolangDescriptor.hpp b/LiteLoader/include/llapi/mc/MolangDescriptor.hpp index 176e4505ea..ef9a78d5b6 100644 --- a/LiteLoader/include/llapi/mc/MolangDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/MolangDescriptor.hpp @@ -7,6 +7,7 @@ #include "llapi/Global.h" #include "ItemDescriptor.hpp" #include "Json.hpp" +#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -76,6 +77,10 @@ struct MolangDescriptor { * @symbol ?getHash\@MolangDescriptor\@\@UEBA_KXZ */ virtual unsigned __int64 getHash() const; + /** + * @symbol ?deserialize\@MolangDescriptor\@\@SA?AV?$Result\@V?$unique_ptr\@UMolangDescriptor\@\@U?$default_delete\@UMolangDescriptor\@\@\@std\@\@\@std\@\@Verror_code\@2\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI static class Bedrock::Result, class std::error_code> deserialize(class ReadOnlyBinaryStream &); /** * @symbol ?fromExpressionTag\@MolangDescriptor\@\@SA?AV?$unique_ptr\@UMolangDescriptor\@\@U?$default_delete\@UMolangDescriptor\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4MolangVersion\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp index 803371aa0f..c97c5b051c 100644 --- a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp +++ b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp @@ -29,6 +29,10 @@ struct MolangMemberArray { #endif public: + /** + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TentacleAngleAndSwimRotation\@\@MM\@Z + */ + MCAPI MolangMemberArray(enum class MolangStruct_TentacleAngleAndSwimRotation, float, float); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_BaseAndPattern\@\@HH\@Z */ @@ -45,22 +49,22 @@ struct MolangMemberArray { * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGBA\@\@AEBVColor\@mce\@\@\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_RGBA, class mce::Color const &); - /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RotYAndPosY\@\@MM\@Z - */ - MCAPI MolangMemberArray(enum class MolangStruct_RotYAndPosY, float, float); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_SpeedAndDirection\@\@MAEBVVec3\@\@\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_SpeedAndDirection, float, class Vec3 const &); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XY\@\@AEBVVec2\@\@\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RotYAndPosY\@\@MM\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_XY, class Vec2 const &); + MCAPI MolangMemberArray(enum class MolangStruct_RotYAndPosY, float, float); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TRS\@\@$$QEAU0\@11\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_TRS, struct MolangMemberArray &&, struct MolangMemberArray &&, struct MolangMemberArray &&); + /** + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XY\@\@AEBVVec2\@\@\@Z + */ + MCAPI MolangMemberArray(enum class MolangStruct_XY, class Vec2 const &); /** * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_MinAndMax\@\@$$QEAU0\@1\@Z */ @@ -73,10 +77,6 @@ struct MolangMemberArray { * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_UV\@\@MM\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_UV, float, float); - /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TentacleAngleAndSwimRotation\@\@MM\@Z - */ - MCAPI MolangMemberArray(enum class MolangStruct_TentacleAngleAndSwimRotation, float, float); /** * @symbol ?add\@MolangMemberArray\@\@QEAAXAEBVHashedString\@\@AEBUMolangScriptArg\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp index 60770711c4..15e2cf30f3 100644 --- a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp +++ b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp @@ -31,26 +31,26 @@ struct MolangScriptArg { * @symbol ??0MolangScriptArg\@\@QEAA\@AEBU0\@\@Z */ MCAPI MolangScriptArg(struct MolangScriptArg const &); - /** - * @symbol ??0MolangScriptArg\@\@QEAA\@M\@Z - */ - MCAPI MolangScriptArg(float); /** * @symbol ??0MolangScriptArg\@\@QEAA\@H\@Z */ MCAPI MolangScriptArg(int); /** - * @symbol ?getAsNonConstMolangMemberArray\@MolangScriptArg\@\@QEAAPEAUMolangMemberArray\@\@XZ + * @symbol ??0MolangScriptArg\@\@QEAA\@M\@Z */ - MCAPI struct MolangMemberArray * getAsNonConstMolangMemberArray(); + MCAPI MolangScriptArg(float); /** - * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ?getAsNonConstMolangMemberArray\@MolangScriptArg\@\@QEAAPEAUMolangMemberArray\@\@XZ */ - MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg const &); + MCAPI struct MolangMemberArray * getAsNonConstMolangMemberArray(); /** * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg &&); + /** + * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg const &); /** * @symbol ??1MolangScriptArg\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp index 86ce00b9b0..b4a8bc8587 100644 --- a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp +++ b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp @@ -81,14 +81,14 @@ class MolangVariableMap { * @symbol ?_getMolangVariable\@MolangVariableMap\@\@AEBAPEBVMolangVariable\@\@W4MolangVariableIndex\@\@\@Z */ MCAPI class MolangVariable const * _getMolangVariable(enum class MolangVariableIndex) const; - /** - * @symbol ?_getOrAddMolangVariable\@MolangVariableMap\@\@AEAAPEAVMolangVariable\@\@W4MolangVariableIndex\@\@\@Z - */ - MCAPI class MolangVariable * _getOrAddMolangVariable(enum class MolangVariableIndex); /** * @symbol ?_getOrAddMolangVariable\@MolangVariableMap\@\@AEAAPEAVMolangVariable\@\@AEB_KPEBD_N\@Z */ MCAPI class MolangVariable * _getOrAddMolangVariable(unsigned __int64 const &, char const *, bool); + /** + * @symbol ?_getOrAddMolangVariable\@MolangVariableMap\@\@AEAAPEAVMolangVariable\@\@W4MolangVariableIndex\@\@\@Z + */ + MCAPI class MolangVariable * _getOrAddMolangVariable(enum class MolangVariableIndex); private: diff --git a/LiteLoader/include/llapi/mc/Monster.hpp b/LiteLoader/include/llapi/mc/Monster.hpp index a56fa136b3..7ec41ff007 100644 --- a/LiteLoader/include/llapi/mc/Monster.hpp +++ b/LiteLoader/include/llapi/mc/Monster.hpp @@ -37,152 +37,152 @@ class Monster : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Monster\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Monster\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Monster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Monster\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Monster\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Monster\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@Monster\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/MossBlock.hpp b/LiteLoader/include/llapi/mc/MossBlock.hpp index 6c77803733..06783616c8 100644 --- a/LiteLoader/include/llapi/mc/MossBlock.hpp +++ b/LiteLoader/include/llapi/mc/MossBlock.hpp @@ -36,20 +36,10 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class MossBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class MossBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class MossBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@MossBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@MossBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,55 +181,60 @@ class MossBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0MossBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp b/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp index 3c0d802b97..9b64c133c0 100644 --- a/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp +++ b/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class MotionPredictionHintsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MotionPredictionHintsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MotionPredictionHintsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOTIONPREDICTIONHINTSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~MotionPredictionHintsPacket(); #endif - /** - * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@AEBVActor\@\@\@Z - */ - MCAPI MotionPredictionHintsPacket(class Actor const &); /** * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@XZ */ MCAPI MotionPredictionHintsPacket(); + /** + * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@AEBVActor\@\@\@Z + */ + MCAPI MotionPredictionHintsPacket(class Actor const &); }; diff --git a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp index 63c37d52fa..1efc2fa06b 100644 --- a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class MoveActorAbsolutePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MoveActorAbsolutePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MoveActorAbsolutePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEACTORABSOLUTEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp index 343b03bcad..213f4e09b3 100644 --- a/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class MoveActorDeltaPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MoveActorDeltaPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MoveActorDeltaPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEACTORDELTAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp b/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp index 260f90cc18..d28f6842c7 100644 --- a/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp @@ -49,20 +49,21 @@ class MoveCollisionSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol ?tick\@MoveCollisionSystem\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol ?tick\@MoveCollisionSystem\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(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<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, struct DimensionTypeComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?createSideBySideSystem\@MoveCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @vftbl 5 + * @symbol ?singleTick\@MoveCollisionSystem\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEAVStrictEntityContext\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createSideBySideSystem(); + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, struct DimensionTypeComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class StrictEntityContext &); /** * @symbol ?createSystem\@MoveCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickMoveCollisionSystem\@MoveCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEAUMoveRequestComponent\@\@AEAUTerrainSurfaceOffsetComponent\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickMoveCollisionSystem\@MoveCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEAUMoveRequestComponent\@\@AEAUTerrainSurfaceOffsetComponent\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UTerrainSurfaceOffsetComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void tickMoveCollisionSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct MoveRequestComponent &, struct TerrainSurfaceOffsetComponent &, 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<>> &, class IConstBlockSource const &); + MCAPI static void tickMoveCollisionSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct MoveRequestComponent &, struct TerrainSurfaceOffsetComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, struct DimensionTypeComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); }; diff --git a/LiteLoader/include/llapi/mc/MoveInputState.hpp b/LiteLoader/include/llapi/mc/MoveInputState.hpp index 50a160e5f8..121128c011 100644 --- a/LiteLoader/include/llapi/mc/MoveInputState.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputState.hpp @@ -24,10 +24,6 @@ struct MoveInputState { #endif public: - /** - * @symbol ??8MoveInputState\@\@QEBA_NAEBU0\@\@Z - */ - MCAPI bool operator==(struct MoveInputState const &) const; /** * @symbol ?wantsSneak\@MoveInputState\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp index 785e30b411..3062c07c55 100644 --- a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -87,9 +88,9 @@ class MovePlayerPacket : public Packet { virtual bool isValid() const; /** * @vftbl 7 - * @symbol ?_read\@MovePlayerPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MovePlayerPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEPLAYERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp b/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp index 08516fa47a..85559ef4bb 100644 --- a/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp @@ -31,5 +31,9 @@ class MoveSpeedCapSystem { * @symbol ?create\@MoveSpeedCapSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?tick\@MoveSpeedCapSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UMoveRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT, class ViewT>>, class ViewT>, struct AttributesComponent const, class Optional>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>); }; diff --git a/LiteLoader/include/llapi/mc/MoveSpeedCapSystemImpl.hpp b/LiteLoader/include/llapi/mc/MoveSpeedCapSystemImpl.hpp new file mode 100644 index 0000000000..4d8e9020ca --- /dev/null +++ b/LiteLoader/include/llapi/mc/MoveSpeedCapSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file MoveSpeedCapSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MoveSpeedCapSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tickMoveSpeedCap\@MoveSpeedCapSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEAUMoveRequestComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsImmobileFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsKnockedBackOnDeathFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@U?$Include\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@Z + */ + MCAPI void tickMoveSpeedCap(class StrictEntityContext &, struct MoveRequestComponent &, class ViewT>>, class ViewT>, struct AttributesComponent const, class Optional>>, class ViewT, class FlagComponent>, struct Exclude, class FlagComponent>>, class ViewT>, class ViewT const, class FlagComponent const>); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp index 84828233d1..5b3fdbdbd4 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp @@ -10,26 +10,19 @@ #undef BEFORE_EXTRA -/** - * @brief MC class MoveTowardsClosestSpaceSystem. - * - */ -class MoveTowardsClosestSpaceSystem { + +namespace MoveTowardsClosestSpaceSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOVETOWARDSCLOSESTSPACESYSTEM -public: - class MoveTowardsClosestSpaceSystem& operator=(class MoveTowardsClosestSpaceSystem const &) = delete; - MoveTowardsClosestSpaceSystem(class MoveTowardsClosestSpaceSystem const &) = delete; - MoveTowardsClosestSpaceSystem() = delete; -#endif - -public: /** - * @symbol ?moveTowardsClosestSpace\@MoveTowardsClosestSpaceSystem\@\@SAXAEBVAABB\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@AEBVGetCollisionShapeInterface\@\@AEAVVec3\@\@\@Z + * @symbol ?createSystems\@MoveTowardsClosestSpaceSystem\@\@YA?AV?$array\@UTickingSystemWithInfo\@\@$01\@std\@\@XZ + */ + MCAPI class std::array createSystems(); + /** + * @symbol ?moveTowardsClosestSpace\@MoveTowardsClosestSpaceSystem\@\@YAXAEBVAABB\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAVVec3\@\@\@Z */ - MCAPI static void moveTowardsClosestSpace(class AABB const &, std::vector const &, class IConstBlockSource const &, class GetCollisionShapeInterface const &, class Vec3 &); + MCAPI void moveTowardsClosestSpace(class AABB const &, std::vector const &, class IConstBlockSource const &, class optional_ref, class Vec3 &); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp deleted file mode 100644 index 66ed693f2d..0000000000 --- a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file MoveTowardsClosestSpaceSystemFromActorContext.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class MoveTowardsClosestSpaceSystemFromActorContext. - * - */ -class MoveTowardsClosestSpaceSystemFromActorContext { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOVETOWARDSCLOSESTSPACESYSTEMFROMACTORCONTEXT -public: - class MoveTowardsClosestSpaceSystemFromActorContext& operator=(class MoveTowardsClosestSpaceSystemFromActorContext const &) = delete; - MoveTowardsClosestSpaceSystemFromActorContext(class MoveTowardsClosestSpaceSystemFromActorContext const &) = delete; - MoveTowardsClosestSpaceSystemFromActorContext() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@MoveTowardsClosestSpaceSystemFromActorContext\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?tickSystem\@MoveTowardsClosestSpaceSystemFromActorContext\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UShouldMoveTowardClosestSpaceFlagComponent\@\@\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UShouldMoveTowardClosestSpaceFlagComponent\@\@\@\@\@Z - */ - MCAPI static void tickSystem(class ViewT, struct ShouldMoveTowardClosestSpaceFlagComponent>, class ActorOwnerComponent>, class EntityModifierT); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemImpl.hpp b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemImpl.hpp new file mode 100644 index 0000000000..c753d8c1d6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemImpl.hpp @@ -0,0 +1,57 @@ +/** + * @file MoveTowardsClosestSpaceSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct MoveTowardsClosestSpaceSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOVETOWARDSCLOSESTSPACESYSTEMIMPL +public: + struct MoveTowardsClosestSpaceSystemImpl& operator=(struct MoveTowardsClosestSpaceSystemImpl const &) = delete; + MoveTowardsClosestSpaceSystemImpl(struct MoveTowardsClosestSpaceSystemImpl const &) = delete; + MoveTowardsClosestSpaceSystemImpl() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol __unk_vfn_1 + */ + virtual void __unk_vfn_1(); + /** + * @vftbl 2 + * @symbol __unk_vfn_2 + */ + virtual void __unk_vfn_2(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UOnewayPhysicsBlocksComponent\@\@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, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct PassengerComponent>, struct Read, class Optional, struct SynchedActorDataComponent, struct AABBShapeComponent, struct OnewayPhysicsBlocksComponent, struct DimensionTypeComponent>, struct Write, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + /** + * @symbol ?doTick\@MoveTowardsClosestSpaceSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@AEBUAABBShapeComponent\@\@AEBUOnewayPhysicsBlocksComponent\@\@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\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UOnewayPhysicsBlocksComponent\@\@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 SynchedActorDataComponent const &, struct AABBShapeComponent const &, struct OnewayPhysicsBlocksComponent 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, class Optional, struct SynchedActorDataComponent, struct AABBShapeComponent, struct OnewayPhysicsBlocksComponent, struct DimensionTypeComponent>, struct Write, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MovingBlock.hpp b/LiteLoader/include/llapi/mc/MovingBlock.hpp index 77054432f4..decd735c4e 100644 --- a/LiteLoader/include/llapi/mc/MovingBlock.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlock.hpp @@ -36,25 +36,20 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@MovingBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 11 + * @symbol ?getVisualShapeInWorld\@MovingBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class MovingBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class MovingBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class MovingBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +126,70 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 80 + * @vftbl 83 * @symbol ?updateEntityAfterFallOn\@MovingBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@MovingBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@MovingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@MovingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,65 +201,65 @@ class MovingBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@MovingBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@MovingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVINGBLOCK /** * @symbol ?pushesUpFallingBlocks\@MovingBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/MovingBlockActor.hpp b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp index 7902c9e26a..625acab60f 100644 --- a/LiteLoader/include/llapi/mc/MovingBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp @@ -77,9 +77,9 @@ class MovingBlockActor : public BlockActor { virtual class AABB getCollisionShape(class IConstBlockSource const &) const; /** * @vftbl 30 - * @symbol ?getOwningPiston\@MovingBlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + * @symbol __unk_vfn_30 */ - virtual class PistonBlockActor * getOwningPiston(class BlockSource &); + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -106,20 +106,35 @@ class MovingBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@MovingBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@MovingBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVINGBLOCKACTOR + /** + * @symbol ?getOwningPiston\@MovingBlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI class PistonBlockActor * getOwningPiston(class BlockSource &); + /** + * @symbol ?getOwningPiston\@MovingBlockActor\@\@UEBAPEBVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI class PistonBlockActor const * getOwningPiston(class BlockSource &) const; +#endif /** * @symbol ??0MovingBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MudBlock.hpp b/LiteLoader/include/llapi/mc/MudBlock.hpp index 26a4e7c217..8ee10d3f12 100644 --- a/LiteLoader/include/llapi/mc/MudBlock.hpp +++ b/LiteLoader/include/llapi/mc/MudBlock.hpp @@ -34,30 +34,20 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@MudBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@MudBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -69,10 +59,10 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -83,11 +73,6 @@ class MudBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -108,6 +93,11 @@ class MudBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -118,11 +108,6 @@ class MudBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -138,51 +123,61 @@ class MudBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@MudBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@MudBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -194,65 +189,70 @@ class MudBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@MudBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@MudBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0MudBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/MultifaceBlock.hpp b/LiteLoader/include/llapi/mc/MultifaceBlock.hpp index fe4d443b64..11b57b9eb0 100644 --- a/LiteLoader/include/llapi/mc/MultifaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/MultifaceBlock.hpp @@ -36,25 +36,25 @@ class MultifaceBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 5 + * @symbol ?clip\@MultifaceBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 8 + * @symbol ?getAABB\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 11 + * @symbol ?getVisualShapeInWorld\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_28(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +65,11 @@ class MultifaceBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@MultifaceBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +82,9 @@ class MultifaceBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@MultifaceBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +105,11 @@ class MultifaceBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +120,6 @@ class MultifaceBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,60 +136,70 @@ class MultifaceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 59 * @symbol ?sanitizeFillBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,82 +211,77 @@ class MultifaceBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** * @vftbl 174 - * @symbol ?clip\@MultifaceBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z - */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; - /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const = 0; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getMultifaceSpreader\@GlowLichenBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const = 0; diff --git a/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp index abec1d217d..793eeed325 100644 --- a/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class MultiplayerSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@MultiplayerSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@MultiplayerSettingsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MULTIPLAYERSETTINGSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/MushroomBlock.hpp b/LiteLoader/include/llapi/mc/MushroomBlock.hpp index 9b89b54d6c..c822b94ca4 100644 --- a/LiteLoader/include/llapi/mc/MushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/MushroomBlock.hpp @@ -36,20 +36,10 @@ class MushroomBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class MushroomBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class MushroomBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class MushroomBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class MushroomBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,65 +116,75 @@ class MushroomBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@MushroomBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,75 +196,80 @@ class MushroomBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@MushroomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0MushroomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/MushroomCow.hpp b/LiteLoader/include/llapi/mc/MushroomCow.hpp index 93d5172c00..889c7bfe15 100644 --- a/LiteLoader/include/llapi/mc/MushroomCow.hpp +++ b/LiteLoader/include/llapi/mc/MushroomCow.hpp @@ -37,125 +37,125 @@ class MushroomCow : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@MushroomCow\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0MushroomCow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MusicBlockActor.hpp b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp index ea8d35ce31..00b6536492 100644 --- a/LiteLoader/include/llapi/mc/MusicBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp @@ -55,6 +55,11 @@ class MusicBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -81,10 +86,15 @@ class MusicBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0MusicBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/MusicCommand.hpp b/LiteLoader/include/llapi/mc/MusicCommand.hpp index 4f59659f9f..a959bacfc3 100644 --- a/LiteLoader/include/llapi/mc/MusicCommand.hpp +++ b/LiteLoader/include/llapi/mc/MusicCommand.hpp @@ -36,7 +36,7 @@ class MusicCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@MusicCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp index 28df94b4d1..95b9979a8f 100644 --- a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp @@ -36,20 +36,10 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class MyceliumBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class MyceliumBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class MyceliumBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class MyceliumBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@MyceliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp b/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp index fa4e4e7976..728b05bfaf 100644 --- a/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp +++ b/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp @@ -39,19 +39,19 @@ class NBTSchemaReader { virtual bool isValid() const; /** * @vftbl 2 - * @symbol ?isString\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isObject\@NBTSchemaReader\@\@UEBA?AW4SchemaReaderState\@cereal\@\@XZ */ - virtual bool isString() const; + virtual enum class cereal::SchemaReaderState isObject() const; /** * @vftbl 3 - * @symbol ?isObject\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isArray\@NBTSchemaReader\@\@UEBA?AW4SchemaReaderState\@cereal\@\@XZ */ - virtual bool isObject() const; + virtual enum class cereal::SchemaReaderState isArray() const; /** * @vftbl 4 - * @symbol ?isArray\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asBool\@NBTSchemaReader\@\@UEAA?AV?$optional\@_N\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - virtual bool isArray() const; + virtual class std::optional asBool(struct cereal::SerializerTraits const &); /** * @vftbl 5 * @symbol __unk_vfn_5 @@ -94,173 +94,82 @@ class NBTSchemaReader { virtual void __unk_vfn_12(); /** * @vftbl 13 - * @symbol __unk_vfn_13 + * @symbol ?asFloat\@NBTSchemaReader\@\@UEAA?AV?$optional\@M\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - virtual void __unk_vfn_13(); + virtual class std::optional asFloat(struct cereal::SerializerTraits const &); /** * @vftbl 14 - * @symbol ?isFloat\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asDouble\@NBTSchemaReader\@\@UEAA?AV?$optional\@N\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - virtual bool isFloat() const; + virtual class std::optional asDouble(struct cereal::SerializerTraits const &); /** * @vftbl 15 - * @symbol ?isDouble\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asString\@NBTSchemaReader\@\@UEAA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - virtual bool isDouble() const; + virtual class std::optional asString(struct cereal::SerializerTraits const &); /** * @vftbl 16 - * @symbol ?asBool\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?members\@NBTSchemaReader\@\@UEAA_KAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual bool asBool() const; + virtual unsigned __int64 members(struct cereal::SerializerTraits const &); /** * @vftbl 17 - * @symbol __unk_vfn_17 + * @symbol ?length\@NBTSchemaReader\@\@UEAA_KAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual void __unk_vfn_17(); + virtual unsigned __int64 length(struct cereal::SerializerTraits const &); /** * @vftbl 18 - * @symbol __unk_vfn_18 + * @symbol ?pushMember\@NBTSchemaReader\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - virtual void __unk_vfn_18(); + virtual bool pushMember(std::string const &, struct cereal::SerializerTraits const &); /** * @vftbl 19 - * @symbol __unk_vfn_19 + * @symbol ?pushMember\@NBTSchemaReader\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual void __unk_vfn_19(); + virtual std::string pushMember(unsigned __int64, struct cereal::SerializerTraits const &); /** * @vftbl 20 - * @symbol __unk_vfn_20 + * @symbol ?pushElement\@NBTSchemaReader\@\@UEAAX_KAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual void __unk_vfn_20(); + virtual void pushElement(unsigned __int64, struct cereal::SerializerTraits const &); /** * @vftbl 21 - * @symbol __unk_vfn_21 + * @symbol ?pop\@NBTSchemaReader\@\@UEAAXAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual void __unk_vfn_21(); - /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); - /** - * @vftbl 25 - * @symbol ?asFloat\@NBTSchemaReader\@\@UEBAMXZ - */ - virtual float asFloat() const; - /** - * @vftbl 26 - * @symbol ?asDouble\@NBTSchemaReader\@\@UEBANXZ - */ - virtual double asDouble() const; - /** - * @vftbl 27 - * @symbol ?asString\@NBTSchemaReader\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - virtual std::string asString() const; - /** - * @vftbl 28 - * @symbol ?members\@NBTSchemaReader\@\@UEBA_KXZ - */ - virtual unsigned __int64 members() const; - /** - * @vftbl 29 - * @symbol ?length\@NBTSchemaReader\@\@UEBA_KXZ - */ - virtual unsigned __int64 length() const; - /** - * @vftbl 30 - * @symbol ?pushMember\@NBTSchemaReader\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z - */ - virtual std::string pushMember(unsigned __int64); - /** - * @vftbl 31 - * @symbol ?pushElement\@NBTSchemaReader\@\@UEAAX_K\@Z - */ - virtual void pushElement(unsigned __int64); - /** - * @vftbl 32 - * @symbol ?pop\@NBTSchemaReader\@\@UEAAXXZ - */ - virtual void pop(); + virtual void pop(struct cereal::SerializerTraits const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NBTSCHEMAREADER /** - * @symbol ?asInt16\@NBTSchemaReader\@\@UEBAFXZ - */ - MCVAPI short asInt16() const; - /** - * @symbol ?asInt32\@NBTSchemaReader\@\@UEBAHXZ - */ - MCVAPI int asInt32() const; - /** - * @symbol ?asInt64\@NBTSchemaReader\@\@UEBA_JXZ - */ - MCVAPI __int64 asInt64() const; - /** - * @symbol ?asInt8\@NBTSchemaReader\@\@UEBACXZ - */ - MCVAPI signed char asInt8() const; - /** - * @symbol ?asUInt16\@NBTSchemaReader\@\@UEBAGXZ - */ - MCVAPI unsigned short asUInt16() const; - /** - * @symbol ?asUInt32\@NBTSchemaReader\@\@UEBAIXZ - */ - MCVAPI unsigned int asUInt32() const; - /** - * @symbol ?asUInt64\@NBTSchemaReader\@\@UEBA_KXZ - */ - MCVAPI unsigned __int64 asUInt64() const; - /** - * @symbol ?asUInt8\@NBTSchemaReader\@\@UEBAEXZ - */ - MCVAPI unsigned char asUInt8() const; - /** - * @symbol ?isBool\@NBTSchemaReader\@\@UEBA_NXZ - */ - MCVAPI bool isBool() const; - /** - * @symbol ?isInt16\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asInt16\@NBTSchemaReader\@\@UEAA?AV?$optional\@F\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isInt16() const; + MCVAPI class std::optional asInt16(struct cereal::SerializerTraits const &); /** - * @symbol ?isInt32\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asInt32\@NBTSchemaReader\@\@UEAA?AV?$optional\@H\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isInt32() const; + MCVAPI class std::optional asInt32(struct cereal::SerializerTraits const &); /** - * @symbol ?isInt64\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asInt64\@NBTSchemaReader\@\@UEAA?AV?$optional\@_J\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isInt64() const; + MCVAPI class std::optional<__int64> asInt64(struct cereal::SerializerTraits const &); /** - * @symbol ?isInt8\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asInt8\@NBTSchemaReader\@\@UEAA?AV?$optional\@C\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isInt8() const; + MCVAPI class std::optional asInt8(struct cereal::SerializerTraits const &); /** - * @symbol ?isUInt16\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asUInt16\@NBTSchemaReader\@\@UEAA?AV?$optional\@G\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isUInt16() const; + MCVAPI class std::optional asUInt16(struct cereal::SerializerTraits const &); /** - * @symbol ?isUInt32\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asUInt32\@NBTSchemaReader\@\@UEAA?AV?$optional\@I\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isUInt32() const; + MCVAPI class std::optional asUInt32(struct cereal::SerializerTraits const &); /** - * @symbol ?isUInt64\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asUInt64\@NBTSchemaReader\@\@UEAA?AV?$optional\@_K\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isUInt64() const; + MCVAPI class std::optional asUInt64(struct cereal::SerializerTraits const &); /** - * @symbol ?isUInt8\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?asUInt8\@NBTSchemaReader\@\@UEAA?AV?$optional\@E\@std\@\@AEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool isUInt8() const; + MCVAPI class std::optional asUInt8(struct cereal::SerializerTraits const &); /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp index f57a3dc8f9..e8c28b6a26 100644 --- a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp +++ b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp @@ -33,9 +33,9 @@ class NBTSchemaWriter { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 &); + virtual bool write(std::string const &, struct cereal::SerializerTraits const &); /** * @vftbl 2 * @symbol __unk_vfn_2 @@ -43,9 +43,9 @@ class NBTSchemaWriter { virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NM\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NMAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual bool write(float); + virtual bool write(float, struct cereal::SerializerTraits const &); /** * @vftbl 4 * @symbol __unk_vfn_4 @@ -93,9 +93,9 @@ class NBTSchemaWriter { virtual void __unk_vfn_12(); /** * @vftbl 13 - * @symbol ?pushMember\@NBTSchemaWriter\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 &); + virtual bool pushMember(std::string const &, struct cereal::SerializerTraits const &); /** * @vftbl 14 * @symbol ?popMember\@NBTSchemaWriter\@\@UEAAXXZ @@ -103,60 +103,60 @@ class NBTSchemaWriter { virtual void popMember(); /** * @vftbl 15 - * @symbol ?openObject\@NBTSchemaWriter\@\@UEAA_NXZ + * @symbol ?openObject\@NBTSchemaWriter\@\@UEAA_NAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual bool openObject(); + virtual bool openObject(struct cereal::SerializerTraits const &); /** * @vftbl 16 - * @symbol ?openArray\@NBTSchemaWriter\@\@UEAA_NXZ + * @symbol ?openArray\@NBTSchemaWriter\@\@UEAA_N_KAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual bool openArray(); + virtual bool openArray(unsigned __int64, struct cereal::SerializerTraits const &); /** * @vftbl 17 - * @symbol ?close\@NBTSchemaWriter\@\@UEAAXXZ + * @symbol ?close\@NBTSchemaWriter\@\@UEAAXAEBUSerializerTraits\@cereal\@\@\@Z */ - virtual void close(); + virtual void close(struct cereal::SerializerTraits const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NBTSCHEMAWRITER /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NN\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_KAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(double); + MCVAPI bool write(unsigned __int64, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_K\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_JAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(unsigned __int64); + MCVAPI bool write(__int64, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_J\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NNAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(__int64); + MCVAPI bool write(double, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_N\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_NAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(bool); + MCVAPI bool write(bool, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NE\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NCAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(unsigned char); + MCVAPI bool write(signed char, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NC\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NEAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(signed char); + MCVAPI bool write(unsigned char, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NF\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NGAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(short); + MCVAPI bool write(unsigned short, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NG\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NFAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(unsigned short); + MCVAPI bool write(short, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NH\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NIAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(int); + MCVAPI bool write(unsigned int, struct cereal::SerializerTraits const &); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NI\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NHAEBUSerializerTraits\@cereal\@\@\@Z */ - MCVAPI bool write(unsigned int); + MCVAPI bool write(int, struct cereal::SerializerTraits const &); /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/NavigationComponent.hpp b/LiteLoader/include/llapi/mc/NavigationComponent.hpp index ba5860c8f9..398dcd91a1 100644 --- a/LiteLoader/include/llapi/mc/NavigationComponent.hpp +++ b/LiteLoader/include/llapi/mc/NavigationComponent.hpp @@ -27,14 +27,14 @@ class NavigationComponent { #endif public: - /** - * @symbol ??0NavigationComponent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI NavigationComponent(class NavigationComponent const &); /** * @symbol ??0NavigationComponent\@\@QEAA\@XZ */ MCAPI NavigationComponent(); + /** + * @symbol ??0NavigationComponent\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI NavigationComponent(class NavigationComponent const &); /** * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBVVec3\@\@\@Z */ @@ -172,21 +172,21 @@ class NavigationComponent { */ MCAPI bool isStuck(int) const; /** - * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z + * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAVActor\@\@M\@Z */ - MCAPI bool moveTo(class Mob &, class Vec3 const &, float); + MCAPI bool moveTo(class Mob &, class Actor &, float); /** * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M1\@Z */ MCAPI bool moveTo(class Mob &, class Vec3 const &, float, class Vec3 const &); - /** - * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAVActor\@\@M\@Z - */ - MCAPI bool moveTo(class Mob &, class Actor &, float); /** * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@V?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@M\@Z */ MCAPI bool moveTo(class Mob &, std::unique_ptr, float); + /** + * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z + */ + MCAPI bool moveTo(class Mob &, class Vec3 const &, float); /** * @symbol ??4NavigationComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NavigationDescription.hpp b/LiteLoader/include/llapi/mc/NavigationDescription.hpp index b5e1e343f2..01dfabb86b 100644 --- a/LiteLoader/include/llapi/mc/NavigationDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationDescription.hpp @@ -30,7 +30,7 @@ struct NavigationDescription { public: /** * @vftbl 0 - * @symbol ?getJsonName\@NavigationWalkDescription\@\@UEBAPEBDXZ + * @symbol ?getJsonName\@NavigationFlyDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const = 0; /** diff --git a/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp b/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp index 4644b2a95b..e7ff0dafa5 100644 --- a/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp @@ -28,9 +28,5 @@ class NavigationTravelSystem { * @symbol ?createNavigationTravelSystem\@NavigationTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createNavigationTravelSystem(); - /** - * @symbol ?tickNavigationTravelSystem\@NavigationTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VActorOwnerComponent\@\@UMobTravelComponent\@\@VNavigationComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobTravelComponent\@\@\@\@\@Z - */ - MCAPI static void tickNavigationTravelSystem(class ViewT, class EntityModifierT); }; diff --git a/LiteLoader/include/llapi/mc/NetEventCallback.hpp b/LiteLoader/include/llapi/mc/NetEventCallback.hpp index 360207b539..ed9ca0f0db 100644 --- a/LiteLoader/include/llapi/mc/NetEventCallback.hpp +++ b/LiteLoader/include/llapi/mc/NetEventCallback.hpp @@ -76,9 +76,9 @@ class NetEventCallback { virtual void onWebsocketRequest(std::string const &, std::string const &, class std::function); /** * @vftbl 9 - * @symbol __unk_vfn_9 + * @symbol ?sendPacketViolationDetectedTelemetryData\@NetEventCallback\@\@UEAAX_KV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z */ - virtual void __unk_vfn_9(); + virtual void sendPacketViolationDetectedTelemetryData(unsigned __int64, std::string, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); /** * @vftbl 10 * @symbol __unk_vfn_10 @@ -211,13 +211,13 @@ class NetEventCallback { */ MCVAPI void handle(class NetworkIdentifier const &, class ModalFormResponsePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VLevelChunkPacket\@\@\@std\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VClientCacheMissResponsePacket\@\@\@std\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); + MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAgentActionEventPacket\@\@\@Z */ @@ -226,6 +226,10 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayStatusPacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLegacyTelemetryEventPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class LegacyTelemetryEventPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z */ @@ -347,9 +351,9 @@ class NetEventCallback { */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateAbilitiesPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VLevelChunkPacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockPacket\@\@\@std\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); + MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateAdventureSettingsPacket\@\@\@Z */ @@ -363,9 +367,9 @@ class NetEventCallback { */ MCVAPI void handle(class NetworkIdentifier const &, class ServerStatsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VClientCacheMissResponsePacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockSyncedPacket\@\@\@std\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); + MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z */ @@ -426,10 +430,6 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); - /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockPacket\@\@\@std\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetTitlePacket\@\@\@Z */ @@ -462,10 +462,6 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &); - /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEventPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class EventPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetCommandsEnabledPacket\@\@\@Z */ @@ -486,10 +482,6 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetDefaultGameTypePacket const &); - /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockSyncedPacket\@\@\@std\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddVolumeEntityPacket\@\@\@Z */ @@ -554,10 +546,6 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InteractPacket const &); - /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCheatAbilityPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientCheatAbilityPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFeatureRegistryPacket\@\@\@Z */ @@ -638,6 +626,10 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAgentAnimationPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class AgentAnimationPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z */ @@ -894,22 +886,26 @@ class NetEventCallback { * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVOnScreenTextureAnimationPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class OnScreenTextureAnimationPacket const &); - /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptCustomEventPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ScriptCustomEventPacket const &); /** * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetActorLinkPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetActorLinkPacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** * @symbol ?onConnect\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@\@Z */ MCVAPI void onConnect(class NetworkIdentifier const &); /** - * @symbol ?onDisconnect\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z + * @symbol ?onDisconnect\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@W4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N2\@Z */ - MCVAPI void onDisconnect(class NetworkIdentifier const &, std::string const &, bool, std::string const &); + MCVAPI void onDisconnect(class NetworkIdentifier const &, enum class Connection::DisconnectFailReason, std::string const &, bool, std::string const &); /** * @symbol ?onPlayerReady\@NetEventCallback\@\@UEAAXAEAVPlayer\@\@\@Z */ @@ -930,10 +926,6 @@ class NetEventCallback { * @symbol ?onUnableToConnect\@NetEventCallback\@\@UEAAXXZ */ MCVAPI void onUnableToConnect(); - /** - * @symbol ?sendPacketViolationDetectedTelemetryData\@NetEventCallback\@\@UEAAXAEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z - */ - MCVAPI void sendPacketViolationDetectedTelemetryData(struct ExtendedStreamReadResult const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/HellCaveFeature.hpp b/LiteLoader/include/llapi/mc/NetherCaveFeature.hpp similarity index 50% rename from LiteLoader/include/llapi/mc/HellCaveFeature.hpp rename to LiteLoader/include/llapi/mc/NetherCaveFeature.hpp index c47278f69d..c54f52343d 100644 --- a/LiteLoader/include/llapi/mc/HellCaveFeature.hpp +++ b/LiteLoader/include/llapi/mc/NetherCaveFeature.hpp @@ -1,5 +1,5 @@ /** - * @file HellCaveFeature.hpp + * @file NetherCaveFeature.hpp * */ #pragma once @@ -9,25 +9,20 @@ #include "CaveFeature.hpp" #define BEFORE_EXTRA -// Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class HellCaveFeature. - * - */ -class HellCaveFeature : public CaveFeature { + +class NetherCaveFeature : public CaveFeature { #define AFTER_EXTRA -// Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HELLCAVEFEATURE +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERCAVEFEATURE public: - class HellCaveFeature& operator=(class HellCaveFeature const &) = delete; - HellCaveFeature(class HellCaveFeature const &) = delete; - HellCaveFeature() = delete; + class NetherCaveFeature& operator=(class NetherCaveFeature const &) = delete; + NetherCaveFeature(class NetherCaveFeature const &) = delete; + NetherCaveFeature() = delete; #endif public: @@ -38,22 +33,22 @@ class HellCaveFeature : public CaveFeature { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?place\@HellCaveFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @symbol ?place\@NetherCaveFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** * @vftbl 3 - * @symbol ?addRoom\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addRoom\@NetherCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addRoom(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, class RenderParams &, struct CaveFeatureUtils::CarvingParameters const &, std::vector &) const; /** * @vftbl 4 - * @symbol ?addTunnel\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMMHHMAEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addTunnel\@NetherCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMMHHMAEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addTunnel(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, float, float, float, int, int, float, class RenderParams &, struct CaveFeatureUtils::CarvingParameters const &, std::vector &) const; /** * @vftbl 6 - * @symbol ?addFeature\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBVChunkPos\@\@AEAVRandom\@\@1AEAVRenderParams\@\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addFeature\@NetherCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBVChunkPos\@\@AEAVRandom\@\@1AEAVRenderParams\@\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addFeature(class IBlockWorldGenAPI &, class ChunkPos const &, class Random &, class ChunkPos const &, class RenderParams &, std::vector &) const; diff --git a/LiteLoader/include/llapi/mc/NetherFireFeature.hpp b/LiteLoader/include/llapi/mc/NetherFireFeature.hpp new file mode 100644 index 0000000000..7727983780 --- /dev/null +++ b/LiteLoader/include/llapi/mc/NetherFireFeature.hpp @@ -0,0 +1,45 @@ +/** + * @file NetherFireFeature.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Feature.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NetherFireFeature : public Feature { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERFIREFEATURE +public: + class NetherFireFeature& operator=(class NetherFireFeature const &) = delete; + NetherFireFeature(class NetherFireFeature const &) = delete; + NetherFireFeature() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol ?place\@NetherFireFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERFIREFEATURE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetherFireFeature(); +#endif + +}; diff --git a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp index a4fefff48a..df4c154dc4 100644 --- a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp @@ -36,25 +36,15 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@NetherFungusBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class NetherFungusBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class NetherFungusBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class NetherFungusBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +121,80 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@NetherFungusBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,65 +206,70 @@ class NetherFungusBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERFUNGUSBLOCK /** * @symbol ?waterSpreadCausesSpawn\@NetherFungusBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/NetherNetConnector.hpp b/LiteLoader/include/llapi/mc/NetherNetConnector.hpp index 29e794e755..7da45a52ef 100644 --- a/LiteLoader/include/llapi/mc/NetherNetConnector.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetConnector.hpp @@ -139,6 +139,10 @@ struct NetherNetConnector { * @symbol ?readPacket\@NetherNetConnector\@\@QEBA_NUNetworkID\@NetherNet\@\@PEAXIPEAI\@Z */ MCAPI bool readPacket(struct NetherNet::NetworkID, void *, unsigned int, unsigned int *) const; + /** + * @symbol ?registerRelayServerCredentialsReadyCallback\@NetherNetConnector\@\@QEBAX$$QEAV?$function\@$$A6AXW4ERelayServerConfigurationResult\@NetherNet\@\@\@Z\@std\@\@\@Z + */ + MCAPI void registerRelayServerCredentialsReadyCallback(class std::function &&) const; /** * @symbol ?sendPacket\@NetherNetConnector\@\@QEBA_NUNetworkID\@NetherNet\@\@PEBDIW4ESendType\@3\@\@Z */ @@ -151,6 +155,10 @@ struct NetherNetConnector { * @symbol ?setBroadcastResponseCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6AXAEBUNetworkID\@NetherNet\@\@PEBXH\@Z\@std\@\@\@Z */ MCAPI void setBroadcastResponseCallback(class std::function &&); + /** + * @symbol ?signIntoSignalingService\@NetherNetConnector\@\@QEBAX$$QEAV?$function\@$$A6AXVerror_code\@std\@\@\@Z\@std\@\@$$QEAV?$function\@$$A6AXW4SignalingHostConnectionStatus\@NetherNet\@\@I\@Z\@3\@$$QEAUSignalingConfiguration\@IWebRTCSignalingInterface\@NetherNet\@\@\@Z + */ + MCAPI void signIntoSignalingService(class std::function &&, class std::function &&, struct NetherNet::IWebRTCSignalingInterface::SignalingConfiguration &&) const; /** * @symbol ?signOutFromSignalingService\@NetherNetConnector\@\@QEBAXXZ */ diff --git a/LiteLoader/include/llapi/mc/NetherNetSignalServiceSigninJob.hpp b/LiteLoader/include/llapi/mc/NetherNetSignalServiceSigninJob.hpp index 3014dfdfb7..df8a0cafb6 100644 --- a/LiteLoader/include/llapi/mc/NetherNetSignalServiceSigninJob.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetSignalServiceSigninJob.hpp @@ -6,7 +6,6 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Bedrock.hpp" -#include "Social.hpp" #define BEFORE_EXTRA @@ -28,17 +27,29 @@ class NetherNetSignalServiceSigninJob { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERNETSIGNALSERVICESIGNINJOB /** - * @symbol ?signin\@NetherNetSignalServiceSigninJob\@\@UEAAX_N\@Z + * @symbol ?signin\@NetherNetSignalServiceSigninJob\@\@UEAAX_NV?$optional\@V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@\@std\@\@\@Z */ - MCVAPI void signin(bool); + MCVAPI void signin(bool, class std::optional>>); /** * @symbol __unk_destructor_-1 */ MCVAPI ~NetherNetSignalServiceSigninJob(); #endif /** - * @symbol ??0NetherNetSignalServiceSigninJob\@\@QEAA\@$$QEAV?$not_null\@V?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@\@gsl\@\@$$QEAV?$function\@$$A6AX_N\@Z\@std\@\@$$QEAV?$function\@$$A6AXXZ\@4\@V?$not_null\@V?$NonOwnerPointer\@VDisconnectionRequestHandler\@\@\@Bedrock\@\@\@2\@V?$not_null\@V?$NonOwnerPointer\@VMultiplayerServiceManager\@Social\@\@\@Bedrock\@\@\@2\@V?$not_null\@V?$NonOwnerPointer\@VIMinecraftEventing\@\@\@Bedrock\@\@\@2\@\@Z + * @symbol ??0NetherNetSignalServiceSigninJob\@\@QEAA\@$$QEAV?$not_null\@V?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@\@gsl\@\@$$QEAV?$function\@$$A6AX_N\@Z\@std\@\@$$QEAV?$function\@$$A6AXXZ\@4\@V?$not_null\@V?$NonOwnerPointer\@VDisconnectionRequestHandler\@\@\@Bedrock\@\@\@2\@V?$not_null\@V?$NonOwnerPointer\@VServicesManager\@\@\@Bedrock\@\@\@2\@V?$not_null\@V?$NonOwnerPointer\@VIMinecraftEventing\@\@\@Bedrock\@\@\@2\@_N\@Z */ - MCAPI NetherNetSignalServiceSigninJob(class gsl::not_null> &&, class std::function &&, class std::function &&, class gsl::not_null>, class gsl::not_null>, class gsl::not_null>); + MCAPI NetherNetSignalServiceSigninJob(class gsl::not_null> &&, class std::function &&, class std::function &&, class gsl::not_null>, class gsl::not_null>, class gsl::not_null>, bool); + +//private: + /** + * @symbol ?_executeOnMainThread\@NetherNetSignalServiceSigninJob\@\@AEAAX$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z + */ + MCAPI void _executeOnMainThread(class std::function &&); + /** + * @symbol ?_signin\@NetherNetSignalServiceSigninJob\@\@AEAAXAEBUUrl\@1\@AEBUToken\@1\@_N\@Z + */ + MCAPI void _signin(struct NetherNetSignalServiceSigninJob::Url const &, struct NetherNetSignalServiceSigninJob::Token const &, bool); + +private: }; diff --git a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp index 0bedac8931..b097ecf13f 100644 --- a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp @@ -36,20 +36,10 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class NetherReactorBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class NetherReactorBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class NetherReactorBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 101 - * @symbol ?spawnResources\@NetherReactorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** * @vftbl 104 - * @symbol __unk_vfn_104 + * @symbol ?spawnResources\@NetherReactorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,57 +176,62 @@ class NetherReactorBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 189 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 186 * @symbol ?getResourceCount\@NetherReactorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp index f8d1eaa340..2d1c4f59e2 100644 --- a/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp @@ -55,6 +55,11 @@ class NetherReactorBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -81,10 +86,15 @@ class NetherReactorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0NetherReactorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetherSpringFeature.hpp b/LiteLoader/include/llapi/mc/NetherSpringFeature.hpp new file mode 100644 index 0000000000..fcd29960ec --- /dev/null +++ b/LiteLoader/include/llapi/mc/NetherSpringFeature.hpp @@ -0,0 +1,49 @@ +/** + * @file NetherSpringFeature.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Feature.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NetherSpringFeature : public Feature { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERSPRINGFEATURE +public: + class NetherSpringFeature& operator=(class NetherSpringFeature const &) = delete; + NetherSpringFeature(class NetherSpringFeature const &) = delete; + NetherSpringFeature() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol ?place\@NetherSpringFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERSPRINGFEATURE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetherSpringFeature(); +#endif + /** + * @symbol ??0NetherSpringFeature\@\@QEAA\@AEBVBlock\@\@_N\@Z + */ + MCAPI NetherSpringFeature(class Block const &, bool); + +}; diff --git a/LiteLoader/include/llapi/mc/NetherSproutsBlock.hpp b/LiteLoader/include/llapi/mc/NetherSproutsBlock.hpp index 2d020ec506..7d47c2e689 100644 --- a/LiteLoader/include/llapi/mc/NetherSproutsBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherSproutsBlock.hpp @@ -32,29 +32,19 @@ class NetherSproutsBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@NetherSproutsBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@NetherSproutsBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@NetherSproutsBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class NetherSproutsBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class NetherSproutsBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class NetherSproutsBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class NetherSproutsBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,65 +121,75 @@ class NetherSproutsBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@NetherSproutsBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@NetherSproutsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@NetherSproutsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@NetherSproutsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@NetherSproutsBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,72 +201,77 @@ class NetherSproutsBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@NetherSproutsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@NetherSproutsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@NetherSproutsBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@NetherSproutsBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp index ffbca53275..6d69bc6a54 100644 --- a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp @@ -36,25 +36,15 @@ class NetherWartBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@NetherWartBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class NetherWartBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class NetherWartBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class NetherWartBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class NetherWartBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,55 +121,65 @@ class NetherWartBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@NetherWartBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@NetherWartBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,72 +191,77 @@ class NetherWartBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@NetherWartBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@NetherWartBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@NetherWartBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp index fbc63fcff2..13116974ed 100644 --- a/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp +++ b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp @@ -161,6 +161,16 @@ class NetheriteArmorEquippedListener { virtual void __unk_vfn_25(); /** * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 27 + * @symbol __unk_vfn_27 + */ + virtual void __unk_vfn_27(); + /** + * @vftbl 28 * @symbol ?onEvent\@NetheriteArmorEquippedListener\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); diff --git a/LiteLoader/include/llapi/mc/NetherrackBlock.hpp b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp index 9a332f113f..2908a0d5a2 100644 --- a/LiteLoader/include/llapi/mc/NetherrackBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp @@ -36,20 +36,10 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class NetherrackBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class NetherrackBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class NetherrackBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@NetherrackBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@NetherrackBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,55 +181,60 @@ class NetherrackBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0NetherrackBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp index d77334ada4..09beb4df05 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class NetworkChunkPublisherUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NetworkChunkPublisherUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NetworkChunkPublisherUpdatePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKCHUNKPUBLISHERUPDATEPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~NetworkChunkPublisherUpdatePacket(); #endif - /** - * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@XZ - */ - MCAPI NetworkChunkPublisherUpdatePacket(); /** * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@AEBVBlockPos\@\@I\@Z */ MCAPI NetworkChunkPublisherUpdatePacket(class BlockPos const &, unsigned int); + /** + * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@XZ + */ + MCAPI NetworkChunkPublisherUpdatePacket(); }; diff --git a/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp b/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp index d0d6528f53..68bdc0285e 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp @@ -70,6 +70,11 @@ class NetworkChunkSource : public ChunkSource { * @symbol ?canCreateViews\@NetworkChunkSource\@\@UEBA_NXZ */ virtual bool canCreateViews() const; + /** + * @vftbl 30 + * @symbol ?canLaunchTasks\@NetworkChunkSource\@\@UEBA_NXZ + */ + virtual bool canLaunchTasks() const; /** * @symbol ??0NetworkChunkSource\@\@QEAA\@AEAVDimension\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp index ca4a3c82af..8f5110ce78 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" +#include "Bedrock.hpp" #include "ItemDescriptorCount.hpp" #define BEFORE_EXTRA @@ -42,14 +43,14 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount { */ MCVAPI ~NetworkItemInstanceDescriptor(); #endif - /** - * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z - */ - MCAPI NetworkItemInstanceDescriptor(class ItemInstance const &); /** * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z */ MCAPI NetworkItemInstanceDescriptor(class ItemStackDescriptor const &); + /** + * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z + */ + MCAPI NetworkItemInstanceDescriptor(class ItemInstance const &); /** * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ @@ -59,9 +60,9 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount { */ MCAPI class ItemInstance getItemInstance(class BlockPalette const &) const; /** - * @symbol ?read\@NetworkItemInstanceDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@NetworkItemInstanceDescriptor\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI void read(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @symbol ?write\@NetworkItemInstanceDescriptor\@\@QEBAXAEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp index 03eb0341b8..82f1593db1 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" +#include "Bedrock.hpp" #include "ItemDescriptorCount.hpp" #define BEFORE_EXTRA @@ -30,6 +31,7 @@ class NetworkItemStackDescriptor : public ItemDescriptorCount { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKITEMSTACKDESCRIPTOR public: class NetworkItemStackDescriptor& operator=(class NetworkItemStackDescriptor const &) = delete; + NetworkItemStackDescriptor() = delete; #endif public: @@ -44,30 +46,26 @@ class NetworkItemStackDescriptor : public ItemDescriptorCount { */ MCVAPI ~NetworkItemStackDescriptor(); #endif + /** + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStack\@\@\@Z + */ + MCAPI NetworkItemStackDescriptor(class ItemStack const &); /** * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z */ MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor const &); /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z */ - MCAPI NetworkItemStackDescriptor(); + MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &); /** * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor &&); /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStack\@\@\@Z - */ - MCAPI NetworkItemStackDescriptor(class ItemStack const &); - /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z - */ - MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &); - /** - * @symbol ?read\@NetworkItemStackDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@NetworkItemStackDescriptor\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI void read(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @symbol ?setIncludeNetIds\@NetworkItemStackDescriptor\@\@QEBAX_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/NetworkPeer.hpp b/LiteLoader/include/llapi/mc/NetworkPeer.hpp index 7021371b5c..c988f2414f 100644 --- a/LiteLoader/include/llapi/mc/NetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/NetworkPeer.hpp @@ -71,17 +71,17 @@ struct NetworkStatus { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?sendPacket\@BatchedNetworkPeer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z + * @symbol ?sendPacket\@CompressedNetworkPeer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z */ virtual void sendPacket(std::string const &, enum class NetworkPeer::Reliability, enum class Compressibility) = 0; /** * @vftbl 2 - * @symbol ?receivePacket\@BatchedNetworkPeer\@\@UEAA?AW4DataStatus\@NetworkPeer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$shared_ptr\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@5\@\@Z + * @symbol ?receivePacket\@CompressedNetworkPeer\@\@UEAA?AW4DataStatus\@NetworkPeer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$shared_ptr\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@5\@\@Z */ virtual enum class NetworkPeer::DataStatus receivePacket(std::string &, class std::shared_ptr>>> const &) = 0; /** * @vftbl 3 - * @symbol ?getNetworkStatus\@BatchedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ + * @symbol ?getNetworkStatus\@CompressedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ */ virtual struct NetworkPeer::NetworkStatus getNetworkStatus() const = 0; /** diff --git a/LiteLoader/include/llapi/mc/NetworkSession.hpp b/LiteLoader/include/llapi/mc/NetworkSession.hpp index 934ba2af0b..163e3a6940 100644 --- a/LiteLoader/include/llapi/mc/NetworkSession.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSession.hpp @@ -24,10 +24,6 @@ class NetworkSession { #endif public: - /** - * @symbol ??0NetworkSession\@\@QEAA\@W4TransportLayer\@\@\@Z - */ - MCAPI NetworkSession(enum class TransportLayer); /** * @symbol ?getTransportLayer\@NetworkSession\@\@QEBA?AW4TransportLayer\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/NetworkSessionOwner.hpp b/LiteLoader/include/llapi/mc/NetworkSessionOwner.hpp new file mode 100644 index 0000000000..639f4fe50f --- /dev/null +++ b/LiteLoader/include/llapi/mc/NetworkSessionOwner.hpp @@ -0,0 +1,35 @@ +/** + * @file NetworkSessionOwner.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NetworkSessionOwner { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKSESSIONOWNER +public: + class NetworkSessionOwner& operator=(class NetworkSessionOwner const &) = delete; + NetworkSessionOwner(class NetworkSessionOwner const &) = delete; +#endif + +public: + /** + * @symbol ??0NetworkSessionOwner\@\@QEAA\@XZ + */ + MCAPI NetworkSessionOwner(); + /** + * @symbol ?getTransportLayer\@NetworkSessionOwner\@\@QEBA?AW4TransportLayer\@\@XZ + */ + MCAPI enum class TransportLayer getTransportLayer() const; + +}; diff --git a/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp index 1aa6672815..1bc9bf7d03 100644 --- a/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class NetworkSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NetworkSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NetworkSettingsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKSETTINGSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp index 32046b8bf9..2c1b9f93fe 100644 --- a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,8 +53,8 @@ class NetworkStackLatencyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NetworkStackLatencyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NetworkStackLatencyPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/NetworkSystem.hpp b/LiteLoader/include/llapi/mc/NetworkSystem.hpp index cbf8e90d53..8ca94629c7 100644 --- a/LiteLoader/include/llapi/mc/NetworkSystem.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSystem.hpp @@ -36,10 +36,6 @@ class NetworkSystem { * @symbol ?_onEnable\@NetworkSystem\@\@EEAAXXZ */ MCVAPI void _onEnable(); - /** - * @symbol ?createNetworkSession\@NetworkSystem\@\@UEAAXW4TransportLayer\@\@\@Z - */ - MCVAPI void createNetworkSession(enum class TransportLayer); /** * @symbol ?getConnectionInfo\@NetworkSystem\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ */ @@ -53,21 +49,17 @@ class NetworkSystem { */ MCVAPI unsigned short getDefaultGamePortv6() const; /** - * @symbol ?getTransportLayer\@NetworkSystem\@\@UEBA?AW4TransportLayer\@\@XZ + * @symbol ?onAllConnectionsClosed\@NetworkSystem\@\@EEAAXW4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ - MCVAPI enum class TransportLayer getTransportLayer() const; + MCVAPI void onAllConnectionsClosed(enum class Connection::DisconnectFailReason, std::string const &, bool); /** - * @symbol ?onAllConnectionsClosed\@NetworkSystem\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?onAllRemoteConnectionsClosed\@NetworkSystem\@\@EEAAXW4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ - MCVAPI void onAllConnectionsClosed(std::string const &, bool); + MCVAPI void onAllRemoteConnectionsClosed(enum class Connection::DisconnectFailReason, std::string const &, bool); /** - * @symbol ?onAllRemoteConnectionsClosed\@NetworkSystem\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?onConnectionClosed\@NetworkSystem\@\@EEAAXAEBVNetworkIdentifier\@\@W4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ - MCVAPI void onAllRemoteConnectionsClosed(std::string const &, bool); - /** - * @symbol ?onConnectionClosed\@NetworkSystem\@\@EEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCVAPI void onConnectionClosed(class NetworkIdentifier const &, std::string const &, bool); + MCVAPI void onConnectionClosed(class NetworkIdentifier const &, enum class Connection::DisconnectFailReason, std::string const &, bool); /** * @symbol ?onNewIncomingConnection\@NetworkSystem\@\@EEAAXAEBVNetworkIdentifier\@\@$$QEAV?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z */ @@ -141,6 +133,10 @@ class NetworkSystem { * @symbol ?getRemoteConnector\@NetworkSystem\@\@QEAA?AV?$not_null\@V?$NonOwnerPointer\@VRemoteConnector\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null> getRemoteConnector(); + /** + * @symbol ?getRemoteConnector\@NetworkSystem\@\@QEBA?AV?$not_null\@V?$NonOwnerPointer\@$$CBVRemoteConnector\@\@\@Bedrock\@\@\@gsl\@\@XZ + */ + MCAPI class gsl::not_null> getRemoteConnector() const; /** * @symbol ?getResourcePackUploadManager\@NetworkSystem\@\@QEAAAEAVResourcePackFileUploadManager\@\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -207,6 +203,10 @@ class NetworkSystem { * @symbol ?_createNetworkStatistics\@NetworkSystem\@\@IEAAXW4TrackerType\@\@$$QEAV?$function\@$$A6A_NAEAURakNetStatistics\@RakNet\@\@\@Z\@std\@\@$$QEAV?$not_null\@V?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI void _createNetworkStatistics(enum class TrackerType, class std::function &&, class gsl::not_null> &&); + /** + * @symbol ?_getTransportLayer\@NetworkSystem\@\@IEBA?AW4TransportLayer\@\@XZ + */ + MCAPI enum class TransportLayer _getTransportLayer() const; //private: /** @@ -214,9 +214,13 @@ class NetworkSystem { */ MCAPI class NetworkConnection * _getConnectionFromId(class NetworkIdentifier const &) const; /** - * @symbol ?_handlePacketViolation\@NetworkSystem\@\@AEAAXW4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@AEAVNetworkConnection\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_handlePacketViolation\@NetworkSystem\@\@AEAAXAEBU?$ErrorInfo\@Verror_code\@std\@\@\@Bedrock\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@AEAVNetworkConnection\@\@W4SubClientId\@\@\@Z + */ + MCAPI void _handlePacketViolation(struct Bedrock::ErrorInfo const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &, class NetworkConnection &, enum class SubClientId); + /** + * @symbol ?_isUsingNetherNetTransportLayer\@NetworkSystem\@\@AEBA_NXZ */ - MCAPI void _handlePacketViolation(enum class StreamReadResult, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &, class NetworkConnection &, enum class SubClientId, std::string const &); + MCAPI bool _isUsingNetherNetTransportLayer() const; /** * @symbol ?_sendInternal\@NetworkSystem\@\@AEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp b/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp index 930f1a0c22..4b080893c1 100644 --- a/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp +++ b/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp @@ -33,7 +33,7 @@ class NewExecuteCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@NewExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/NewLeavesBlock.hpp b/LiteLoader/include/llapi/mc/NewLeavesBlock.hpp index 40b9a56684..6d93964d42 100644 --- a/LiteLoader/include/llapi/mc/NewLeavesBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLeavesBlock.hpp @@ -31,20 +31,10 @@ class NewLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class NewLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class NewLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class NewLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class NewLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,45 +111,55 @@ class NewLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,82 +171,87 @@ class NewLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@NewLeavesBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@NewLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getExtraResourceItem\@NewLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/NewLogBlock.hpp b/LiteLoader/include/llapi/mc/NewLogBlock.hpp index f66dabedce..7eaa135487 100644 --- a/LiteLoader/include/llapi/mc/NewLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLogBlock.hpp @@ -36,20 +36,10 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class NewLogBlock : public LogBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class NewLogBlock : public LogBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class NewLogBlock : public LogBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class NewLogBlock : public LogBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0NewLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@V?$optional\@ULogBlockMapColors\@\@\@2\@W4NewLogType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp b/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp index 21568dc9b1..f9ed3f376e 100644 --- a/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp +++ b/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp @@ -127,14 +127,14 @@ class NewUniqueIdsDataLoadHelper { * @symbol ?loadBlockPositionOffset\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ MCVAPI class BlockPos loadBlockPositionOffset(class BlockPos const &); - /** - * @symbol ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z - */ - MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); /** * @symbol ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ MCVAPI class Vec3 loadDirection(class Vec3 const &); + /** + * @symbol ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z + */ + MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); /** * @symbol ?loadFacingID\@NewUniqueIdsDataLoadHelper\@\@UEAAEE\@Z */ diff --git a/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp b/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp index 76b57b415a..c8c819ae3e 100644 --- a/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp @@ -32,12 +32,8 @@ class NoClipOrNoBlockMoveFilterSystem { */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?createSideBySide\@NoClipOrNoBlockMoveFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tick\@NoClipOrNoBlockMoveFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUOffsetsComponent\@\@V?$Optional\@$$CBUSlideOffsetComponent\@\@\@\@AEBUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUSubBBsComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); - /** - * @symbol ?tick\@NoClipOrNoBlockMoveFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUOffsetsComponent\@\@AEBUSlideOffsetComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUSubBBsComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static void tick(class StrictEntityContext const &, struct MoveRequestComponent const &, struct OffsetsComponent const &, struct SlideOffsetComponent const &, struct SynchedActorDataComponent const &, struct AABBShapeComponent &, struct StateVectorComponent &, struct SubBBsComponent &, class EntityModifierT, class IConstBlockSource const &); + MCAPI static void tick(class StrictEntityContext const &, struct MoveRequestComponent const &, struct OffsetsComponent const &, class Optional, struct SynchedActorDataComponent const &, struct AABBShapeComponent &, struct StateVectorComponent &, struct SubBBsComponent &, class EntityModifierT, class IConstBlockSource const &); }; diff --git a/LiteLoader/include/llapi/mc/NoteBlock.hpp b/LiteLoader/include/llapi/mc/NoteBlock.hpp index 071d68bf0e..6d91614d6a 100644 --- a/LiteLoader/include/llapi/mc/NoteBlock.hpp +++ b/LiteLoader/include/llapi/mc/NoteBlock.hpp @@ -36,20 +36,10 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class NoteBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class NoteBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class NoteBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +116,70 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@NoteBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 115 + * @vftbl 116 * @symbol ?triggerEvent\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,65 +191,70 @@ class NoteBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@NoteBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NOTEBLOCK /** * @symbol ?isInteractiveBlock\@NoteBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/Npc.hpp b/LiteLoader/include/llapi/mc/Npc.hpp index 4758394ce6..10daa44f70 100644 --- a/LiteLoader/include/llapi/mc/Npc.hpp +++ b/LiteLoader/include/llapi/mc/Npc.hpp @@ -213,10 +213,6 @@ struct ActionContainer { * @symbol ?hasCreatePermission\@npc\@\@YA_NAEAVActor\@\@\@Z */ MCAPI bool hasCreatePermission(class Actor &); - /** - * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBV?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@Z - */ - MCAPI class Json::Value toJson(class std::variant const &); /** * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBUActionContainer\@1\@\@Z */ @@ -225,6 +221,10 @@ struct ActionContainer { * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBUCommandAction\@1\@\@Z */ MCAPI class Json::Value toJson(struct npc::CommandAction const &); + /** + * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBV?$variant\@UCommandAction\@npc\@\@UUrlAction\@2\@\@std\@\@\@Z + */ + MCAPI class Json::Value toJson(class std::variant const &); /** * @symbol ?toJson\@npc\@\@YA?AVValue\@Json\@\@AEBUUrlAction\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NpcComponent.hpp b/LiteLoader/include/llapi/mc/NpcComponent.hpp index 550ac8f349..44fea8b931 100644 --- a/LiteLoader/include/llapi/mc/NpcComponent.hpp +++ b/LiteLoader/include/llapi/mc/NpcComponent.hpp @@ -36,14 +36,14 @@ class NpcComponent { */ MCVAPI ~NpcComponent(); #endif - /** - * @symbol ??0NpcComponent\@\@QEAA\@XZ - */ - MCAPI NpcComponent(); /** * @symbol ??0NpcComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NpcComponent(class NpcComponent &&); + /** + * @symbol ??0NpcComponent\@\@QEAA\@XZ + */ + MCAPI NpcComponent(); /** * @symbol ?addAdditionalSaveData\@NpcComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp index ed83c4feef..3d0e7abc03 100644 --- a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp +++ b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class NpcDialoguePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NpcDialoguePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NpcDialoguePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCDIALOGUEPACKET /** * @symbol __unk_destructor_-1 @@ -73,4 +74,12 @@ class NpcDialoguePacket : public Packet { */ MCAPI static bool initializePacket(class NpcDialoguePacket &, class NpcDialogueStorage const *, std::string const &); +//private: + /** + * @symbol ?_verifyJson\@NpcDialoguePacket\@\@AEBA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class Bedrock::Result _verifyJson(std::string const &) const; + +private: + }; diff --git a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp index 7fb0c10411..c09fdbd81b 100644 --- a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class NpcRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@NpcRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@NpcRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCREQUESTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/NpcSystemHelper.hpp b/LiteLoader/include/llapi/mc/NpcSystemHelper.hpp new file mode 100644 index 0000000000..9b2a0d3f54 --- /dev/null +++ b/LiteLoader/include/llapi/mc/NpcSystemHelper.hpp @@ -0,0 +1,24 @@ +/** + * @file NpcSystemHelper.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace NpcSystemHelper { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?sendClosePacket\@NpcSystemHelper\@\@YAXAEAVEntityContext\@\@AEBULeaveMenuCountdown\@NpcComponents\@\@\@Z + */ + MCAPI void sendClosePacket(class EntityContext &, struct NpcComponents::LeaveMenuCountdown const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NyliumBlock.hpp b/LiteLoader/include/llapi/mc/NyliumBlock.hpp index c7e0ceac77..4f574d903a 100644 --- a/LiteLoader/include/llapi/mc/NyliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/NyliumBlock.hpp @@ -36,20 +36,10 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class NyliumBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class NyliumBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class NyliumBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@NyliumBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@NyliumBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,62 +181,67 @@ class NyliumBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 171 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 169 * @symbol ?randomTick\@NyliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@NyliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ObserverBlock.hpp b/LiteLoader/include/llapi/mc/ObserverBlock.hpp index 44f6d508b3..743006e11c 100644 --- a/LiteLoader/include/llapi/mc/ObserverBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObserverBlock.hpp @@ -36,20 +36,10 @@ class ObserverBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ObserverBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ObserverBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ObserverBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ObserverBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,86 +115,91 @@ class ObserverBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 * @symbol ?isSignalSource\@ObserverBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@ObserverBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@ObserverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 75 + * @vftbl 78 * @symbol ?movedByPiston\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 105 - * @symbol ?getPlacementBlock\@ObserverBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,85 +211,95 @@ class ObserverBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@ObserverBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 145 + * @symbol ?getRenderBlock\@ObserverBlock\@\@UEBAAEBVBlock\@\@XZ + */ + virtual class Block const & getRenderBlock() const; + /** + * @vftbl 146 * @symbol ?getMappedFace\@ObserverBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 149 + * @vftbl 147 * @symbol ?getFaceFlip\@ObserverBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OBSERVERBLOCK /** * @symbol ?allowStateMismatchOnPlacement\@ObserverBlock\@\@UEBA_NAEBVBlock\@\@0\@Z diff --git a/LiteLoader/include/llapi/mc/ObsidianBlock.hpp b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp index c6e0be0d43..022e71543e 100644 --- a/LiteLoader/include/llapi/mc/ObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp @@ -36,20 +36,10 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ObsidianBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,65 +171,70 @@ class ObsidianBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 150 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 148 * @symbol ?animateTick\@ObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@ObsidianBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0ObsidianBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/Ocelot.hpp b/LiteLoader/include/llapi/mc/Ocelot.hpp index 480a22debf..95af378328 100644 --- a/LiteLoader/include/llapi/mc/Ocelot.hpp +++ b/LiteLoader/include/llapi/mc/Ocelot.hpp @@ -37,130 +37,130 @@ class Ocelot : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Ocelot\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 339 + * @vftbl 319 * @symbol ?_serverAiMobStep\@Ocelot\@\@UEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Ocelot\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/OffsetsComponent.hpp b/LiteLoader/include/llapi/mc/OffsetsComponent.hpp deleted file mode 100644 index cd9850eb8e..0000000000 --- a/LiteLoader/include/llapi/mc/OffsetsComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file OffsetsComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure OffsetsComponent. - * - */ -struct OffsetsComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_OFFSETSCOMPONENT -public: - struct OffsetsComponent& operator=(struct OffsetsComponent const &) = delete; - OffsetsComponent(struct OffsetsComponent const &) = delete; - OffsetsComponent() = delete; -#endif - -public: - /** - * @symbol ??8OffsetsComponent\@\@QEBA_NAEBU0\@\@Z - */ - MCAPI bool operator==(struct OffsetsComponent const &) const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/OldLeavesBlock.hpp b/LiteLoader/include/llapi/mc/OldLeavesBlock.hpp index 719a1792d5..2e510e7a29 100644 --- a/LiteLoader/include/llapi/mc/OldLeavesBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLeavesBlock.hpp @@ -31,20 +31,10 @@ class OldLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class OldLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class OldLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class OldLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class OldLeavesBlock : public LeavesBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,45 +111,55 @@ class OldLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@OldLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@OldLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,97 +171,102 @@ class OldLeavesBlock : public LeavesBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@OldLeavesBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@OldLeavesBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@OldLeavesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@OldLeavesBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@OldLeavesBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@OldLeavesBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@OldLeavesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getExtraResourceItem\@OldLeavesBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/OldLogBlock.hpp b/LiteLoader/include/llapi/mc/OldLogBlock.hpp index 91fb9db0f3..6cebaa06a9 100644 --- a/LiteLoader/include/llapi/mc/OldLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLogBlock.hpp @@ -36,20 +36,10 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class OldLogBlock : public LogBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class OldLogBlock : public LogBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class OldLogBlock : public LogBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class OldLogBlock : public LogBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0OldLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@V?$optional\@ULogBlockMapColors\@\@\@2\@W4OldLogType\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/OnExtractSideBySide.hpp b/LiteLoader/include/llapi/mc/OnExtractSideBySide.hpp deleted file mode 100644 index 855521623c..0000000000 --- a/LiteLoader/include/llapi/mc/OnExtractSideBySide.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file OnExtractSideBySide.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure OnExtractSideBySide. - * - */ -struct OnExtractSideBySide { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ONEXTRACTSIDEBYSIDE -public: - struct OnExtractSideBySide& operator=(struct OnExtractSideBySide const &) = delete; - OnExtractSideBySide(struct OnExtractSideBySide const &) = delete; - OnExtractSideBySide() = delete; -#endif - -public: - /** - * @symbol ?createContext\@OnExtractSideBySide\@\@QEBA?AUExtractionSystemContext\@\@XZ - */ - MCAPI struct ExtractionSystemContext createContext() const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp b/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp index 0d44f578d9..42ecc29609 100644 --- a/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp @@ -27,13 +27,15 @@ class OnFallOnTrigger { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONFALLONTRIGGER /** - * @symbol ??0OnFallOnTrigger\@\@QEAA\@$$QEAV0\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI OnFallOnTrigger(class OnFallOnTrigger &&); + MCVAPI ~OnFallOnTrigger(); +#endif /** - * @symbol ??1OnFallOnTrigger\@\@QEAA\@XZ + * @symbol ??0OnFallOnTrigger\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ~OnFallOnTrigger(); + MCAPI OnFallOnTrigger(class OnFallOnTrigger &&); }; diff --git a/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp index 6b15ddbae0..c7dd66af60 100644 --- a/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp @@ -42,16 +42,21 @@ class OnFallOnTriggerDescription { virtual std::string const & getName() const; /** * @vftbl 2 - * @symbol ?initializeComponent\@OnFallOnTriggerDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol __unk_vfn_2 */ - virtual void initializeComponent(class EntityContext &) const; + virtual void __unk_vfn_2(); /** * @vftbl 3 - * @symbol __unk_vfn_3 + * @symbol ?initializeComponent\@OnFallOnTriggerDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ - virtual void __unk_vfn_3(); + virtual void initializeComponent(class EntityContext &) const; /** * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 * @symbol ?buildSchema\@OnFallOnTriggerDescription\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class BlockComponentFactory const &) const; diff --git a/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp b/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp index 3c7408e052..12ecee72a1 100644 --- a/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp @@ -27,9 +27,15 @@ class OnInteractTrigger { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONINTERACTTRIGGER /** - * @symbol ??1OnInteractTrigger\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~OnInteractTrigger(); + MCVAPI ~OnInteractTrigger(); +#endif + /** + * @symbol ??0OnInteractTrigger\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI OnInteractTrigger(class OnInteractTrigger &&); }; diff --git a/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp index a63b21b068..22efd04538 100644 --- a/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp @@ -41,22 +41,27 @@ class OnInteractTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 2 + * @symbol __unk_vfn_2 */ - virtual void __unk_vfn_3(); + virtual void __unk_vfn_2(); /** - * @vftbl 5 + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@OnInteractTriggerDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@OnInteractTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@OnInteractTriggerDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp b/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp index a4da8a7a48..8a805c842f 100644 --- a/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp @@ -27,9 +27,15 @@ class OnPlacedTrigger { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONPLACEDTRIGGER /** - * @symbol ??1OnPlacedTrigger\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~OnPlacedTrigger(); + MCVAPI ~OnPlacedTrigger(); +#endif + /** + * @symbol ??0OnPlacedTrigger\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI OnPlacedTrigger(class OnPlacedTrigger &&); }; diff --git a/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp index 8a739a8f50..d24a95b384 100644 --- a/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp @@ -41,10 +41,15 @@ class OnPlacedTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 2 + * @symbol __unk_vfn_2 */ - virtual void __unk_vfn_3(); + virtual void __unk_vfn_2(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); /** * @symbol ?NameID\@OnPlacedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp index b153d442f4..87e6c0e3b7 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp @@ -27,9 +27,15 @@ class OnPlayerDestroyedTrigger { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONPLAYERDESTROYEDTRIGGER /** - * @symbol ??1OnPlayerDestroyedTrigger\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~OnPlayerDestroyedTrigger(); + MCVAPI ~OnPlayerDestroyedTrigger(); +#endif + /** + * @symbol ??0OnPlayerDestroyedTrigger\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI OnPlayerDestroyedTrigger(class OnPlayerDestroyedTrigger &&); }; diff --git a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp index 233b02a346..c0612911e3 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp @@ -41,10 +41,15 @@ class OnPlayerDestroyedTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 2 + * @symbol __unk_vfn_2 */ - virtual void __unk_vfn_3(); + virtual void __unk_vfn_2(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); /** * @symbol ?NameID\@OnPlayerDestroyedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp b/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp index c78ab2a936..771764df83 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp @@ -27,9 +27,15 @@ class OnPlayerPlacingTrigger { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONPLAYERPLACINGTRIGGER /** - * @symbol ??1OnPlayerPlacingTrigger\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~OnPlayerPlacingTrigger(); + MCVAPI ~OnPlayerPlacingTrigger(); +#endif + /** + * @symbol ??0OnPlayerPlacingTrigger\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI OnPlayerPlacingTrigger(class OnPlayerPlacingTrigger &&); }; diff --git a/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp index e5cb356a07..d7ec60dac8 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp @@ -41,22 +41,27 @@ class OnPlayerPlacingTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 2 + * @symbol __unk_vfn_2 */ - virtual void __unk_vfn_3(); + virtual void __unk_vfn_2(); /** - * @vftbl 5 + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 6 * @symbol ?isNetworkComponent\@OnPlayerPlacingTriggerDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 6 + * @vftbl 7 * @symbol ?buildNetworkTag\@OnPlayerPlacingTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 7 + * @vftbl 8 * @symbol ?initializeFromNetwork\@OnPlayerPlacingTriggerDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp index eb3ce3b911..d11f0f09b0 100644 --- a/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp +++ b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class OnScreenTextureAnimationPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@OnScreenTextureAnimationPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@OnScreenTextureAnimationPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONSCREENTEXTUREANIMATIONPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp b/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp index 22bba88e09..e65f93c589 100644 --- a/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp @@ -27,9 +27,15 @@ class OnStepOffTrigger { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONSTEPOFFTRIGGER /** - * @symbol ??1OnStepOffTrigger\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~OnStepOffTrigger(); + MCVAPI ~OnStepOffTrigger(); +#endif + /** + * @symbol ??0OnStepOffTrigger\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI OnStepOffTrigger(class OnStepOffTrigger &&); }; diff --git a/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp index 919550724a..92bd22eadf 100644 --- a/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp @@ -41,10 +41,15 @@ class OnStepOffTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 2 + * @symbol __unk_vfn_2 */ - virtual void __unk_vfn_3(); + virtual void __unk_vfn_2(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); /** * @symbol ?NameID\@OnStepOffTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp b/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp index b14fbb7b91..9978409593 100644 --- a/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp @@ -27,9 +27,15 @@ class OnStepOnTrigger { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONSTEPONTRIGGER /** - * @symbol ??1OnStepOnTrigger\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ~OnStepOnTrigger(); + MCVAPI ~OnStepOnTrigger(); +#endif + /** + * @symbol ??0OnStepOnTrigger\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI OnStepOnTrigger(class OnStepOnTrigger &&); }; diff --git a/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp index a449c6dcc5..a4fec1eebb 100644 --- a/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp @@ -41,10 +41,15 @@ class OnStepOnTriggerDescription { */ virtual std::string const & getName() const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 2 + * @symbol __unk_vfn_2 */ - virtual void __unk_vfn_3(); + virtual void __unk_vfn_2(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); /** * @symbol ?NameID\@OnStepOnTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/OnStoreSideBySideResult.hpp b/LiteLoader/include/llapi/mc/OnStoreSideBySideResult.hpp deleted file mode 100644 index fe8f2fc662..0000000000 --- a/LiteLoader/include/llapi/mc/OnStoreSideBySideResult.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file OnStoreSideBySideResult.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure OnStoreSideBySideResult. - * - */ -struct OnStoreSideBySideResult { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ONSTORESIDEBYSIDERESULT -public: - struct OnStoreSideBySideResult& operator=(struct OnStoreSideBySideResult const &) = delete; - OnStoreSideBySideResult(struct OnStoreSideBySideResult const &) = delete; - OnStoreSideBySideResult() = delete; -#endif - -public: - /** - * @symbol ??0OnStoreSideBySideResult\@\@QEAA\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@AEBVStrictEntityContext\@\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@USideBySideResult\@\@\@Z - */ - MCAPI OnStoreSideBySideResult(class std::optional, class StrictEntityContext const &, class gsl::not_null, struct SideBySideResult); - /** - * @symbol ?createContext\@OnStoreSideBySideResult\@\@QEBA?AUSideBySideResultSystemContext\@\@XZ - */ - MCAPI struct SideBySideResultSystemContext createContext() const; - /** - * @symbol ??1OnStoreSideBySideResult\@\@QEAA\@XZ - */ - MCAPI ~OnStoreSideBySideResult(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp b/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp index cd3b3124b0..f346382b32 100644 --- a/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp @@ -71,6 +71,11 @@ class OnUseOnItemComponent { virtual void __unk_vfn_7(); /** * @vftbl 8 + * @symbol __unk_vfn_8 + */ + virtual void __unk_vfn_8(); + /** + * @vftbl 9 * @symbol ?_useOn\@OnUseOnItemComponent\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/OnewayPhysicsBlocksComponent.hpp b/LiteLoader/include/llapi/mc/OnewayPhysicsBlocksComponent.hpp deleted file mode 100644 index f61bb80698..0000000000 --- a/LiteLoader/include/llapi/mc/OnewayPhysicsBlocksComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file OnewayPhysicsBlocksComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure OnewayPhysicsBlocksComponent. - * - */ -struct OnewayPhysicsBlocksComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ONEWAYPHYSICSBLOCKSCOMPONENT -public: - struct OnewayPhysicsBlocksComponent& operator=(struct OnewayPhysicsBlocksComponent const &) = delete; - OnewayPhysicsBlocksComponent(struct OnewayPhysicsBlocksComponent const &) = delete; - OnewayPhysicsBlocksComponent() = delete; -#endif - -public: - /** - * @symbol ??1OnewayPhysicsBlocksComponent\@\@QEAA\@XZ - */ - MCAPI ~OnewayPhysicsBlocksComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/OpCommand.hpp b/LiteLoader/include/llapi/mc/OpCommand.hpp index 2737a1a02e..9d34cd98b8 100644 --- a/LiteLoader/include/llapi/mc/OpCommand.hpp +++ b/LiteLoader/include/llapi/mc/OpCommand.hpp @@ -36,7 +36,7 @@ class OpCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@OpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/OpenSignPacket.hpp b/LiteLoader/include/llapi/mc/OpenSignPacket.hpp index cf96568675..0aab966061 100644 --- a/LiteLoader/include/llapi/mc/OpenSignPacket.hpp +++ b/LiteLoader/include/llapi/mc/OpenSignPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -46,9 +47,9 @@ class OpenSignPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@OpenSignPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@OpenSignPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OPENSIGNPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/OreBlock.hpp b/LiteLoader/include/llapi/mc/OreBlock.hpp index 29bce7ec8a..21445c002e 100644 --- a/LiteLoader/include/llapi/mc/OreBlock.hpp +++ b/LiteLoader/include/llapi/mc/OreBlock.hpp @@ -36,20 +36,10 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class OreBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class OreBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class OreBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,51 +115,61 @@ class OreBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@OreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@OreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,62 +181,67 @@ class OreBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@OreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@OreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp index 665adb17e0..de569ad0d1 100644 --- a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp @@ -36,62 +36,62 @@ class PackAccessStrategy { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?getPackSize\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_KXZ + * @symbol ?getPackSize\@ZipPackAccessStrategy\@\@UEBA_KXZ */ virtual unsigned __int64 getPackSize() const = 0; /** * @vftbl 2 - * @symbol ?getPackLocation\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ + * @symbol ?getPackLocation\@ZipPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ */ virtual class ResourceLocation const & getPackLocation() const = 0; /** * @vftbl 3 - * @symbol ?getPackName\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPackName\@ZipPackAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getPackName() const = 0; /** * @vftbl 4 - * @symbol ?isWritable\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ + * @symbol ?isWritable\@ZipPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const = 0; /** * @vftbl 5 - * @symbol ?setIsTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAX_N\@Z + * @symbol ?setIsTrusted\@ZipPackAccessStrategy\@\@UEAAX_N\@Z */ virtual void setIsTrusted(bool) = 0; /** * @vftbl 6 - * @symbol ?isTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ + * @symbol ?isTrusted\@ZipPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const = 0; /** * @vftbl 7 - * @symbol ?hasAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z + * @symbol ?hasAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ virtual bool hasAsset(class Core::Path const &, bool, bool) const = 0; /** * @vftbl 8 - * @symbol ?hasFolder\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?hasFolder\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool hasFolder(class Core::Path const &) const = 0; /** * @vftbl 9 - * @symbol ?getAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?getAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual bool getAsset(class Core::Path const &, std::string &, bool) const = 0; /** * @vftbl 10 - * @symbol ?deleteAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @symbol ?deleteAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ virtual bool deleteAsset(class Core::PathBuffer const &) = 0; /** * @vftbl 11 - * @symbol ?writeAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?writeAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool writeAsset(class Core::Path const &, std::string const &) = 0; /** * @vftbl 12 - * @symbol ?forEachIn\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z + * @symbol ?forEachIn\@ZipPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z */ virtual void forEachIn(class Core::Path const &, class std::function, bool) const = 0; /** @@ -111,7 +111,7 @@ class PackAccessStrategy { virtual class Core::PathBuffer const & getSubPath() const; /** * @vftbl 16 - * @symbol ?createSubPack\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?createSubPack\@ZipPackAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ virtual std::unique_ptr createSubPack(class Core::Path const &) const = 0; /** @@ -126,7 +126,7 @@ class PackAccessStrategy { virtual bool canRecurse() const; /** * @vftbl 19 - * @symbol ?unload\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAXXZ + * @symbol ?unload\@ZipPackAccessStrategy\@\@UEAAXXZ */ virtual void unload() = 0; /** diff --git a/LiteLoader/include/llapi/mc/PackError.hpp b/LiteLoader/include/llapi/mc/PackError.hpp index 038900a342..6ebb4fb5d3 100644 --- a/LiteLoader/include/llapi/mc/PackError.hpp +++ b/LiteLoader/include/llapi/mc/PackError.hpp @@ -42,12 +42,12 @@ class PackError { virtual std::string getLocErrorMessage() const; /** * @vftbl 2 - * @symbol ?getLocErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getLocErrorMessageMap\@EducationMetadataError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocErrorMessageMap() const = 0; /** * @vftbl 3 - * @symbol ?getEventErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getEventErrorMessageMap\@EducationMetadataError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getEventErrorMessageMap() const = 0; /** diff --git a/LiteLoader/include/llapi/mc/PackIdVersion.hpp b/LiteLoader/include/llapi/mc/PackIdVersion.hpp index 080f26dfb2..727b58740a 100644 --- a/LiteLoader/include/llapi/mc/PackIdVersion.hpp +++ b/LiteLoader/include/llapi/mc/PackIdVersion.hpp @@ -31,14 +31,14 @@ struct PackIdVersion { #endif public: - /** - * @symbol ??0PackIdVersion\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI PackIdVersion(struct PackIdVersion const &); /** * @symbol ??0PackIdVersion\@\@QEAA\@AEBVUUID\@mce\@\@AEBVSemVersion\@\@W4PackType\@\@\@Z */ MCAPI PackIdVersion(class mce::UUID const &, class SemVersion const &, enum class PackType); + /** + * @symbol ??0PackIdVersion\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI PackIdVersion(struct PackIdVersion const &); /** * @symbol ??0PackIdVersion\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackInstance.hpp b/LiteLoader/include/llapi/mc/PackInstance.hpp index 306c4893ec..5bcc5f195c 100644 --- a/LiteLoader/include/llapi/mc/PackInstance.hpp +++ b/LiteLoader/include/llapi/mc/PackInstance.hpp @@ -34,14 +34,14 @@ class PackInstance { * @symbol ??0PackInstance\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NPEAVPackSettings\@\@\@Z */ MCAPI PackInstance(class gsl::not_null>, std::string const &, bool, class PackSettings *); - /** - * @symbol ??0PackInstance\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@H_NPEAVPackSettings\@\@\@Z - */ - MCAPI PackInstance(class gsl::not_null>, int, bool, class PackSettings *); /** * @symbol ??0PackInstance\@\@QEAA\@AEBV0\@\@Z */ MCAPI PackInstance(class PackInstance const &); + /** + * @symbol ??0PackInstance\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@H_NPEAVPackSettings\@\@\@Z + */ + MCAPI PackInstance(class gsl::not_null>, int, bool, class PackSettings *); /** * @symbol ?forEachIn\@PackInstance\@\@QEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z */ @@ -110,6 +110,10 @@ class PackInstance { * @symbol ?isBaseGamePack\@PackInstance\@\@QEBA_NXZ */ MCAPI bool isBaseGamePack() const; + /** + * @symbol ?isTrusted\@PackInstance\@\@QEBA_NXZ + */ + MCAPI bool isTrusted() const; /** * @symbol ?isZipped\@PackInstance\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/PackReport.hpp b/LiteLoader/include/llapi/mc/PackReport.hpp index d6a6e74cdc..9f8bfc533e 100644 --- a/LiteLoader/include/llapi/mc/PackReport.hpp +++ b/LiteLoader/include/llapi/mc/PackReport.hpp @@ -28,10 +28,6 @@ class PackReport { #endif public: - /** - * @symbol ??0PackReport\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI PackReport(class PackReport &&); /** * @symbol ??0PackReport\@\@QEAA\@AEBV0\@\@Z */ @@ -40,6 +36,10 @@ class PackReport { * @symbol ??0PackReport\@\@QEAA\@XZ */ MCAPI PackReport(); + /** + * @symbol ??0PackReport\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI PackReport(class PackReport &&); /** * @symbol ?getErrors\@PackReport\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VPackError\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VPackError\@\@\@std\@\@\@2\@\@std\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp index 333dbf58c0..60a4ee21fb 100644 --- a/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp @@ -36,6 +36,10 @@ struct PackedItemUseLegacyInventoryTransaction { * @symbol ??0PackedItemUseLegacyInventoryTransaction\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI PackedItemUseLegacyInventoryTransaction(struct PackedItemUseLegacyInventoryTransaction &&); + /** + * @symbol ??4PackedItemUseLegacyInventoryTransaction\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct PackedItemUseLegacyInventoryTransaction & operator=(struct PackedItemUseLegacyInventoryTransaction &&); /** * @symbol ??1PackedItemUseLegacyInventoryTransaction\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Packet.hpp b/LiteLoader/include/llapi/mc/Packet.hpp index b54bbf3262..1c7c86deaa 100644 --- a/LiteLoader/include/llapi/mc/Packet.hpp +++ b/LiteLoader/include/llapi/mc/Packet.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -74,24 +75,24 @@ class Packet { virtual ~Packet(); /** * @vftbl 1 - * @symbol ?getId\@CreatePhotoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @symbol ?getId\@ServerStatsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const = 0; /** * @vftbl 2 - * @symbol ?getName\@CreatePhotoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@ServerStatsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const = 0; /** * @vftbl 3 - * @symbol ?write\@CreatePhotoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@ServerStatsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const = 0; /** * @vftbl 4 - * @symbol ?read\@Packet\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@Packet\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 5 * @symbol ?disallowBatching\@Packet\@\@UEBA_NXZ @@ -104,9 +105,9 @@ class Packet { virtual bool isValid() const; /** * @vftbl 7 - * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &) = 0; + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &) = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKET /** * @symbol __unk_destructor_-1 @@ -118,9 +119,9 @@ class Packet { */ MCAPI void handle(class NetworkIdentifier const &, class NetEventCallback &, class std::shared_ptr &); /** - * @symbol ?readNoHeader\@Packet\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@AEBW4SubClientId\@\@AEAUExtendedStreamReadResult\@\@\@Z + * @symbol ?readNoHeader\@Packet\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@AEBW4SubClientId\@\@\@Z */ - MCAPI bool readNoHeader(class ReadOnlyBinaryStream &, enum class SubClientId const &, struct ExtendedStreamReadResult &); + MCAPI class Bedrock::Result readNoHeader(class ReadOnlyBinaryStream &, enum class SubClientId const &); /** * @symbol ?writeWithHeader\@Packet\@\@QEBAXW4SubClientId\@\@AEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp b/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp index 23db929e0d..91b2fde963 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp @@ -31,9 +31,9 @@ class PacketViolationDetectedTelemetryData { public: /** - * @symbol ??0PacketViolationDetectedTelemetryData\@\@QEAA\@AEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ??0PacketViolationDetectedTelemetryData\@\@QEAA\@_KV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z */ - MCAPI PacketViolationDetectedTelemetryData(struct ExtendedStreamReadResult const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); + MCAPI PacketViolationDetectedTelemetryData(unsigned __int64, std::string, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); /** * @symbol ?WriteEventData\@PacketViolationDetectedTelemetryData\@\@QEBAXAEAVEvent\@Events\@Social\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp b/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp index f8cea763bc..aaf6791673 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -33,15 +34,15 @@ class PacketViolationHandler { */ MCAPI PacketViolationHandler(); /** - * @symbol ?checkForViolation\@PacketViolationHandler\@\@QEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@W4StreamReadResult\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z + * @symbol ?checkForViolation\@PacketViolationHandler\@\@QEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBV?$expected\@XU?$ErrorInfo\@Verror_code\@std\@\@\@Bedrock\@\@\@expected_lite\@nonstd\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z */ - MCAPI enum class PacketViolationResponse checkForViolation(enum class MinecraftPacketIds, enum class StreamReadResult, class NetworkIdentifier const &, bool *); + MCAPI enum class PacketViolationResponse checkForViolation(enum class MinecraftPacketIds, class nonstd::expected_lite::expected> const &, class NetworkIdentifier const &, bool *); //private: /** - * @symbol ?_handleViolation\@PacketViolationHandler\@\@AEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@W4StreamReadResult\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z + * @symbol ?_handleViolation\@PacketViolationHandler\@\@AEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVerror_code\@std\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z */ - MCAPI enum class PacketViolationResponse _handleViolation(enum class MinecraftPacketIds, enum class StreamReadResult, class NetworkIdentifier const &, bool *); + MCAPI enum class PacketViolationResponse _handleViolation(enum class MinecraftPacketIds, class std::error_code const &, class NetworkIdentifier const &, bool *); private: diff --git a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp index 634c256b1a..2507381d36 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PacketViolationWarningPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PacketViolationWarningPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PacketViolationWarningPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKETVIOLATIONWARNINGPACKET /** * @symbol __unk_destructor_-1 @@ -65,8 +66,8 @@ class PacketViolationWarningPacket : public Packet { */ MCAPI PacketViolationWarningPacket(); /** - * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@W4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@AEBVerror_code\@std\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z */ - MCAPI PacketViolationWarningPacket(enum class StreamReadResult, enum class PacketViolationResponse, enum class MinecraftPacketIds, std::string const &); + MCAPI PacketViolationWarningPacket(class std::error_code const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, std::string const &); }; diff --git a/LiteLoader/include/llapi/mc/Painting.hpp b/LiteLoader/include/llapi/mc/Painting.hpp index 951b714528..ec5045ad32 100644 --- a/LiteLoader/include/llapi/mc/Painting.hpp +++ b/LiteLoader/include/llapi/mc/Painting.hpp @@ -42,147 +42,147 @@ class Painting : public HangingActor { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 47 + * @vftbl 42 * @symbol ?tryCreateAddActorPacket\@Painting\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Painting\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@Painting\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Painting\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Painting\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?getWidth\@Painting\@\@UEBAHXZ */ virtual int getWidth() const; /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getHeight\@Painting\@\@UEBAHXZ */ virtual int getHeight() const; /** - * @vftbl 271 + * @vftbl 257 * @symbol ?dropItem\@Painting\@\@UEAAXXZ */ virtual void dropItem(); /** - * @vftbl 272 + * @vftbl 258 * @symbol ?placeHangingEntity\@Painting\@\@UEAA_NAEAVBlockSource\@\@H\@Z */ virtual bool placeHangingEntity(class BlockSource &, int); diff --git a/LiteLoader/include/llapi/mc/Panda.hpp b/LiteLoader/include/llapi/mc/Panda.hpp index 4a2a51c828..5d09d635d4 100644 --- a/LiteLoader/include/llapi/mc/Panda.hpp +++ b/LiteLoader/include/llapi/mc/Panda.hpp @@ -37,140 +37,140 @@ class Panda : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@Panda\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Panda\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Panda\@\@UEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 326 + * @vftbl 309 * @symbol ?setTransitioningSitting\@Panda\@\@UEAAX_N\@Z */ virtual void setTransitioningSitting(bool); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Panda\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Parrot.hpp b/LiteLoader/include/llapi/mc/Parrot.hpp index 9240faf1dc..e397b7d020 100644 --- a/LiteLoader/include/llapi/mc/Parrot.hpp +++ b/LiteLoader/include/llapi/mc/Parrot.hpp @@ -42,165 +42,160 @@ class Parrot : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Parrot\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 118 + * @vftbl 107 * @symbol ?setSitting\@Parrot\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 128 - * @symbol ?vehicleLanded\@Parrot\@\@UEAAXAEBVVec3\@\@0\@Z - */ - virtual void vehicleLanded(class Vec3 const &, class Vec3 const &); - /** - * @vftbl 130 + * @vftbl 118 * @symbol ?playAmbientSound\@Parrot\@\@UEAAXXZ */ virtual void playAmbientSound(); /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@Parrot\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Parrot\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 188 + * @vftbl 176 * @symbol ?canBePulledIntoVehicle\@Parrot\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Parrot\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Parrot\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PARROT /** * @symbol ?_makeFlySound\@Parrot\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/Parser.hpp b/LiteLoader/include/llapi/mc/Parser.hpp index e3815015aa..0d5fb713b7 100644 --- a/LiteLoader/include/llapi/mc/Parser.hpp +++ b/LiteLoader/include/llapi/mc/Parser.hpp @@ -31,17 +31,25 @@ class Parser { public: /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD3\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct ActorDefinitionIdentifier &, char const *, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAMPEBDM\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, float &, char const *, float); + /** + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int); + /** + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class BlockDescriptor &); + /** + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@_N\@Z + */ + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, bool); /** * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4FilterSubject\@\@PEBD3\@Z */ @@ -55,61 +63,37 @@ class Parser { */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned char &, unsigned char); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ParticleType &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAIPEBDI\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned int &, char const *, unsigned int); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, class HashedString &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z - */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool); - /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAIPEBDI\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned int &, char const *, unsigned int); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@PEBD\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class BlockDescriptor &); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class WeightedChoices &, char const *); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ActorType &, char const *, char const *); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ParticleType &, char const *, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct ActorDefinitionIdentifier &, char const *, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &); /** * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z */ @@ -123,13 +107,13 @@ class Parser { */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class Difficulty &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEA_NPEBD_N\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, bool &, char const *, bool); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ActorType &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@_N\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEA_NPEBD_N\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, bool); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, bool &, char const *, bool); /** * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z */ @@ -143,17 +127,21 @@ class Parser { */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct FloatRange &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); /** - * @symbol ?serialize\@Parser\@\@SAXAEBVActorDefinitionTrigger\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z */ - MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBW4ActorType\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z */ - MCAPI static void serialize(enum class ActorType const &, class Json::Value &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class WeightedChoices &, char const *); + /** + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@PEBD\@Z + */ + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); /** * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z */ @@ -162,6 +150,14 @@ class Parser { * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z */ MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); + /** + * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z + */ + MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *); + /** + * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z + */ + MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *); /** * @symbol ?serialize\@Parser\@\@SAXAEBUActorDefinitionIdentifier\@\@AEAVValue\@Json\@\@PEBD\@Z */ @@ -171,8 +167,12 @@ class Parser { */ MCAPI static void serialize(enum class ParticleType const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBVActorDefinitionTrigger\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *); + MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *); + /** + * @symbol ?serialize\@Parser\@\@SAXAEBW4ActorType\@\@AEAVValue\@Json\@\@PEBD\@Z + */ + MCAPI static void serialize(enum class ActorType const &, class Json::Value &, char const *); }; diff --git a/LiteLoader/include/llapi/mc/ParticleCommand.hpp b/LiteLoader/include/llapi/mc/ParticleCommand.hpp index 3faef759fd..6731032591 100644 --- a/LiteLoader/include/llapi/mc/ParticleCommand.hpp +++ b/LiteLoader/include/llapi/mc/ParticleCommand.hpp @@ -36,7 +36,7 @@ class ParticleCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ParticleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp b/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp index 874da388a4..a32117fa00 100644 --- a/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp @@ -35,9 +35,5 @@ class PassengerFreezeMovementSystem { * @symbol ?freezeMovement\@PassengerFreezeMovementSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void freezeMovement(class StrictEntityContext &, struct StateVectorComponent &); - /** - * @symbol ?tickPassengerFreezeMovementSystem\@PassengerFreezeMovementSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@UStateVectorComponent\@\@\@\@\@Z - */ - MCAPI static void tickPassengerFreezeMovementSystem(class ViewT>, struct StateVectorComponent>); }; diff --git a/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp index 7f0993e9d4..5855e38899 100644 --- a/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp +++ b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PassengerJumpPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PassengerJumpPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PassengerJumpPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0PassengerJumpPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PathFinder.hpp b/LiteLoader/include/llapi/mc/PathFinder.hpp index 6213ca199c..7246effd25 100644 --- a/LiteLoader/include/llapi/mc/PathFinder.hpp +++ b/LiteLoader/include/llapi/mc/PathFinder.hpp @@ -41,14 +41,14 @@ class PathFinder { * @symbol ?findPath\@PathFinder\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@HHHM\@Z */ MCAPI std::unique_ptr findPath(class Actor &, int, int, int, float); - /** - * @symbol ?isFree\@PathFinder\@\@QEAA?AW4NodeType\@\@AEAVActor\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z - */ - MCAPI enum class NodeType isFree(class Actor &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode, enum class CanClimbIntoNode); /** * @symbol ?isFree\@PathFinder\@\@QEAA?AW4NodeType\@\@AEBUActorPathingData\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z */ MCAPI enum class NodeType isFree(struct ActorPathingData const &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode, enum class CanClimbIntoNode); + /** + * @symbol ?isFree\@PathFinder\@\@QEAA?AW4NodeType\@\@AEAVActor\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z + */ + MCAPI enum class NodeType isFree(class Actor &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode, enum class CanClimbIntoNode); /** * @symbol ??1PathFinder\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PeekDefinition.hpp b/LiteLoader/include/llapi/mc/PeekDefinition.hpp index 9198d3971d..c74287bc74 100644 --- a/LiteLoader/include/llapi/mc/PeekDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PeekDefinition.hpp @@ -30,6 +30,10 @@ class PeekDefinition { #endif public: + /** + * @symbol ?initialize\@PeekDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initialize(class EntityContext &) const; /** * @symbol ?buildSchema\@PeekDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VPeekDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PendingRemovePassengersComponent.hpp b/LiteLoader/include/llapi/mc/PendingRemovePassengersComponent.hpp deleted file mode 100644 index 2d66bb82ba..0000000000 --- a/LiteLoader/include/llapi/mc/PendingRemovePassengersComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file PendingRemovePassengersComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure PendingRemovePassengersComponent. - * - */ -struct PendingRemovePassengersComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PENDINGREMOVEPASSENGERSCOMPONENT -public: - struct PendingRemovePassengersComponent& operator=(struct PendingRemovePassengersComponent const &) = delete; - PendingRemovePassengersComponent(struct PendingRemovePassengersComponent const &) = delete; - PendingRemovePassengersComponent() = delete; -#endif - -public: - /** - * @symbol ??1PendingRemovePassengersComponent\@\@QEAA\@XZ - */ - MCAPI ~PendingRemovePassengersComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp b/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp deleted file mode 100644 index 8df4e36e18..0000000000 --- a/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file PendingRemovePassengersSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class PendingRemovePassengersSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PENDINGREMOVEPASSENGERSSYSTEMIMPL -public: - class PendingRemovePassengersSystemImpl& operator=(class PendingRemovePassengersSystemImpl const &) = delete; - PendingRemovePassengersSystemImpl(class PendingRemovePassengersSystemImpl const &) = delete; - PendingRemovePassengersSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?pendingRemovePassengersSystem\@PendingRemovePassengersSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUPendingRemovePassengersComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@URemovePassengersComponent\@\@\@\@\@Z - */ - MCAPI static void pendingRemovePassengersSystem(class ViewT>, struct VehicleComponent const, struct PendingRemovePassengersComponent const>, class EntityModifierT); - -}; diff --git a/LiteLoader/include/llapi/mc/PerlinNoise.hpp b/LiteLoader/include/llapi/mc/PerlinNoise.hpp index b006d031fc..7b095cd71a 100644 --- a/LiteLoader/include/llapi/mc/PerlinNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinNoise.hpp @@ -28,30 +28,30 @@ class PerlinNoise { #endif public: - /** - * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z - */ - MCAPI PerlinNoise(unsigned int, int, int); /** * @symbol ??0PerlinNoise\@\@QEAA\@AEBV0\@\@Z */ MCAPI PerlinNoise(class PerlinNoise const &); /** - * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z */ - MCAPI PerlinNoise(class IRandom &, struct YBlendingBugSettings, int, int); + MCAPI PerlinNoise(unsigned int, int, int); /** * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@HH\@Z */ MCAPI PerlinNoise(class IRandom &, int, int); /** - * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z */ - MCAPI void getRegion(float *, class Vec3 const &, int, int, int, class Vec3 const &) const; + MCAPI PerlinNoise(class IRandom &, struct YBlendingBugSettings, int, int); /** * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec2\@\@HH1M\@Z */ MCAPI void getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float) const; + /** + * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z + */ + MCAPI void getRegion(float *, class Vec3 const &, int, int, int, class Vec3 const &) const; /** * @symbol ?getValue\@PerlinNoise\@\@QEBAMAEBVVec3\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp index 2016525ce8..06bc8aba44 100644 --- a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp @@ -32,14 +32,14 @@ class PerlinSimplexNoise { * @symbol ??0PerlinSimplexNoise\@\@QEAA\@IH\@Z */ MCAPI PerlinSimplexNoise(unsigned int, int); - /** - * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEAVIRandom\@\@H_N\@Z - */ - MCAPI PerlinSimplexNoise(class IRandom &, int, bool); /** * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEBV0\@\@Z */ MCAPI PerlinSimplexNoise(class PerlinSimplexNoise const &); + /** + * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEAVIRandom\@\@H_N\@Z + */ + MCAPI PerlinSimplexNoise(class IRandom &, int, bool); /** * @symbol ?getRegion\@PerlinSimplexNoise\@\@QEBAPEAMPEAMAEBVVec2\@\@HH1MM\@Z */ diff --git a/LiteLoader/include/llapi/mc/PermissionCommand.hpp b/LiteLoader/include/llapi/mc/PermissionCommand.hpp index 35c387e76a..c0215dc49a 100644 --- a/LiteLoader/include/llapi/mc/PermissionCommand.hpp +++ b/LiteLoader/include/llapi/mc/PermissionCommand.hpp @@ -36,7 +36,7 @@ class PermissionCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@PermissionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/PermissionsHandler.hpp b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp index 87190e3425..e068c3bde3 100644 --- a/LiteLoader/include/llapi/mc/PermissionsHandler.hpp +++ b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp @@ -69,10 +69,6 @@ class PermissionsHandler { * @symbol ?DIFF_PLAYER_PERMISSION\@PermissionsHandler\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_PLAYER_PERMISSION; - /** - * @symbol ?getDiff\@PermissionsHandler\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z - */ - MCAPI static class std::optional getDiff(class PermissionsHandler const &, class PermissionsHandler const &); /** * @symbol ?playerPermissionLevelFromString\@PermissionsHandler\@\@SA?AW4PlayerPermissionLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Phantom.hpp b/LiteLoader/include/llapi/mc/Phantom.hpp index fb4a4d84d6..0e64036f68 100644 --- a/LiteLoader/include/llapi/mc/Phantom.hpp +++ b/LiteLoader/include/llapi/mc/Phantom.hpp @@ -37,135 +37,135 @@ class Phantom : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Phantom\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 129 + * @vftbl 117 * @symbol ?shouldRender\@Phantom\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Phantom\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Phantom\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp index e596c4dedf..431f3bd876 100644 --- a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PhotoTransferPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PhotoTransferPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PhotoTransferPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PHOTOTRANSFERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PickaxeItem.hpp b/LiteLoader/include/llapi/mc/PickaxeItem.hpp index 7b9dae2859..e31f17e24e 100644 --- a/LiteLoader/include/llapi/mc/PickaxeItem.hpp +++ b/LiteLoader/include/llapi/mc/PickaxeItem.hpp @@ -53,10 +53,10 @@ class PickaxeItem : public DiggerItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@PickaxeItem\@\@UEBA_NAEBVBlock\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/Pig.hpp b/LiteLoader/include/llapi/mc/Pig.hpp index 4e60cfce46..b6139bdee2 100644 --- a/LiteLoader/include/llapi/mc/Pig.hpp +++ b/LiteLoader/include/llapi/mc/Pig.hpp @@ -37,130 +37,130 @@ class Pig : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Pig\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Pig\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Pig\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PigZombie.hpp b/LiteLoader/include/llapi/mc/PigZombie.hpp index 4869dae642..f3680cc8c5 100644 --- a/LiteLoader/include/llapi/mc/PigZombie.hpp +++ b/LiteLoader/include/llapi/mc/PigZombie.hpp @@ -37,150 +37,150 @@ class PigZombie : public Zombie { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@PigZombie\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@PigZombie\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@PigZombie\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@PigZombie\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@PigZombie\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 328 + * @vftbl 311 * @symbol ?getAttackTime\@PigZombie\@\@UEAAHXZ */ virtual int getAttackTime(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0PigZombie\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Piglin.hpp b/LiteLoader/include/llapi/mc/Piglin.hpp index 01c7e34519..35ea82c764 100644 --- a/LiteLoader/include/llapi/mc/Piglin.hpp +++ b/LiteLoader/include/llapi/mc/Piglin.hpp @@ -37,132 +37,132 @@ class Piglin : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 222 + * @vftbl 209 * @symbol ?getInteraction\@Piglin\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Piglin\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@Piglin\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/Pillager.hpp b/LiteLoader/include/llapi/mc/Pillager.hpp index e1b9510ad0..5dbd52653b 100644 --- a/LiteLoader/include/llapi/mc/Pillager.hpp +++ b/LiteLoader/include/llapi/mc/Pillager.hpp @@ -37,137 +37,137 @@ class Pillager : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Pillager\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Pillager\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Pillager\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@Pillager\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp b/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp index 8763c96028..4fdcd26bd2 100644 --- a/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp +++ b/LiteLoader/include/llapi/mc/PinkPetalsBlock.hpp @@ -31,25 +31,15 @@ class PinkPetalsBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@PinkPetalsBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class PinkPetalsBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class PinkPetalsBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class PinkPetalsBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class PinkPetalsBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,65 +116,75 @@ class PinkPetalsBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@PinkPetalsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@PinkPetalsBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,77 +196,82 @@ class PinkPetalsBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@PinkPetalsBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@PinkPetalsBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@PinkPetalsBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@PinkPetalsBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@PinkPetalsBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp index 1bca44fa5e..e5219951ed 100644 --- a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp @@ -38,34 +38,29 @@ class PistonArmBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 5 + * @symbol ?clip\@PistonArmBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + */ + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + /** + * @vftbl 6 * @symbol ?getCollisionShape\@PistonArmBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -77,10 +72,10 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -91,11 +86,6 @@ class PistonArmBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -116,6 +106,11 @@ class PistonArmBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -126,11 +121,6 @@ class PistonArmBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -147,75 +137,85 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@PistonArmBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@PistonArmBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@PistonArmBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@PistonArmBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -227,72 +227,72 @@ class PistonArmBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 170 + * @vftbl 167 + * @symbol __unk_vfn_167 + */ + virtual void __unk_vfn_167(); + /** + * @vftbl 168 * @symbol ?tick\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** * @vftbl 174 - * @symbol ?clip\@PistonArmBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z - */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; - /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@PistonArmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@PistonArmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PistonBlock.hpp b/LiteLoader/include/llapi/mc/PistonBlock.hpp index 51e69cf412..5ee6887425 100644 --- a/LiteLoader/include/llapi/mc/PistonBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlock.hpp @@ -36,25 +36,15 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@PistonBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class PistonBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class PistonBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class PistonBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,85 +121,95 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 54 + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 57 * @symbol ?isValidAuxValue\@PistonBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@PistonBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@PistonBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@PistonBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@PistonBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,82 +221,87 @@ class PistonBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@PistonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@PistonBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@PistonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PistonBlockActor.hpp b/LiteLoader/include/llapi/mc/PistonBlockActor.hpp index a14f87369c..6c65ac5da2 100644 --- a/LiteLoader/include/llapi/mc/PistonBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlockActor.hpp @@ -67,9 +67,9 @@ class PistonBlockActor : public BlockActor { virtual void __unk_vfn_18(); /** * @vftbl 30 - * @symbol ?getOwningPiston\@PistonBlockActor\@\@UEAAPEAV1\@AEAVBlockSource\@\@\@Z + * @symbol __unk_vfn_30 */ - virtual class PistonBlockActor * getOwningPiston(class BlockSource &); + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -96,20 +96,35 @@ class PistonBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@PistonBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@PistonBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PISTONBLOCKACTOR + /** + * @symbol ?getOwningPiston\@PistonBlockActor\@\@UEAAPEAV1\@AEAVBlockSource\@\@\@Z + */ + MCVAPI class PistonBlockActor * getOwningPiston(class BlockSource &); + /** + * @symbol ?getOwningPiston\@PistonBlockActor\@\@UEBAPEBV1\@AEAVBlockSource\@\@\@Z + */ + MCVAPI class PistonBlockActor const * getOwningPiston(class BlockSource &) const; +#endif /** * @symbol ??0PistonBlockActor\@\@QEAA\@AEBVBlockPos\@\@_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/PitcherCropBlock.hpp b/LiteLoader/include/llapi/mc/PitcherCropBlock.hpp index a56fc6eee8..a54c4ec7bc 100644 --- a/LiteLoader/include/llapi/mc/PitcherCropBlock.hpp +++ b/LiteLoader/include/llapi/mc/PitcherCropBlock.hpp @@ -31,25 +31,20 @@ class PitcherCropBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@PitcherCropBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@PitcherCropBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class PitcherCropBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class PitcherCropBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class PitcherCropBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class PitcherCropBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,95 +121,105 @@ class PitcherCropBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@PitcherCropBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@PitcherCropBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@PitcherCropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 99 + * @vftbl 102 * @symbol ?getSecondPart\@PitcherCropBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@PitcherCropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@PitcherCropBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,77 +231,77 @@ class PitcherCropBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@PitcherCropBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@PitcherCropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@PitcherCropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@PitcherCropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@PitcherCropBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PitcherPlantBlock.hpp b/LiteLoader/include/llapi/mc/PitcherPlantBlock.hpp index 23b1da9bf6..72a3fd8f39 100644 --- a/LiteLoader/include/llapi/mc/PitcherPlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/PitcherPlantBlock.hpp @@ -31,20 +31,10 @@ class PitcherPlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class PitcherPlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class PitcherPlantBlock : public DoublePlantBaseBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class PitcherPlantBlock : public DoublePlantBaseBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class PitcherPlantBlock : public DoublePlantBaseBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,50 +111,60 @@ class PitcherPlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 85 + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 88 * @symbol ?onFertilized\@PitcherPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@PitcherPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,62 +176,67 @@ class PitcherPlantBlock : public DoublePlantBaseBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@PitcherPlantBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@PitcherPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PlanksBlock.hpp b/LiteLoader/include/llapi/mc/PlanksBlock.hpp index cf72fcdf09..ccfea5ac79 100644 --- a/LiteLoader/include/llapi/mc/PlanksBlock.hpp +++ b/LiteLoader/include/llapi/mc/PlanksBlock.hpp @@ -36,20 +36,10 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class PlanksBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class PlanksBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class PlanksBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,82 +176,87 @@ class PlanksBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@PlanksBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@PlanksBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@PlanksBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp b/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp index 6024a9276b..35edc66bb6 100644 --- a/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp @@ -66,11 +66,16 @@ class PlanterItemComponent { virtual void __unk_vfn_6(); /** * @vftbl 7 + * @symbol __unk_vfn_7 + */ + virtual void __unk_vfn_7(); + /** + * @vftbl 8 * @symbol ?_canUseOn\@PlanterItemComponent\@\@MEBA_NAEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@E\@Z */ virtual bool _canUseOn(class ItemStack const &, class Actor &, class BlockPos const &, unsigned char) const; /** - * @vftbl 8 + * @vftbl 9 * @symbol ?_useOn\@PlanterItemComponent\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; @@ -79,9 +84,9 @@ class PlanterItemComponent { */ MCAPI PlanterItemComponent(class ComponentItem *, class Block const &); /** - * @symbol ?calculatePlacePos\@PlanterItemComponent\@\@QEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @symbol ?calculatePlacePos\@PlanterItemComponent\@\@QEBA_NAEBVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ - MCAPI bool calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; + MCAPI bool calculatePlacePos(class ItemStackBase const &, class Actor &, unsigned char &, class BlockPos &) const; /** * @symbol ?bindType\@PlanterItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp b/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp index 140916271f..200d784a4c 100644 --- a/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp +++ b/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp @@ -36,7 +36,7 @@ class PlayAnimationCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@PlayAnimationCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/PlayJumpSoundRequestsSystemImpl.hpp b/LiteLoader/include/llapi/mc/PlayJumpSoundRequestsSystemImpl.hpp new file mode 100644 index 0000000000..f098614a2a --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayJumpSoundRequestsSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file PlayJumpSoundRequestsSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayJumpSoundRequestsSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doPlayJumpSoundRequestsSystem\@PlayJumpSoundRequestsSystemImpl\@\@YAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UGetAttachPosRequestComponent\@\@\@\@\@Z + */ + MCAPI void doPlayJumpSoundRequestsSystem(class StrictEntityContext const &, class EntityModifierT); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp b/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp index 9711b01a87..24f4aea646 100644 --- a/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp @@ -20,10 +20,6 @@ namespace PlayJumpSoundSystem { * @symbol ?createPlayJumpSoundSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ MCAPI struct TickingSystemWithInfo createPlayJumpSoundSystem(); - /** - * @symbol ?createPlayPowerJumpSoundSideBySideSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createPlayPowerJumpSoundSideBySideSystem(); /** * @symbol ?createPlayPowerJumpSoundSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp index 2e80cba305..893bffa205 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp @@ -36,7 +36,7 @@ class PlaySoundCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@PlaySoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp index 5f4521840b..a58c99ad37 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class PlaySoundPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlaySoundPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlaySoundPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYSOUNDPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~PlaySoundPacket(); #endif - /** - * @symbol ??0PlaySoundPacket\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z - */ - MCAPI PlaySoundPacket(std::string, class Vec3 const &, float, float); /** * @symbol ??0PlaySoundPacket\@\@QEAA\@XZ */ MCAPI PlaySoundPacket(); + /** + * @symbol ??0PlaySoundPacket\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z + */ + MCAPI PlaySoundPacket(std::string, class Vec3 const &, float, float); }; diff --git a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp index c96f1f7b3d..908705bebd 100644 --- a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -68,9 +69,9 @@ class PlayStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayStatusPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYSTATUSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Player.hpp b/LiteLoader/include/llapi/mc/Player.hpp index a9487ef5ce..47e93adf6f 100644 --- a/LiteLoader/include/llapi/mc/Player.hpp +++ b/LiteLoader/include/llapi/mc/Player.hpp @@ -76,9 +76,11 @@ class Player : public Mob { LIAPI float getLastPacketLoss(); LIAPI string getClientId(); LIAPI int getDeviceType(); + LIAPI float getCameraOffset(); LIAPI bool isOperator(); LIAPI bool isOP(); + LIAPI int getCurrentExperience(); LIAPI bool setCurrentExperience(int exp); LIAPI size_t getTotalExperience(); @@ -250,967 +252,932 @@ class Player : public Mob { */ virtual void remove(); /** - * @vftbl 25 - * @symbol ?getAttachPos\@Player\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z - */ - virtual class Vec3 getAttachPos(enum class ActorLocation, float) const; - /** - * @vftbl 27 - * @symbol ?move\@Player\@\@UEAAXAEBVVec3\@\@\@Z - */ - virtual void move(class Vec3 const &); - /** - * @vftbl 28 - * @symbol ?move\@Player\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z - */ - virtual void move(struct IActorMovementProxy &, class Vec3 const &) const; - /** - * @vftbl 35 + * @vftbl 32 * @symbol ?getInterpolatedRidingOffset\@Player\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 39 + * @vftbl 34 * @symbol ?isFireImmune\@Player\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@Player\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 47 + * @vftbl 42 * @symbol ?tryCreateAddActorPacket\@Player\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Player\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 50 + * @vftbl 45 * @symbol ?passengerTick\@Player\@\@UEAAXXZ */ virtual void passengerTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 65 + * @vftbl 59 * @symbol ?getFormattedNameTag\@Player\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getFormattedNameTag() const; /** - * @vftbl 68 - * @symbol __unk_vfn_68 - */ - virtual void __unk_vfn_68(); - /** - * @vftbl 74 - * @symbol ?setBlockMovementSlowdownMultiplier\@Player\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z - */ - virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); - /** - * @vftbl 76 - * @symbol ?getCameraOffset\@Player\@\@UEBAMXZ + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual float getCameraOffset() const; + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Player\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 83 + * @vftbl 74 * @symbol ?canInteractWithOtherEntitiesInGame\@Player\@\@UEBA_NXZ */ virtual bool canInteractWithOtherEntitiesInGame() const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 90 + * @vftbl 79 * @symbol ?isImmobile\@Player\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 92 + * @vftbl 81 * @symbol ?isSilentObserver\@Player\@\@UEBA_NXZ */ virtual bool isSilentObserver() const; /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 95 + * @vftbl 84 * @symbol ?isSleeping\@Player\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 96 + * @vftbl 85 * @symbol ?setSleeping\@Player\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 99 + * @vftbl 88 * @symbol ?isBlocking\@Player\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 100 + * @vftbl 89 * @symbol ?isDamageBlocked\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isDamageBlocked(class ActorDamageSource const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 114 + * @vftbl 103 * @symbol ?attack\@Player\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 137 + * @vftbl 125 * @symbol ?onBounceStarted\@Player\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 138 + * @vftbl 126 * @symbol ?feed\@Player\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Player\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 141 + * @vftbl 129 * @symbol ?getActorRendererId\@Player\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getActorRendererId() const; /** - * @vftbl 147 + * @vftbl 135 * @symbol ?awardKillScore\@Player\@\@UEAAXAEAVActor\@\@H\@Z */ virtual void awardKillScore(class Actor &, int); /** - * @vftbl 148 + * @vftbl 136 * @symbol ?setArmor\@Player\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 156 + * @vftbl 144 * @symbol ?setCarriedItem\@Player\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 157 + * @vftbl 145 * @symbol ?getCarriedItem\@Player\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getCarriedItem() const; /** - * @vftbl 158 + * @vftbl 146 * @symbol ?setOffhandSlot\@Player\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 159 + * @vftbl 147 * @symbol ?getEquippedTotem\@Player\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getEquippedTotem() const; /** - * @vftbl 160 + * @vftbl 148 * @symbol ?consumeTotem\@Player\@\@UEAA_NXZ */ virtual bool consumeTotem(); /** - * @vftbl 165 + * @vftbl 153 * @symbol ?getEntityTypeId\@Player\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 169 + * @vftbl 157 * @symbol ?canFreeze\@Player\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 173 + * @vftbl 161 * @symbol ?getPortalCooldown\@Player\@\@UEBAHXZ */ virtual int getPortalCooldown() const; /** - * @vftbl 174 + * @vftbl 162 * @symbol ?getPortalWaitTime\@Player\@\@UEBAHXZ */ virtual int getPortalWaitTime() const; /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@Player\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 168 + * @symbol ?causeFallDamage\@Player\@\@UEAAXMMVActorDamageSource\@\@\@Z + */ + virtual void causeFallDamage(float, float, class ActorDamageSource); + /** + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Player\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 186 + * @vftbl 174 * @symbol ?canAddPassenger\@Player\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 188 + * @vftbl 176 * @symbol ?canBePulledIntoVehicle\@Player\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 192 + * @vftbl 180 * @symbol ?sendMotionPacketIfNeeded\@Player\@\@UEAAXXZ */ virtual void sendMotionPacketIfNeeded(); /** - * @vftbl 195 + * @vftbl 182 * @symbol ?startSwimming\@Player\@\@UEAAXXZ */ virtual void startSwimming(); /** - * @vftbl 196 + * @vftbl 183 * @symbol ?stopSwimming\@Player\@\@UEAAXXZ */ virtual void stopSwimming(); /** - * @vftbl 198 + * @vftbl 185 * @symbol ?getCommandPermissionLevel\@Player\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getCommandPermissionLevel() const; /** - * @vftbl 210 + * @vftbl 197 * @symbol ?canObstructSpawningAndBlockPlacement\@Player\@\@UEBA_NXZ */ virtual bool canObstructSpawningAndBlockPlacement() const; /** - * @vftbl 211 + * @vftbl 198 * @symbol ?getAnimationComponent\@Player\@\@UEAAAEAVAnimationComponent\@\@XZ */ virtual class AnimationComponent & getAnimationComponent(); /** - * @vftbl 214 + * @vftbl 201 * @symbol ?useItem\@Player\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z */ virtual void useItem(class ItemStackBase &, enum class ItemUseMethod, bool); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 218 + * @vftbl 205 * @symbol ?getMapDecorationRotation\@Player\@\@UEBAMXZ */ virtual float getMapDecorationRotation() const; /** - * @vftbl 220 + * @vftbl 207 * @symbol ?add\@Player\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 221 + * @vftbl 208 * @symbol ?drop\@Player\@\@UEAA_NAEBVItemStack\@\@_N\@Z */ virtual bool drop(class ItemStack const &, bool); /** - * @vftbl 229 + * @vftbl 216 * @symbol ?startSpinAttack\@Player\@\@UEAAXXZ */ virtual void startSpinAttack(); /** - * @vftbl 230 + * @vftbl 217 * @symbol ?stopSpinAttack\@Player\@\@UEAAXXZ */ virtual void stopSpinAttack(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@Player\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 238 + * @vftbl 225 * @symbol ?shouldDropDeathLoot\@Player\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 244 + * @vftbl 231 * @symbol ?getLastDeathPos\@Player\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getLastDeathPos() const; /** - * @vftbl 245 + * @vftbl 232 * @symbol ?getLastDeathDimension\@Player\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ */ virtual class std::optional> getLastDeathDimension() const; /** - * @vftbl 246 + * @vftbl 233 * @symbol ?hasDiedBefore\@Player\@\@UEBA_NXZ */ virtual bool hasDiedBefore() const; /** - * @vftbl 248 + * @vftbl 235 * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Player\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnHandContainerItemSet(enum class HandSlot, class ItemStack const &) const; /** - * @vftbl 249 + * @vftbl 236 * @symbol ?_shouldProvideFeedbackOnArmorSet\@Player\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnArmorSet(enum class ArmorSlot, class ItemStack const &) const; /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Player\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Player\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Player\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Player\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 273 + * @vftbl 259 * @symbol ?getSpeed\@Player\@\@UEBAMXZ */ virtual float getSpeed() const; /** - * @vftbl 274 + * @vftbl 260 * @symbol ?setSpeed\@Player\@\@UEAAXM\@Z */ virtual void setSpeed(float); /** - * @vftbl 278 - * @symbol ?travel\@Player\@\@UEAAXMMM_N\@Z - */ - virtual void travel(float, float, float, bool); - /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Player\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 281 + * @vftbl 265 * @symbol ?aiStep\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z */ virtual void aiStep(struct IMobMovementProxy &) const; /** - * @vftbl 288 + * @vftbl 271 * @symbol ?getItemUseDuration\@Player\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 289 + * @vftbl 272 * @symbol ?getItemUseStartupProgress\@Player\@\@UEBAMXZ */ virtual float getItemUseStartupProgress() const; /** - * @vftbl 290 + * @vftbl 273 * @symbol ?getItemUseIntervalProgress\@Player\@\@UEBAMXZ */ virtual float getItemUseIntervalProgress() const; /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 313 + * @vftbl 296 * @symbol ?getAllHand\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllHand() const; /** - * @vftbl 314 + * @vftbl 297 * @symbol ?getAllEquipment\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllEquipment() const; /** - * @vftbl 316 + * @vftbl 299 * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXAEBVActorDamageSource\@\@H\@Z */ virtual void dropEquipmentOnDeath(class ActorDamageSource const &, int); /** - * @vftbl 317 + * @vftbl 300 * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXXZ */ virtual void dropEquipmentOnDeath(); /** - * @vftbl 318 + * @vftbl 301 * @symbol ?clearVanishEnchantedItemsOnDeath\@Player\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 319 + * @vftbl 302 * @symbol ?sendInventory\@Player\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 330 + * @vftbl 313 * @symbol ?canExistWhenDisallowMob\@Player\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 335 + * @vftbl 317 * @symbol ?initBodyControl\@Player\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 336 - * @symbol ?jumpFromGround\@Player\@\@UEAAXAEBVIConstBlockSource\@\@\@Z - */ - virtual void jumpFromGround(class IConstBlockSource const &); - /** - * @vftbl 337 - * @symbol ?jumpFromGround\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z - */ - virtual void jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &) const; - /** - * @vftbl 342 + * @vftbl 322 * @symbol ?updateGliding\@Player\@\@MEAAXXZ */ virtual void updateGliding(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?prepareRegion\@Player\@\@UEAAXAEAVChunkSource\@\@\@Z */ virtual void prepareRegion(class ChunkSource &); /** - * @vftbl 346 + * @vftbl 326 * @symbol ?destroyRegion\@Player\@\@UEAAXXZ */ virtual void destroyRegion(); /** - * @vftbl 347 + * @vftbl 327 * @symbol ?suspendRegion\@Player\@\@UEAAXXZ */ virtual void suspendRegion(); /** - * @vftbl 348 + * @vftbl 328 * @symbol ?resendAllChunks\@Player\@\@UEAAXXZ */ virtual void resendAllChunks(); /** - * @vftbl 349 + * @vftbl 329 * @symbol ?_fireWillChangeDimension\@Player\@\@UEAAXXZ */ virtual void _fireWillChangeDimension(); /** - * @vftbl 350 + * @vftbl 330 * @symbol ?_fireDimensionChanged\@Player\@\@UEAAXXZ */ virtual void _fireDimensionChanged(); /** - * @vftbl 351 + * @vftbl 331 * @symbol ?changeDimensionWithCredits\@Player\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimensionWithCredits(class AutomaticID); /** - * @vftbl 352 + * @vftbl 332 * @symbol ?tickWorld\@Player\@\@UEAAXAEBUTick\@\@\@Z */ virtual void tickWorld(struct Tick const &); /** - * @vftbl 353 - * @symbol __unk_vfn_353 + * @vftbl 333 + * @symbol __unk_vfn_333 */ - virtual void __unk_vfn_353() = 0; + virtual void __unk_vfn_333() = 0; /** - * @vftbl 354 + * @vftbl 334 * @symbol ?getTickingOffsets\@Player\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getTickingOffsets() const; /** - * @vftbl 355 + * @vftbl 335 * @symbol ?moveView\@Player\@\@UEAAXXZ */ virtual void moveView(); /** - * @vftbl 356 + * @vftbl 336 * @symbol ?moveSpawnView\@Player\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void moveSpawnView(class Vec3 const &, class AutomaticID); /** - * @vftbl 357 + * @vftbl 337 * @symbol ?setName\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setName(std::string const &); /** - * @vftbl 358 + * @vftbl 338 * @symbol ?getTravelledMethod\@Player\@\@UEBA?AW4TravelMethod\@\@XZ */ virtual enum class TravelMethod getTravelledMethod() const; /** - * @vftbl 359 + * @vftbl 339 * @symbol ?checkMovementStats\@Player\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void checkMovementStats(class Vec3 const &); /** - * @vftbl 360 - * @symbol __unk_vfn_360 + * @vftbl 340 + * @symbol __unk_vfn_340 */ - virtual void __unk_vfn_360(); + virtual void __unk_vfn_340(); /** - * @vftbl 361 - * @symbol __unk_vfn_361 + * @vftbl 341 + * @symbol __unk_vfn_341 */ - virtual void __unk_vfn_361(); + virtual void __unk_vfn_341(); /** - * @vftbl 362 + * @vftbl 342 * @symbol ?respawn\@Player\@\@UEAAXXZ */ virtual void respawn(); /** - * @vftbl 363 - * @symbol __unk_vfn_363 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_363(); + virtual void __unk_vfn_343(); /** - * @vftbl 364 - * @symbol __unk_vfn_364 + * @vftbl 344 + * @symbol __unk_vfn_344 */ - virtual void __unk_vfn_364(); + virtual void __unk_vfn_344(); /** - * @vftbl 365 + * @vftbl 345 * @symbol ?hasResource\@Player\@\@UEAA_NH\@Z */ virtual bool hasResource(int); /** - * @vftbl 366 + * @vftbl 346 * @symbol ?completeUsingItem\@Player\@\@UEAAXXZ */ virtual void completeUsingItem(); /** - * @vftbl 367 + * @vftbl 347 * @symbol ?startDestroying\@Player\@\@UEAAXXZ */ virtual void startDestroying(); /** - * @vftbl 368 + * @vftbl 348 * @symbol ?stopDestroying\@Player\@\@UEAAXXZ */ virtual void stopDestroying(); /** - * @vftbl 369 - * @symbol __unk_vfn_369 + * @vftbl 349 + * @symbol __unk_vfn_349 */ - virtual void __unk_vfn_369(); + virtual void __unk_vfn_349(); /** - * @vftbl 370 - * @symbol __unk_vfn_370 + * @vftbl 350 + * @symbol __unk_vfn_350 */ - virtual void __unk_vfn_370(); + virtual void __unk_vfn_350(); /** - * @vftbl 371 + * @vftbl 351 * @symbol ?openTrading\@Player\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z */ virtual void openTrading(struct ActorUniqueID const &, bool); /** - * @vftbl 372 + * @vftbl 352 * @symbol ?canOpenContainerScreen\@Player\@\@UEAA_NXZ */ virtual bool canOpenContainerScreen(); /** - * @vftbl 373 - * @symbol __unk_vfn_373 + * @vftbl 353 + * @symbol __unk_vfn_353 */ - virtual void __unk_vfn_373(); + virtual void __unk_vfn_353(); /** - * @vftbl 374 + * @vftbl 354 * @symbol ?openNpcInteractScreen\@Player\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z */ virtual void openNpcInteractScreen(class std::shared_ptr); /** - * @vftbl 375 + * @vftbl 355 * @symbol ?openInventory\@Player\@\@UEAAXXZ */ virtual void openInventory(); /** - * @vftbl 376 - * @symbol __unk_vfn_376 + * @vftbl 356 + * @symbol __unk_vfn_356 */ - virtual void __unk_vfn_376(); + virtual void __unk_vfn_356(); /** - * @vftbl 377 - * @symbol __unk_vfn_377 + * @vftbl 357 + * @symbol __unk_vfn_357 */ - virtual void __unk_vfn_377(); + virtual void __unk_vfn_357(); /** - * @vftbl 378 + * @vftbl 358 * @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 &, std::string const &, std::string const &); /** - * @vftbl 379 + * @vftbl 359 * @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 &, std::string const &, std::string const &); /** - * @vftbl 380 + * @vftbl 360 * @symbol ?displayTextObjectWhisperMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ virtual void displayTextObjectWhisperMessage(std::string const &, std::string const &, std::string const &); /** - * @vftbl 381 + * @vftbl 361 * @symbol ?displayWhisperMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ virtual void displayWhisperMessage(std::string const &, std::string const &, std::string const &, std::string const &); /** - * @vftbl 382 + * @vftbl 362 * @symbol ?startSleepInBed\@Player\@\@UEAA?AW4BedSleepingResult\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BedSleepingResult startSleepInBed(class BlockPos const &); /** - * @vftbl 383 + * @vftbl 363 * @symbol ?stopSleepInBed\@Player\@\@UEAAX_N0\@Z */ virtual void stopSleepInBed(bool, bool); /** - * @vftbl 384 + * @vftbl 364 * @symbol ?canStartSleepInBed\@Player\@\@UEAA_NXZ */ virtual bool canStartSleepInBed(); /** - * @vftbl 385 + * @vftbl 365 * @symbol ?getSleepTimer\@Player\@\@UEBAHXZ */ virtual int getSleepTimer() const; /** - * @vftbl 386 + * @vftbl 366 * @symbol ?getPreviousTickSleepTimer\@Player\@\@UEBAHXZ */ virtual int getPreviousTickSleepTimer() const; /** - * @vftbl 387 + * @vftbl 367 * @symbol ?openSign\@Player\@\@UEAAXAEBVBlockPos\@\@_N\@Z */ virtual void openSign(class BlockPos const &, bool); /** - * @vftbl 388 - * @symbol __unk_vfn_388 + * @vftbl 368 + * @symbol __unk_vfn_368 */ - virtual void __unk_vfn_388(); + virtual void __unk_vfn_368(); /** - * @vftbl 389 + * @vftbl 369 * @symbol ?isHostingPlayer\@Player\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 390 + * @vftbl 370 * @symbol ?isLoading\@Player\@\@UEBA_NXZ */ virtual bool isLoading() const; /** - * @vftbl 391 + * @vftbl 371 * @symbol ?isPlayerInitialized\@Player\@\@UEBA_NXZ */ virtual bool isPlayerInitialized() const; /** - * @vftbl 392 - * @symbol __unk_vfn_392 + * @vftbl 372 + * @symbol __unk_vfn_372 */ - virtual void __unk_vfn_392(); + virtual void __unk_vfn_372(); /** - * @vftbl 393 + * @vftbl 373 * @symbol ?registerTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void registerTrackedBoss(struct ActorUniqueID); /** - * @vftbl 394 + * @vftbl 374 * @symbol ?unRegisterTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void unRegisterTrackedBoss(struct ActorUniqueID); /** - * @vftbl 395 + * @vftbl 375 * @symbol ?setPlayerGameType\@Player\@\@UEAAXW4GameType\@\@\@Z */ virtual void setPlayerGameType(enum class GameType); /** - * @vftbl 396 + * @vftbl 376 * @symbol ?initHUDContainerManager\@Player\@\@UEAAXXZ */ virtual void initHUDContainerManager(); /** - * @vftbl 397 + * @vftbl 377 * @symbol ?_crit\@Player\@\@UEAAXAEAVActor\@\@\@Z */ virtual void _crit(class Actor &); /** - * @vftbl 398 + * @vftbl 378 * @symbol ?getEventing\@Player\@\@UEBAPEAVIMinecraftEventing\@\@XZ */ virtual class IMinecraftEventing * getEventing() const; /** - * @vftbl 399 - * @symbol __unk_vfn_399 + * @vftbl 379 + * @symbol __unk_vfn_379 */ - virtual void __unk_vfn_399(); + virtual void __unk_vfn_379(); /** - * @vftbl 400 - * @symbol ?sendEventPacket\@Player\@\@UEBAXAEAVEventPacket\@\@\@Z + * @vftbl 380 + * @symbol ?sendEventPacket\@Player\@\@UEBAXAEAVLegacyTelemetryEventPacket\@\@\@Z */ - virtual void sendEventPacket(class EventPacket &) const; + virtual void sendEventPacket(class LegacyTelemetryEventPacket &) const; /** - * @vftbl 401 + * @vftbl 381 * @symbol ?addExperience\@Player\@\@UEAAXH\@Z */ virtual void addExperience(int); /** - * @vftbl 402 + * @vftbl 382 * @symbol ?addLevels\@Player\@\@UEAAXH\@Z */ virtual void addLevels(int); /** - * @vftbl 403 + * @vftbl 383 * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z */ virtual void setContainerData(class IContainerManager &, int, int) = 0; /** - * @vftbl 404 + * @vftbl 384 * @symbol ?slotChanged\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@AEAVContainer\@\@HAEBVItemStack\@\@2_N\@Z */ virtual void slotChanged(class IContainerManager &, class Container &, int, class ItemStack const &, class ItemStack const &, bool) = 0; /** - * @vftbl 405 + * @vftbl 385 * @symbol ?inventoryChanged\@Player\@\@UEAAXAEAVContainer\@\@HAEBVItemStack\@\@1_N\@Z */ virtual void inventoryChanged(class Container &, int, class ItemStack const &, class ItemStack const &, bool); /** - * @vftbl 406 + * @vftbl 386 * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z */ virtual void refreshContainer(class IContainerManager &) = 0; /** - * @vftbl 407 + * @vftbl 387 * @symbol ?deleteContainerManager\@Player\@\@UEAAXXZ */ virtual void deleteContainerManager(); /** - * @vftbl 408 + * @vftbl 388 * @symbol ?isActorRelevant\@Player\@\@UEAA_NAEBVActor\@\@\@Z */ virtual bool isActorRelevant(class Actor const &); /** - * @vftbl 409 + * @vftbl 389 * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isTeacher() const = 0; /** - * @vftbl 410 + * @vftbl 390 * @symbol ?onSuspension\@Player\@\@UEAAXXZ */ virtual void onSuspension(); /** - * @vftbl 411 + * @vftbl 391 * @symbol ?onLinkedSlotsChanged\@Player\@\@UEAAXXZ */ virtual void onLinkedSlotsChanged(); /** - * @vftbl 412 + * @vftbl 392 * @symbol ?startCooldown\@Player\@\@UEAAXPEBVItem\@\@_N\@Z */ virtual void startCooldown(class Item const *, bool); /** - * @vftbl 413 + * @vftbl 393 * @symbol ?getItemCooldownLeft\@Player\@\@UEBAHAEBVHashedString\@\@\@Z */ virtual int getItemCooldownLeft(class HashedString const &) const; /** - * @vftbl 414 + * @vftbl 394 * @symbol ?getItemCooldownLeft\@Player\@\@UEBAH_K\@Z */ virtual int getItemCooldownLeft(unsigned __int64) const; /** - * @vftbl 415 + * @vftbl 395 * @symbol ?getMaxItemCooldownLeft\@Player\@\@UEBAHXZ */ virtual int getMaxItemCooldownLeft() const; /** - * @vftbl 416 + * @vftbl 396 * @symbol ?isItemOnCooldown\@Player\@\@UEBA_NAEBVHashedString\@\@\@Z */ virtual bool isItemOnCooldown(class HashedString const &) const; /** - * @vftbl 417 + * @vftbl 397 * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z */ virtual void sendInventoryTransaction(class InventoryTransaction const &) const = 0; /** - * @vftbl 418 + * @vftbl 398 * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z */ virtual void sendComplexInventoryTransaction(std::unique_ptr) const = 0; /** - * @vftbl 419 + * @vftbl 399 * @symbol ?sendNetworkPacket\@Player\@\@UEBAXAEAVPacket\@\@\@Z */ virtual void sendNetworkPacket(class Packet &) const; /** - * @vftbl 420 + * @vftbl 400 * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ */ virtual class PlayerEventCoordinator & getPlayerEventCoordinator() = 0; /** - * @vftbl 421 + * @vftbl 401 * @symbol ?reportMovementTelemetry\@Player\@\@UEAAXW4MovementEventType\@\@\@Z */ virtual void reportMovementTelemetry(enum class MovementEventType); /** - * @vftbl 422 - * @symbol __unk_vfn_422 + * @vftbl 402 + * @symbol __unk_vfn_402 */ - virtual void __unk_vfn_422(); + virtual void __unk_vfn_402(); /** - * @vftbl 423 + * @vftbl 403 * @symbol ?getXuid\@Player\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getXuid() const; /** - * @vftbl 424 + * @vftbl 404 * @symbol ?getMovementSettings\@Player\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ virtual struct PlayerMovementSettings const & getMovementSettings() const; /** - * @vftbl 425 - * @symbol __unk_vfn_425 + * @vftbl 405 + * @symbol __unk_vfn_405 */ - virtual void __unk_vfn_425(); + virtual void __unk_vfn_405(); /** - * @vftbl 426 + * @vftbl 406 * @symbol ?getMaxChunkBuildRadius\@Player\@\@UEBAEXZ */ virtual unsigned char getMaxChunkBuildRadius() const; /** - * @vftbl 427 + * @vftbl 407 * @symbol ?onMovePlayerPacketNormal\@Player\@\@MEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z */ virtual void onMovePlayerPacketNormal(class Vec3 const &, class Vec2 const &, float); /** - * @vftbl 428 + * @vftbl 408 * @symbol ?_createChunkSource\@Player\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 429 + * @vftbl 409 * @symbol ?setAbilities\@Player\@\@UEAAXAEBVLayeredAbilities\@\@\@Z */ virtual void setAbilities(class LayeredAbilities const &); /** - * @vftbl 430 + * @vftbl 410 * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const = 0; /** - * @vftbl 431 + * @vftbl 411 * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer() = 0; @@ -1296,10 +1263,6 @@ class Player : public Mob { * @symbol ??0Player\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@6V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@9\@AEAVEntityContext\@\@66\@Z */ MCAPI Player(class Level &, class PacketSender &, enum class GameType, class NetworkIdentifier const &, enum class SubClientId, class mce::UUID, std::string const &, std::string const &, std::unique_ptr, class EntityContext &, std::string const &, std::string const &); - /** - * @symbol ?applyExhaustion\@Player\@\@QEAAXAEBVVec3\@\@\@Z - */ - MCAPI void applyExhaustion(class Vec3 const &); /** * @symbol ?broadcastPlayerSpawnedMobEvent\@Player\@\@QEAAXW4ActorType\@\@W4MobSpawnMethod\@\@\@Z */ @@ -1360,14 +1323,14 @@ class Player : public Mob { * @symbol ?forceAllowEating\@Player\@\@QEBA_NXZ */ MCAPI bool forceAllowEating() const; - /** - * @symbol ?getAbilities\@Player\@\@QEBAAEBVLayeredAbilities\@\@XZ - */ - MCAPI class LayeredAbilities const & getAbilities() const; /** * @symbol ?getAbilities\@Player\@\@QEAAAEAVLayeredAbilities\@\@XZ */ MCAPI class LayeredAbilities & getAbilities(); + /** + * @symbol ?getAbilities\@Player\@\@QEBAAEBVLayeredAbilities\@\@XZ + */ + MCAPI class LayeredAbilities const & getAbilities() const; /** * @symbol ?getAgent\@Player\@\@QEBAPEAVAgent\@\@XZ */ @@ -1528,14 +1491,14 @@ class Player : public Mob { * @symbol ?getServerId\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getServerId() const; - /** - * @symbol ?getSkin\@Player\@\@QEBAAEBVSerializedSkin\@\@XZ - */ - MCAPI class SerializedSkin const & getSkin() const; /** * @symbol ?getSkin\@Player\@\@QEAAAEAVSerializedSkin\@\@XZ */ MCAPI class SerializedSkin & getSkin(); + /** + * @symbol ?getSkin\@Player\@\@QEBAAEBVSerializedSkin\@\@XZ + */ + MCAPI class SerializedSkin const & getSkin() const; /** * @symbol ?getSleepRotation\@Player\@\@QEBAMXZ */ @@ -1664,6 +1627,14 @@ class Player : public Mob { * @symbol ?passengerCheckMovementStats\@Player\@\@QEAAXXZ */ MCAPI void passengerCheckMovementStats(); + /** + * @symbol ?playPredictiveSynchronizedSound\@Player\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBUActorDefinitionIdentifier\@\@H_N\@Z + */ + MCAPI void playPredictiveSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, struct ActorDefinitionIdentifier const &, int, bool); + /** + * @symbol ?playPredictiveSynchronizedSound\@Player\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N\@Z + */ + MCAPI void playPredictiveSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool); /** * @symbol ?recheckSpawnPosition\@Player\@\@QEAAXXZ */ @@ -1832,6 +1803,10 @@ class Player : public Mob { * @symbol ?take\@Player\@\@QEAA_NAEAVActor\@\@HH\@Z */ MCAPI bool take(class Actor &, int, int); + /** + * @symbol ?tryStartGliding\@Player\@\@QEAA_NXZ + */ + MCAPI bool tryStartGliding(); /** * @symbol ?updateBlockSourceTick\@Player\@\@QEAAXXZ */ @@ -1924,14 +1899,6 @@ class Player : public Mob { * @symbol ?PLAYER_DOWN_SWIM_SPEED\@Player\@\@2MB */ MCAPI static float const PLAYER_DOWN_SWIM_SPEED; - /** - * @symbol ?PLAYER_GLIDING_CAMERA_OFFSET\@Player\@\@2MB - */ - MCAPI static float const PLAYER_GLIDING_CAMERA_OFFSET; - /** - * @symbol ?PLAYER_SLEEPING_CAMERA_OFFSET\@Player\@\@2MB - */ - MCAPI static float const PLAYER_SLEEPING_CAMERA_OFFSET; /** * @symbol ?PLAYER_SLEEPING_HEIGHT\@Player\@\@2MB */ @@ -1977,9 +1944,9 @@ class Player : public Mob { */ MCAPI static void _aiStep(struct IPlayerMovementProxy &); /** - * @symbol ?_travel\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@MMM_N\@Z + * @symbol ?_causeFoodExhaustion\@Player\@\@SAXPEAVAttributeInstance\@\@_NM\@Z */ - MCAPI static void _travel(struct IPlayerMovementProxy &, float, float, float, bool); + MCAPI static void _causeFoodExhaustion(class AttributeInstance *, bool, float); /** * @symbol ?canJump\@Player\@\@SA_NAEAUIPlayerMovementProxy\@\@\@Z */ @@ -2004,6 +1971,10 @@ class Player : public Mob { * @symbol ?tryGetFromComponent\@Player\@\@SAPEAV1\@AEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEAVActorOwnerComponent\@\@_N\@Z */ MCAPI static class Player * tryGetFromComponent(class FlagComponent const &, class ActorOwnerComponent &, bool); + /** + * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@_N\@Z + */ + MCAPI static class Player * tryGetFromEntity(class StackRefResultT, bool); /** * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ @@ -2012,10 +1983,6 @@ class Player : public Mob { * @symbol ?tryGetFromEntity\@Player\@\@SAPEBV1\@AEBVEntityContext\@\@_N\@Z */ MCAPI static class Player const * tryGetFromEntity(class EntityContext const &, bool); - /** - * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@_N\@Z - */ - MCAPI static class Player * tryGetFromEntity(class StackRefResultT, bool); //protected: /** diff --git a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp index b007862bb2..251e133985 100644 --- a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -57,6 +58,7 @@ class PlayerActionPacket : public Packet { FaceID blockFace; // 72 PlayerActionType actionType; // 76 ActorRuntimeID runtimeID; // 80 + bool unk88; // 88 inline std::string toDebugString() { return fmt::format("{}: position: ({}), blockFace: {}, actionType: {}, runtimeID: {}", @@ -94,19 +96,31 @@ class PlayerActionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerActionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerActionPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERACTIONPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~PlayerActionPacket(); #endif + /** + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@1HVActorRuntimeID\@\@\@Z + */ + MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class BlockPos const &, int, class ActorRuntimeID); /** * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@VActorRuntimeID\@\@\@Z */ MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class ActorRuntimeID); + /** + * @symbol ??0PlayerActionPacket\@\@QEAA\@XZ + */ + MCAPI PlayerActionPacket(); + /** + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@VActorRuntimeID\@\@\@Z + */ + MCAPI PlayerActionPacket(enum class PlayerActionType, class ActorRuntimeID); /** * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@EVActorRuntimeID\@\@\@Z */ @@ -116,16 +130,12 @@ class PlayerActionPacket : public Packet { */ MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, int, class ActorRuntimeID); /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@VActorRuntimeID\@\@\@Z - */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class ActorRuntimeID); - /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@1HVActorRuntimeID\@\@\@Z + * @symbol ?getIsFromServerPlayerMovementSystem\@PlayerActionPacket\@\@QEBA_NXZ */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class BlockPos const &, int, class ActorRuntimeID); + MCAPI bool getIsFromServerPlayerMovementSystem() const; /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@XZ + * @symbol ?setFromServerPlayerMovementSystem\@PlayerActionPacket\@\@QEAAX_N\@Z */ - MCAPI PlayerActionPacket(); + MCAPI void setFromServerPlayerMovementSystem(bool); }; diff --git a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp index 75db11fa40..d19935056c 100644 --- a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class PlayerArmorDamagePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerArmorDamagePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerArmorDamagePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERARMORDAMAGEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp index d8b9764fa9..44cef0f0df 100644 --- a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -58,9 +59,9 @@ enum class InputData; virtual bool isValid() const; /** * @vftbl 7 - * @symbol ?_read\@PlayerAuthInputPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerAuthInputPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERAUTHINPUTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerBlockActionData.hpp b/LiteLoader/include/llapi/mc/PlayerBlockActionData.hpp new file mode 100644 index 0000000000..0970b94389 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerBlockActionData.hpp @@ -0,0 +1,33 @@ +/** + * @file PlayerBlockActionData.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct PlayerBlockActionData { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERBLOCKACTIONDATA +public: + struct PlayerBlockActionData& operator=(struct PlayerBlockActionData const &) = delete; + PlayerBlockActionData(struct PlayerBlockActionData const &) = delete; + PlayerBlockActionData() = delete; +#endif + +public: + /** + * @symbol ?read\@PlayerBlockActionData\@\@SA?AV?$Result\@UPlayerBlockActionData\@\@Verror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI static class Bedrock::Result read(class ReadOnlyBinaryStream &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp b/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp index 658dfd1958..42493a3053 100644 --- a/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp +++ b/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -46,9 +47,9 @@ class PlayerBlockActions { */ MCAPI ~PlayerBlockActions(); /** - * @symbol ?read\@PlayerBlockActions\@\@SA?AV1\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerBlockActions\@\@SA?AV?$Result\@VPlayerBlockActions\@\@Verror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI static class PlayerBlockActions read(class ReadOnlyBinaryStream &); + MCAPI static class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @symbol ?write\@PlayerBlockActions\@\@SAXAEBV1\@AEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerDimensionTransferManager.hpp b/LiteLoader/include/llapi/mc/PlayerDimensionTransferManager.hpp new file mode 100644 index 0000000000..057be1abf5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerDimensionTransferManager.hpp @@ -0,0 +1,40 @@ +/** + * @file PlayerDimensionTransferManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerDimensionTransferManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERDIMENSIONTRANSFERMANAGER +public: + class PlayerDimensionTransferManager& operator=(class PlayerDimensionTransferManager const &) = delete; + PlayerDimensionTransferManager(class PlayerDimensionTransferManager const &) = delete; + PlayerDimensionTransferManager() = delete; +#endif + +public: + /** + * @symbol ??0PlayerDimensionTransferManager\@\@QEAA\@V?$unique_ptr\@VPlayerLimboActorManager\@\@U?$default_delete\@VPlayerLimboActorManager\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI PlayerDimensionTransferManager(std::unique_ptr); + /** + * @symbol ?getPlayerLimboActorManager\@PlayerDimensionTransferManager\@\@QEAAAEAVPlayerLimboActorManager\@\@XZ + */ + MCAPI class PlayerLimboActorManager & getPlayerLimboActorManager(); + /** + * @symbol ??1PlayerDimensionTransferManager\@\@QEAA\@XZ + */ + MCAPI ~PlayerDimensionTransferManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp index 52314d728e..a166667256 100644 --- a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class PlayerEnchantOptionsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerEnchantOptionsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerEnchantOptionsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERENCHANTOPTIONSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp index af39702667..047c7409aa 100644 --- a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class PlayerFogPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerFogPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerFogPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERFOGPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp index ccaf3c5419..f47f3b369d 100644 --- a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PlayerHotbarPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerHotbarPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerHotbarPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERHOTBARPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerInputFilterSystem.hpp b/LiteLoader/include/llapi/mc/PlayerInputFilterSystem.hpp new file mode 100644 index 0000000000..9162e3cc60 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerInputFilterSystem.hpp @@ -0,0 +1,24 @@ +/** + * @file PlayerInputFilterSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayerInputFilterSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?create\@PlayerInputFilterSystem\@\@YA?AUTickingSystemWithInfo\@\@_N\@Z + */ + MCAPI struct TickingSystemWithInfo create(bool); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp index e04cfab952..bcddbbe88b 100644 --- a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PlayerInputPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerInputPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerInputPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0PlayerInputPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlayerLimboActorManager.hpp b/LiteLoader/include/llapi/mc/PlayerLimboActorManager.hpp new file mode 100644 index 0000000000..e50f51ceda --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerLimboActorManager.hpp @@ -0,0 +1,55 @@ +/** + * @file PlayerLimboActorManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerLimboActorManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERLIMBOACTORMANAGER +public: + class PlayerLimboActorManager& operator=(class PlayerLimboActorManager const &) = delete; + PlayerLimboActorManager(class PlayerLimboActorManager const &) = delete; +#endif + +public: + /** + * @symbol ??0PlayerLimboActorManager\@\@QEAA\@XZ + */ + MCAPI PlayerLimboActorManager(); + /** + * @symbol ?addOwnedLimboActor\@PlayerLimboActorManager\@\@QEAAXUActorUniqueID\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI void addOwnedLimboActor(struct ActorUniqueID, std::unique_ptr); + /** + * @symbol ?getOwnedActorsDimensionTransferLimbo\@PlayerLimboActorManager\@\@QEAAAEAV?$unordered_map\@UActorUniqueID\@\@V?$vector\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@UActorUniqueID\@\@\@3\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@U?$pair\@$$CBUActorUniqueID\@\@V?$vector\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + */ + MCAPI class std::unordered_map>, struct std::hash, struct std::equal_to, class std::allocator>>>> & getOwnedActorsDimensionTransferLimbo(); + /** + * @symbol ?loadAllOwnedLimboActors\@PlayerLimboActorManager\@\@QEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void loadAllOwnedLimboActors(class LevelStorage &); + /** + * @symbol ?saveOwnedLimboActorsForPlayer\@PlayerLimboActorManager\@\@QEBAXUActorUniqueID\@\@AEAVLevelStorage\@\@\@Z + */ + MCAPI void saveOwnedLimboActorsForPlayer(struct ActorUniqueID, class LevelStorage &) const; + /** + * @symbol ??1PlayerLimboActorManager\@\@QEAA\@XZ + */ + MCAPI ~PlayerLimboActorManager(); + /** + * @symbol ?getOwnedEntityLimboStorageKeyForPlayer\@PlayerLimboActorManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z + */ + MCAPI static std::string getOwnedEntityLimboStorageKeyForPlayer(struct ActorUniqueID); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp index 5c5bed24f6..af8f1c6d8a 100644 --- a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -54,13 +55,13 @@ class PlayerListEntry { */ MCAPI class PlayerListEntry clone() const; /** - * @symbol ?read\@PlayerListEntry\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerListEntry\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI bool read(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream &); /** - * @symbol ?readRemove\@PlayerListEntry\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?readRemove\@PlayerListEntry\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI void readRemove(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result readRemove(class ReadOnlyBinaryStream &); /** * @symbol ?write\@PlayerListEntry\@\@QEBAXAEAVBinaryStream\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp index 3c1971b7bc..1882f7cf6d 100644 --- a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -62,14 +63,14 @@ class PlayerListPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?read\@PlayerListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerListPacket\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@PlayerListPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerListPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERLISTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp b/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp index 8710167c6e..aa06af8657 100644 --- a/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp @@ -31,6 +31,10 @@ class PlayerMoveSystems { * @symbol ?createLocalPlayerPreMoveJumpSystem\@PlayerMoveSystems\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createLocalPlayerPreMoveJumpSystem(); + /** + * @symbol ?createLocalPlayerPreMoveSystem\@PlayerMoveSystems\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createLocalPlayerPreMoveSystem(); /** * @symbol ?createPlayerPostMoveSystem\@PlayerMoveSystems\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PlayerMoveSystemsImpl.hpp b/LiteLoader/include/llapi/mc/PlayerMoveSystemsImpl.hpp new file mode 100644 index 0000000000..3e2f06d370 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerMoveSystemsImpl.hpp @@ -0,0 +1,32 @@ +/** + * @file PlayerMoveSystemsImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayerMoveSystemsImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_doLocalPlayerPreMoveJumpSystem\@PlayerMoveSystemsImpl\@\@YAXAEBVStrictEntityContext\@\@AEAUMoveInputComponent\@\@V?$Optional\@V?$FlagComponent\@UAutoJumpingFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UAutoJumpingFlag\@\@\@\@\@\@\@Z + */ + MCAPI void _doLocalPlayerPreMoveJumpSystem(class StrictEntityContext const &, struct MoveInputComponent &, class Optional>, class EntityModifierT> &); + /** + * @symbol ?_doLocalPlayerPreMoveSystem\@PlayerMoveSystemsImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUStateVectorComponent\@\@AEAULocalPlayerLastPosComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z + */ + MCAPI void _doLocalPlayerPreMoveSystem(class StrictEntityContext const &, struct MoveRequestComponent const &, struct StateVectorComponent const &, struct LocalPlayerLastPosComponent &, class Optional const>, class EntityModifierT> &); + /** + * @symbol ?_doPlayerPostMoveSystem\@PlayerMoveSystemsImpl\@\@YAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@\@Z + */ + MCAPI void _doPlayerPostMoveSystem(class StrictEntityContext const &, class ActorMovementProxyComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerMovement.hpp b/LiteLoader/include/llapi/mc/PlayerMovement.hpp index 7456a4bb7c..4206f149b7 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovement.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovement.hpp @@ -53,6 +53,10 @@ namespace PlayerMovement { * @symbol ?initializePlayer\@PlayerMovement\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializePlayer(class EntityContext &); + /** + * @symbol ?setElytraFlightTimeTicks\@PlayerMovement\@\@YAXAEAVEntityContext\@\@AEBUTick\@\@\@Z + */ + MCAPI void setElytraFlightTimeTicks(class EntityContext &, struct Tick const &); /** * @symbol ?setPositionMode\@PlayerMovement\@\@YAXAEAVEntityContext\@\@W4PositionMode\@PlayerPositionModeComponent\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp b/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp index 23cce26ba8..eb7ae6f7c5 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp @@ -28,9 +28,5 @@ class PlayerMovementStatsEventSystem { * @symbol ?createSystem\@PlayerMovementStatsEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tickPlayerMovementStatsEventSystem\@PlayerMovementStatsEventSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VActorOwnerComponent\@\@$$CBUPlayerPreMobTravelComponent\@\@$$CBUStateVectorComponent\@\@\@\@\@Z - */ - MCAPI static void tickPlayerMovementStatsEventSystem(class ViewT); }; diff --git a/LiteLoader/include/llapi/mc/PlayerPaddleComponent.hpp b/LiteLoader/include/llapi/mc/PlayerPaddleComponent.hpp deleted file mode 100644 index 787c6b7b7c..0000000000 --- a/LiteLoader/include/llapi/mc/PlayerPaddleComponent.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file PlayerPaddleComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct PlayerPaddleComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERPADDLECOMPONENT -public: - struct PlayerPaddleComponent& operator=(struct PlayerPaddleComponent const &) = delete; - PlayerPaddleComponent(struct PlayerPaddleComponent const &) = delete; - PlayerPaddleComponent() = delete; -#endif - -public: - /** - * @symbol ?toString\@PlayerPaddleComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string toString() const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp index 4cacdfff63..478f550c81 100644 --- a/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp @@ -5,11 +5,12 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here - +#include #undef BEFORE_EXTRA /** @@ -20,6 +21,11 @@ class PlayerSkinPacket : public Packet { #define AFTER_EXTRA // Add Member There +public: + mce::UUID mUUID; + SerializedSkin mSkin; + string mLocalizedNewSkinName; + string mLocalizedOldSkinName; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERSKINPACKET @@ -51,14 +57,14 @@ class PlayerSkinPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 4 - * @symbol ?read\@PlayerSkinPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerSkinPacket\@\@UEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@PlayerSkinPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerSkinPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSKINPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp index 71a13159a2..498365e44f 100644 --- a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class PlayerStartItemCooldownPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PlayerStartItemCooldownPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PlayerStartItemCooldownPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSTARTITEMCOOLDOWNPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp b/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp index dd9190b773..b7a298916d 100644 --- a/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp @@ -29,14 +29,14 @@ struct PlayerTickComponent { #endif public: - /** - * @symbol ??0PlayerTickComponent\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI PlayerTickComponent(struct PlayerTickComponent &&); /** * @symbol ??0PlayerTickComponent\@\@QEAA\@V?$unique_ptr\@UIPlayerTickPolicy\@\@U?$default_delete\@UIPlayerTickPolicy\@\@\@std\@\@\@std\@\@\@Z */ MCAPI PlayerTickComponent(std::unique_ptr); + /** + * @symbol ??0PlayerTickComponent\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI PlayerTickComponent(struct PlayerTickComponent &&); /** * @symbol ??4PlayerTickComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PodzolBlock.hpp b/LiteLoader/include/llapi/mc/PodzolBlock.hpp index 33d6dc1462..cb4ef977c3 100644 --- a/LiteLoader/include/llapi/mc/PodzolBlock.hpp +++ b/LiteLoader/include/llapi/mc/PodzolBlock.hpp @@ -36,20 +36,10 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class PodzolBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class PodzolBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class PodzolBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,57 +171,62 @@ class PodzolBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@PodzolBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp b/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp index 222cc81fcc..752a9ea5af 100644 --- a/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp @@ -37,34 +37,29 @@ class PointedDripstoneBlock : public FallingBlock { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@PointedDripstoneBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 15 - * @symbol ?onProjectileHit\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 12 + * @symbol ?getVisualShape\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@PointedDripstoneBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_19(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 18 + * @symbol ?onProjectileHit\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +71,10 @@ class PointedDripstoneBlock : public FallingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +85,6 @@ class PointedDripstoneBlock : public FallingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class PointedDripstoneBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class PointedDripstoneBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,55 +136,65 @@ class PointedDripstoneBlock : public FallingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@PointedDripstoneBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,117 +206,117 @@ class PointedDripstoneBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@PointedDripstoneBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@PointedDripstoneBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@PointedDripstoneBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** - * @vftbl 197 + * @vftbl 195 * @symbol ?onLand\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?startFalling\@PointedDripstoneBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; diff --git a/LiteLoader/include/llapi/mc/PolarBear.hpp b/LiteLoader/include/llapi/mc/PolarBear.hpp index c86d5085bf..118ac5014b 100644 --- a/LiteLoader/include/llapi/mc/PolarBear.hpp +++ b/LiteLoader/include/llapi/mc/PolarBear.hpp @@ -37,130 +37,130 @@ class PolarBear : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@PolarBear\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 169 + * @vftbl 157 * @symbol ?canFreeze\@PolarBear\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0PolarBear\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PortalBlock.hpp b/LiteLoader/include/llapi/mc/PortalBlock.hpp index 531c1be746..1c271756ab 100644 --- a/LiteLoader/include/llapi/mc/PortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/PortalBlock.hpp @@ -36,25 +36,20 @@ class PortalBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@PortalBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 11 + * @symbol ?getVisualShapeInWorld\@PortalBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +60,11 @@ class PortalBlock : public BlockLegacy { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@PortalBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +77,9 @@ class PortalBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@PortalBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class PortalBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class PortalBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,65 +131,70 @@ class PortalBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@PortalBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 89 + * @vftbl 92 * @symbol ?mayPick\@PortalBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@PortalBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,80 +206,85 @@ class PortalBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@PortalBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PORTALBLOCK /** * @symbol ?waterSpreadCausesSpawn\@PortalBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp index 1ec3ca515c..6a1c62d412 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PositionTrackingDBClientRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PositionTrackingDBClientRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PositionTrackingDBClientRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POSITIONTRACKINGDBCLIENTREQUESTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp index 26fd6804b3..8f96e019de 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PositionTrackingDBServerBroadcastPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PositionTrackingDBServerBroadcastPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PositionTrackingDBServerBroadcastPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POSITIONTRACKINGDBSERVERBROADCASTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp index 2d01c833fe..2f59a7fb8e 100644 --- a/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp @@ -32,8 +32,8 @@ class PostFallDamageFinalizeMoveSystem { */ MCAPI static struct TickingSystemWithInfo createPostFallDamageFinalizeMoveSystem(); /** - * @symbol ?tickPostFallDamageFinalizeMoveSystem\@PostFallDamageFinalizeMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUMoveRequestComponent\@\@UStateVectorComponent\@\@USlideOffsetComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@\@Z + * @symbol ?tickPostFallDamageFinalizeMoveSystem\@PostFallDamageFinalizeMoveSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUMoveRequestComponent\@\@UStateVectorComponent\@\@V?$Optional\@USlideOffsetComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@\@Z */ - MCAPI static void tickPostFallDamageFinalizeMoveSystem(class ViewT, class EntityModifierT>); + MCAPI static void tickPostFallDamageFinalizeMoveSystem(class ViewT>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystemImpl.hpp b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystemImpl.hpp new file mode 100644 index 0000000000..b6f70bd072 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file PostFallDamageFinalizeMoveSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PostFallDamageFinalizeMoveSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doPostFallDamageFinalizeMoveSystem\@PostFallDamageFinalizeMoveSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@USlideOffsetComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@\@Z + */ + MCAPI void doPostFallDamageFinalizeMoveSystem(class StrictEntityContext &, struct MoveRequestComponent const &, struct StateVectorComponent &, class Optional, class EntityModifierT> &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PotatoBlock.hpp b/LiteLoader/include/llapi/mc/PotatoBlock.hpp index 6457c5dce9..3e84116996 100644 --- a/LiteLoader/include/llapi/mc/PotatoBlock.hpp +++ b/LiteLoader/include/llapi/mc/PotatoBlock.hpp @@ -36,25 +36,15 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@PotatoBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class PotatoBlock : public CropBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class PotatoBlock : public CropBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class PotatoBlock : public CropBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +121,55 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 101 - * @symbol ?spawnResources\@PotatoBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** * @vftbl 104 - * @symbol __unk_vfn_104 + * @symbol ?spawnResources\@PotatoBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,72 +181,77 @@ class PotatoBlock : public CropBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@PotatoBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getBaseSeed\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getBaseCrop\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?getCropNum\@PotatoBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/Potion.hpp b/LiteLoader/include/llapi/mc/Potion.hpp index 3b0f5e7bb7..e02631b52c 100644 --- a/LiteLoader/include/llapi/mc/Potion.hpp +++ b/LiteLoader/include/llapi/mc/Potion.hpp @@ -267,14 +267,14 @@ enum class PotionVariant; * @symbol ?getBasePotion\@Potion\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z */ MCAPI static std::string getBasePotion(enum class Potion::PotionType); - /** - * @symbol ?getPotion\@Potion\@\@SA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@H\@Z - */ - MCAPI static class std::shared_ptr getPotion(int); /** * @symbol ?getPotion\@Potion\@\@SA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ MCAPI static class std::shared_ptr getPotion(class std::basic_string_view>); + /** + * @symbol ?getPotion\@Potion\@\@SA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@H\@Z + */ + MCAPI static class std::shared_ptr getPotion(int); /** * @symbol ?getPotionCount\@Potion\@\@SAHXZ */ diff --git a/LiteLoader/include/llapi/mc/PotionItem.hpp b/LiteLoader/include/llapi/mc/PotionItem.hpp index 90f361ea13..2093920b82 100644 --- a/LiteLoader/include/llapi/mc/PotionItem.hpp +++ b/LiteLoader/include/llapi/mc/PotionItem.hpp @@ -53,10 +53,10 @@ class PotionItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -163,12 +163,12 @@ class PotionItem : public Item { */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@PotionItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getPotionType\@PotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ */ virtual enum class Potion::PotionType getPotionType() const; diff --git a/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp b/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp index fba3d7bf03..8072cb33b5 100644 --- a/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp @@ -36,45 +36,30 @@ class PowderSnowBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@PowderSnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@PowderSnowBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol ?isClimbable\@PowderSnowBlock\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z - */ - virtual bool isClimbable(struct IActorMovementProxy const &) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -87,14 +72,14 @@ class PowderSnowBlock : public BlockLegacy { virtual void __unk_vfn_32(); /** * @vftbl 33 - * @symbol __unk_vfn_33 + * @symbol ?isClimbable\@PowderSnowBlock\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z */ - virtual void __unk_vfn_33(); + virtual bool isClimbable(struct IActorMovementProxy const &) const; /** * @vftbl 34 - * @symbol ?isWaterBlocking\@PowderSnowBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -107,9 +92,9 @@ class PowderSnowBlock : public BlockLegacy { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@PowderSnowBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -130,6 +115,11 @@ class PowderSnowBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -140,11 +130,6 @@ class PowderSnowBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -161,65 +146,70 @@ class PowderSnowBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 52 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 55 * @symbol ?canBeAscendedByJumping\@PowderSnowBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@PowderSnowBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@PowderSnowBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,60 +221,65 @@ class PowderSnowBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 168 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 166 * @symbol ?onFallOn\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POWDERSNOWBLOCK /** * @symbol ?canBeDestroyedByWaterSpread\@PowderSnowBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp index b13f01cc39..2f7817fed9 100644 --- a/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp @@ -36,20 +36,10 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class PoweredRailBlock : public BaseRailBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class PoweredRailBlock : public BaseRailBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class PoweredRailBlock : public BaseRailBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 72 - * @symbol ?onRedstoneUpdate\@PoweredRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 75 + * @symbol ?onRedstoneUpdate\@PoweredRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ - virtual void __unk_vfn_81(); + virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,60 +176,65 @@ class PoweredRailBlock : public BaseRailBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@PoweredRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0PoweredRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/PredictableProjectile.hpp b/LiteLoader/include/llapi/mc/PredictableProjectile.hpp index 3b721644cd..a79174031a 100644 --- a/LiteLoader/include/llapi/mc/PredictableProjectile.hpp +++ b/LiteLoader/include/llapi/mc/PredictableProjectile.hpp @@ -41,100 +41,100 @@ class PredictableProjectile : public Actor { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PREDICTABLEPROJECTILE /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp index 4d5459f7de..c10353bdbe 100644 --- a/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp @@ -36,20 +36,10 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class PressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class PressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class PressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class PressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const; diff --git a/LiteLoader/include/llapi/mc/PressurePlatePopEvent.hpp b/LiteLoader/include/llapi/mc/PressurePlatePopEvent.hpp new file mode 100644 index 0000000000..24a3bd9766 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PressurePlatePopEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file PressurePlatePopEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct PressurePlatePopEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PRESSUREPLATEPOPEVENT +public: + struct PressurePlatePopEvent& operator=(struct PressurePlatePopEvent const &) = delete; + PressurePlatePopEvent(struct PressurePlatePopEvent const &) = delete; + PressurePlatePopEvent() = delete; +#endif + +public: + /** + * @symbol ??1PressurePlatePopEvent\@\@QEAA\@XZ + */ + MCAPI ~PressurePlatePopEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PressurePlatePushEvent.hpp b/LiteLoader/include/llapi/mc/PressurePlatePushEvent.hpp new file mode 100644 index 0000000000..b175a61f76 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PressurePlatePushEvent.hpp @@ -0,0 +1,35 @@ +/** + * @file PressurePlatePushEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct PressurePlatePushEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PRESSUREPLATEPUSHEVENT +public: + struct PressurePlatePushEvent& operator=(struct PressurePlatePushEvent const &) = delete; + PressurePlatePushEvent() = delete; +#endif + +public: + /** + * @symbol ??0PressurePlatePushEvent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI PressurePlatePushEvent(struct PressurePlatePushEvent const &); + /** + * @symbol ??1PressurePlatePushEvent\@\@QEAA\@XZ + */ + MCAPI ~PressurePlatePushEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PrimedTnt.hpp b/LiteLoader/include/llapi/mc/PrimedTnt.hpp index f2c33fedf4..d39cceb686 100644 --- a/LiteLoader/include/llapi/mc/PrimedTnt.hpp +++ b/LiteLoader/include/llapi/mc/PrimedTnt.hpp @@ -57,145 +57,145 @@ class PrimedTnt : public PredictableProjectile { */ virtual enum class ActorType getOwnerEntityType(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@PrimedTnt\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@PrimedTnt\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@PrimedTnt\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@PrimedTnt\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@PrimedTnt\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@PrimedTnt\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@PrimedTnt\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@PrimedTnt\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@PrimedTnt\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0PrimedTnt\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp index f047e8c75c..bf1c94710b 100644 --- a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp +++ b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp @@ -36,20 +36,10 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class PrismarineBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class PrismarineBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class PrismarineBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,72 +176,77 @@ class PrismarineBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@PrismarineBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@PrismarineBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp index 775739d212..59eef6276f 100644 --- a/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp @@ -59,6 +59,10 @@ class ProjectileItemComponent { * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VProjectileItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @symbol ??0ProjectileItemComponent\@\@QEAA\@PEAVComponentItem\@\@W4ActorType\@\@M\@Z + */ + MCAPI ProjectileItemComponent(class ComponentItem *, enum class ActorType, float); /** * @symbol ?dispense\@ProjectileItemComponent\@\@QEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ diff --git a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp index edb107857e..0ed96b9218 100644 --- a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp +++ b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp @@ -193,10 +193,6 @@ class PropertiesSettings { * @symbol ?getServerWakeupFrequency\@PropertiesSettings\@\@QEBAHXZ */ MCAPI int getServerWakeupFrequency() const; - /** - * @symbol ?getTransportLayerType\@PropertiesSettings\@\@QEBA?AW4TransportLayer\@\@XZ - */ - MCAPI enum class TransportLayer getTransportLayerType() const; /** * @symbol ?isClientSideGenEnabled\@PropertiesSettings\@\@QEBA_NXZ */ @@ -265,5 +261,9 @@ class PropertiesSettings { * @symbol ?parseGameMode\@PropertiesSettings\@\@SA?AW4GameType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class GameType parseGameMode(std::string const &); + /** + * @symbol ?parseInt32Value\@PropertiesSettings\@\@SAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI static int parseInt32Value(std::string const &); }; diff --git a/LiteLoader/include/llapi/mc/PropertyBag.hpp b/LiteLoader/include/llapi/mc/PropertyBag.hpp index cab7e516bf..62239da2aa 100644 --- a/LiteLoader/include/llapi/mc/PropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/PropertyBag.hpp @@ -29,14 +29,14 @@ class PropertyBag { #endif public: - /** - * @symbol ??0PropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z - */ - MCAPI PropertyBag(class Json::Value const &); /** * @symbol ??0PropertyBag\@\@QEAA\@XZ */ MCAPI PropertyBag(); + /** + * @symbol ??0PropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z + */ + MCAPI PropertyBag(class Json::Value const &); /** * @symbol ?toJsonValue\@PropertyBag\@\@QEBAAEBVValue\@Json\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Pufferfish.hpp b/LiteLoader/include/llapi/mc/Pufferfish.hpp index 040edcfc9d..3157e64bf1 100644 --- a/LiteLoader/include/llapi/mc/Pufferfish.hpp +++ b/LiteLoader/include/llapi/mc/Pufferfish.hpp @@ -37,145 +37,145 @@ class Pufferfish : public Fish { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Pufferfish\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 52 + * @vftbl 47 * @symbol ?startRiding\@Pufferfish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Pufferfish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Pufferfish\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Pufferfish\@\@UEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Pufferfish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp index 7d9e2b3c27..18592d6d99 100644 --- a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp @@ -36,25 +36,15 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@PumpkinBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class PumpkinBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class PumpkinBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class PumpkinBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,55 +121,65 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 70 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 73 * @symbol ?dispense\@PumpkinBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@PumpkinBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@PumpkinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,70 +191,75 @@ class PumpkinBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@PumpkinBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@PumpkinBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@PumpkinBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PUMPKINBLOCK /** * @symbol ?canBeSilkTouched\@PumpkinBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp b/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp index a4dfee26f3..56cda64d8a 100644 --- a/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp @@ -52,10 +52,10 @@ class PumpkinBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp index 246bf8ee9d..48c6e806ca 100644 --- a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp +++ b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class PurchaseReceiptPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@PurchaseReceiptPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@PurchaseReceiptPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0PurchaseReceiptPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/PushActorsSystem.hpp b/LiteLoader/include/llapi/mc/PushActorsSystem.hpp index 8c5abf3e9b..909f62629a 100644 --- a/LiteLoader/include/llapi/mc/PushActorsSystem.hpp +++ b/LiteLoader/include/llapi/mc/PushActorsSystem.hpp @@ -32,8 +32,8 @@ class PushActorsSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?pushActors\@PushActorsSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@\@Z + * @symbol ?pushActors\@PushActorsSystem\@\@SAXAEAVActorOwnerComponent\@\@\@Z */ - MCAPI static void pushActors(class StrictEntityContext &, class ActorMovementProxyComponent &); + MCAPI static void pushActors(class ActorOwnerComponent &); }; diff --git a/LiteLoader/include/llapi/mc/PushableComponent.hpp b/LiteLoader/include/llapi/mc/PushableComponent.hpp index ebc3bc39f9..bbd6304e79 100644 --- a/LiteLoader/include/llapi/mc/PushableComponent.hpp +++ b/LiteLoader/include/llapi/mc/PushableComponent.hpp @@ -32,14 +32,14 @@ class PushableComponent { * @symbol ??0PushableComponent\@\@QEAA\@XZ */ MCAPI PushableComponent(); - /** - * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@\@Z - */ - MCAPI void initFromDefinition(class Actor &); /** * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@AEBUPushableDescription\@\@\@Z */ MCAPI void initFromDefinition(class Actor &, struct PushableDescription const &); + /** + * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@\@Z + */ + MCAPI void initFromDefinition(class Actor &); /** * @symbol ?isPushable\@PushableComponent\@\@QEAA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/Puv.hpp b/LiteLoader/include/llapi/mc/Puv.hpp new file mode 100644 index 0000000000..b6c2e2bf5a --- /dev/null +++ b/LiteLoader/include/llapi/mc/Puv.hpp @@ -0,0 +1,28 @@ +/** + * @file Puv.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace Puv { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?peekJsonVersion\@Puv\@\@YA?AVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class SemVersion peekJsonVersion(std::string const &); + /** + * @symbol ?peekJsonVersion\@Puv\@\@YA?AVSemVersion\@\@AEBV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@\@Z + */ + MCAPI class SemVersion peekJsonVersion(class rapidjson::GenericValue, class rapidjson::MemoryPoolAllocator> const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/QuartzBlock.hpp b/LiteLoader/include/llapi/mc/QuartzBlock.hpp index 6de03bb33d..53f6ee9235 100644 --- a/LiteLoader/include/llapi/mc/QuartzBlock.hpp +++ b/LiteLoader/include/llapi/mc/QuartzBlock.hpp @@ -31,20 +31,10 @@ class QuartzBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class QuartzBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class QuartzBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class QuartzBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class QuartzBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,50 +111,60 @@ class QuartzBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@QuartzBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@QuartzBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,82 +176,87 @@ class QuartzBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@QuartzBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@QuartzBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@QuartzBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@QuartzBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@QuartzBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp index e1a885b32b..da7d4595f0 100644 --- a/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp +++ b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp @@ -36,7 +36,7 @@ class QueryTargetCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@QueryTargetCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Rabbit.hpp b/LiteLoader/include/llapi/mc/Rabbit.hpp index 91c2db92a8..516acef64e 100644 --- a/LiteLoader/include/llapi/mc/Rabbit.hpp +++ b/LiteLoader/include/llapi/mc/Rabbit.hpp @@ -37,145 +37,130 @@ class Rabbit : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Rabbit\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Rabbit\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 - */ - virtual void __unk_vfn_252(); - /** - * @vftbl 256 - * @symbol ?readAdditionalSaveData\@Rabbit\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z - */ - virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); - /** - * @vftbl 257 - * @symbol ?addAdditionalSaveData\@Rabbit\@\@MEBAXAEAVCompoundTag\@\@\@Z - */ - virtual void addAdditionalSaveData(class CompoundTag &) const; - /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_239(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_247(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_253(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_276(); /** - * @vftbl 338 - * @symbol ?newServerAiStep\@Rabbit\@\@UEAAXXZ + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void newServerAiStep(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Rabbit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RailBlock.hpp b/LiteLoader/include/llapi/mc/RailBlock.hpp index 91f9ce9ac4..5fd4c730b6 100644 --- a/LiteLoader/include/llapi/mc/RailBlock.hpp +++ b/LiteLoader/include/llapi/mc/RailBlock.hpp @@ -36,20 +36,10 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RailBlock : public BaseRailBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RailBlock : public BaseRailBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RailBlock : public BaseRailBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +171,65 @@ class RailBlock : public BaseRailBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@RailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0RailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RailMovementComponent.hpp b/LiteLoader/include/llapi/mc/RailMovementComponent.hpp index b9119fcb85..c88ba9b52a 100644 --- a/LiteLoader/include/llapi/mc/RailMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/RailMovementComponent.hpp @@ -36,9 +36,5 @@ class RailMovementComponent { * @symbol ?getMaxSpeed\@RailMovementComponent\@\@QEBAMXZ */ MCAPI float getMaxSpeed() const; - /** - * @symbol ??8RailMovementComponent\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class RailMovementComponent const &) const; }; diff --git a/LiteLoader/include/llapi/mc/RandomPos.hpp b/LiteLoader/include/llapi/mc/RandomPos.hpp index 31caa96e7b..96448bb6e3 100644 --- a/LiteLoader/include/llapi/mc/RandomPos.hpp +++ b/LiteLoader/include/llapi/mc/RandomPos.hpp @@ -41,14 +41,14 @@ class RandomPos { * @symbol ?getPosInDirection\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHH_N2PEAV2\@AEBUIntRange\@\@HW4SolidityCheckType\@\@\@Z */ MCAPI static bool getPosInDirection(class Vec3 &, class Mob &, int, int, int, bool, bool, class Vec3 *, struct IntRange const &, int, enum class SolidityCheckType); - /** - * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVRandom\@\@AEAVVec3\@\@AEAVMob\@\@HHAEBV3\@\@Z - */ - MCAPI static bool getPosTowards(class Random &, class Vec3 &, class Mob &, int, int, class Vec3 const &); /** * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHAEBV2\@\@Z */ MCAPI static bool getPosTowards(class Vec3 &, class Mob &, int, int, class Vec3 const &); + /** + * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVRandom\@\@AEAVVec3\@\@AEAVMob\@\@HHAEBV3\@\@Z + */ + MCAPI static bool getPosTowards(class Random &, class Vec3 &, class Mob &, int, int, class Vec3 const &); /** * @symbol ?getSpawnPos\@RandomPos\@\@SA_NAEAVBlockSource\@\@AEAVRandom\@\@AEAVVec3\@\@HHH\@Z */ @@ -63,14 +63,14 @@ class RandomPos { * @symbol ?generateRandomPos\@RandomPos\@\@CA_NAEAVRandomize\@\@AEAVVec3\@\@AEAVMob\@\@HHHPEBV3\@_N4AEBUIntRange\@\@HW4SolidityCheckType\@\@\@Z */ MCAPI static bool generateRandomPos(class Randomize &, class Vec3 &, class Mob &, int, int, int, class Vec3 const *, bool, bool, struct IntRange const &, int, enum class SolidityCheckType); - /** - * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@HHHV?$function\@$$A6A_NAEAVBlockPos\@\@\@Z\@std\@\@\@Z - */ - MCAPI static bool snapToGround(class BlockPos &, int, int, int, class std::function); /** * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@AEAVMob\@\@HAEBUIntRange\@\@W4SolidityCheckType\@\@\@Z */ MCAPI static bool snapToGround(class BlockPos &, class Mob &, int, struct IntRange const &, enum class SolidityCheckType); + /** + * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@HHHV?$function\@$$A6A_NAEAVBlockPos\@\@\@Z\@std\@\@\@Z + */ + MCAPI static bool snapToGround(class BlockPos &, int, int, int, class std::function); /** * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@HHV?$function\@$$A6A_NAEAVBlockPos\@\@\@Z\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp index 53ae9cb271..71f6629495 100644 --- a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp @@ -55,6 +55,11 @@ class RandomizableBlockActorContainerBase : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -81,10 +86,15 @@ class RandomizableBlockActorContainerBase : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RANDOMIZABLEBLOCKACTORCONTAINERBASE /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp b/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp index 8c7ff3111d..96e3f926b9 100644 --- a/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp @@ -52,10 +52,10 @@ class RangedWeaponItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp index df4ec85292..23acc3bf31 100644 --- a/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp @@ -52,10 +52,10 @@ class RapidFertilizerItem : public FertilizerItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/RayTracingOptions.hpp b/LiteLoader/include/llapi/mc/RayTracingOptions.hpp index 8e5b572c9a..2977ba185e 100644 --- a/LiteLoader/include/llapi/mc/RayTracingOptions.hpp +++ b/LiteLoader/include/llapi/mc/RayTracingOptions.hpp @@ -30,6 +30,10 @@ class RayTracingOptions { #endif public: + /** + * @symbol ?PBR_TAG\@RayTracingOptions\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + */ + MCAPI static class std::basic_string_view> const PBR_TAG; /** * @symbol ?RAY_TRACING_TAG\@RayTracingOptions\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ @@ -38,5 +42,9 @@ class RayTracingOptions { * @symbol ?getPackCapability\@RayTracingOptions\@\@SA?AVPackCapability\@\@V?$NonOwnerPointer\@VIAdvancedGraphicsOptions\@\@\@Bedrock\@\@\@Z */ MCAPI static class PackCapability getPackCapability(class Bedrock::NonOwnerPointer); + /** + * @symbol ?getPackDeferredCapability\@RayTracingOptions\@\@SA?AVPackCapability\@\@V?$NonOwnerPointer\@VIAdvancedGraphicsOptions\@\@\@Bedrock\@\@\@Z + */ + MCAPI static class PackCapability getPackDeferredCapability(class Bedrock::NonOwnerPointer); }; diff --git a/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp b/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp index 6210b1a4a9..fb98e04dd7 100644 --- a/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -50,8 +51,8 @@ class ReadOnlyBinaryStream { template <> inline void readType(mce::UUID& uuid) { - dAccess(&uuid) = getUnsignedInt64(); - dAccess(&uuid) = getUnsignedInt64(); + dAccess(&uuid) = getUnsignedInt64().value(); + dAccess(&uuid) = getUnsignedInt64().value(); } //template <> //inline void readType(NetworkItemInstanceDescriptor& descriptor) @@ -76,9 +77,9 @@ class ReadOnlyBinaryStream { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?read\@ReadOnlyBinaryStream\@\@EEAA_NPEAX_K\@Z + * @symbol ?read\@ReadOnlyBinaryStream\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@PEAX_K\@Z */ - virtual bool read(void *, unsigned __int64); + virtual class Bedrock::Result read(void *, unsigned __int64); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_READONLYBINARYSTREAM /** * @symbol __unk_destructor_-1 @@ -98,84 +99,88 @@ class ReadOnlyBinaryStream { */ MCAPI bool canReadBool() const; /** - * @symbol ?getBool\@ReadOnlyBinaryStream\@\@QEAA_NXZ + * @symbol ?ensureReadCompleted\@ReadOnlyBinaryStream\@\@QEBA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI bool getBool(); + MCAPI class Bedrock::Result ensureReadCompleted() const; /** - * @symbol ?getByte\@ReadOnlyBinaryStream\@\@QEAAEXZ + * @symbol ?getBool\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@_NVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI unsigned char getByte(); + MCAPI class Bedrock::Result getBool(); /** - * @symbol ?getDouble\@ReadOnlyBinaryStream\@\@QEAANXZ + * @symbol ?getByte\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@EVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI double getDouble(); + MCAPI class Bedrock::Result getByte(); /** - * @symbol ?getFloat\@ReadOnlyBinaryStream\@\@QEAAMXZ + * @symbol ?getDouble\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@NVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI float getFloat(); + MCAPI class Bedrock::Result getDouble(); /** - * @symbol ?getReadCompleteResult\@ReadOnlyBinaryStream\@\@QEBA?AW4StreamReadResult\@\@XZ + * @symbol ?getFloat\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@MVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI enum class StreamReadResult getReadCompleteResult() const; + MCAPI class Bedrock::Result getFloat(); /** - * @symbol ?getSignedBigEndianInt\@ReadOnlyBinaryStream\@\@QEAAHXZ + * @symbol ?getSignedBigEndianInt\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@HVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI int getSignedBigEndianInt(); + MCAPI class Bedrock::Result getSignedBigEndianInt(); /** - * @symbol ?getSignedInt\@ReadOnlyBinaryStream\@\@QEAAHXZ + * @symbol ?getSignedInt\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@HVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI int getSignedInt(); + MCAPI class Bedrock::Result getSignedInt(); /** - * @symbol ?getSignedInt64\@ReadOnlyBinaryStream\@\@QEAA_JXZ + * @symbol ?getSignedInt64\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@_JVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI __int64 getSignedInt64(); + MCAPI class Bedrock::Result<__int64, class std::error_code> getSignedInt64(); /** - * @symbol ?getSignedShort\@ReadOnlyBinaryStream\@\@QEAAFXZ + * @symbol ?getSignedShort\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@FVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI short getSignedShort(); + MCAPI class Bedrock::Result getSignedShort(); /** - * @symbol ?getString\@ReadOnlyBinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @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 std::string getString(); + MCAPI class Bedrock::Result getString(std::string &); /** - * @symbol ?getString\@ReadOnlyBinaryStream\@\@QEAA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 bool getString(std::string &); + MCAPI class Bedrock::Result getString(); /** - * @symbol ?getUnsignedChar\@ReadOnlyBinaryStream\@\@QEAAEXZ + * @symbol ?getUnsignedChar\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@EVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI unsigned char getUnsignedChar(); + MCAPI class Bedrock::Result getUnsignedChar(); /** - * @symbol ?getUnsignedInt\@ReadOnlyBinaryStream\@\@QEAAIXZ + * @symbol ?getUnsignedInt\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@IVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI unsigned int getUnsignedInt(); + MCAPI class Bedrock::Result getUnsignedInt(); /** - * @symbol ?getUnsignedInt64\@ReadOnlyBinaryStream\@\@QEAA_KXZ + * @symbol ?getUnsignedInt64\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@_KVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI unsigned __int64 getUnsignedInt64(); + MCAPI class Bedrock::Result getUnsignedInt64(); /** - * @symbol ?getUnsignedShort\@ReadOnlyBinaryStream\@\@QEAAGXZ + * @symbol ?getUnsignedShort\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@GVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI unsigned short getUnsignedShort(); + MCAPI class Bedrock::Result getUnsignedShort(); /** - * @symbol ?getUnsignedVarInt\@ReadOnlyBinaryStream\@\@QEAAIXZ + * @symbol ?getUnsignedVarInt\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@IVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI unsigned int getUnsignedVarInt(); + MCAPI class Bedrock::Result getUnsignedVarInt(); /** - * @symbol ?getUnsignedVarInt64\@ReadOnlyBinaryStream\@\@QEAA_KXZ + * @symbol ?getUnsignedVarInt64\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@_KVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI unsigned __int64 getUnsignedVarInt64(); + MCAPI class Bedrock::Result getUnsignedVarInt64(); /** - * @symbol ?getVarInt\@ReadOnlyBinaryStream\@\@QEAAHXZ + * @symbol ?getVarInt\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@HVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI int getVarInt(); + MCAPI class Bedrock::Result getVarInt(); /** - * @symbol ?getVarInt64\@ReadOnlyBinaryStream\@\@QEAA_JXZ + * @symbol ?getVarInt64\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@_JVerror_code\@std\@\@\@Bedrock\@\@XZ */ - MCAPI __int64 getVarInt64(); + MCAPI class Bedrock::Result<__int64, class std::error_code> getVarInt64(); /** * @symbol ?hasOverflowed\@ReadOnlyBinaryStream\@\@QEBA_NXZ */ MCAPI bool hasOverflowed() const; + /** + * @symbol ?readVectorList\@ReadOnlyBinaryStream\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@\@Z + */ + MCAPI class Bedrock::Result readVectorList(std::vector &); }; diff --git a/LiteLoader/include/llapi/mc/RealmsStoriesData.hpp b/LiteLoader/include/llapi/mc/RealmsStoriesData.hpp new file mode 100644 index 0000000000..e5061fdc7b --- /dev/null +++ b/LiteLoader/include/llapi/mc/RealmsStoriesData.hpp @@ -0,0 +1,56 @@ +/** + * @file RealmsStoriesData.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RealmsStoriesData { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REALMSSTORIESDATA +public: + class RealmsStoriesData& operator=(class RealmsStoriesData const &) = delete; + RealmsStoriesData(class RealmsStoriesData const &) = delete; + RealmsStoriesData() = delete; +#endif + +public: + /** + * @symbol ??0RealmsStoriesData\@\@QEAA\@AEAVLevelStorage\@\@\@Z + */ + MCAPI RealmsStoriesData(class LevelStorage &); + /** + * @symbol ?didRealmsEventAlreadyHappen\@RealmsStoriesData\@\@QEBA_NW4RealmsEventId\@\@\@Z + */ + MCAPI bool didRealmsEventAlreadyHappen(enum class RealmsEventId) const; + /** + * @symbol ?getRealmsEventInternalName\@RealmsStoriesData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4RealmsEventId\@\@\@Z + */ + MCAPI std::string const & getRealmsEventInternalName(enum class RealmsEventId) const; + /** + * @symbol ?setRealmsEventHappenedAndSave\@RealmsStoriesData\@\@QEAAXW4RealmsEventId\@\@\@Z + */ + MCAPI void setRealmsEventHappenedAndSave(enum class RealmsEventId); + /** + * @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; + +//private: + +private: + /** + * @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 class std::map, class std::allocator>> const mRealmsEventInternalNames; + +}; diff --git a/LiteLoader/include/llapi/mc/RealmsStoriesGameplayEventListener.hpp b/LiteLoader/include/llapi/mc/RealmsStoriesGameplayEventListener.hpp new file mode 100644 index 0000000000..85dbbfb455 --- /dev/null +++ b/LiteLoader/include/llapi/mc/RealmsStoriesGameplayEventListener.hpp @@ -0,0 +1,222 @@ +/** + * @file RealmsStoriesGameplayEventListener.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RealmsStoriesGameplayEventListener { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REALMSSTORIESGAMEPLAYEVENTLISTENER +public: + class RealmsStoriesGameplayEventListener& operator=(class RealmsStoriesGameplayEventListener const &) = delete; + RealmsStoriesGameplayEventListener(class RealmsStoriesGameplayEventListener const &) = delete; + RealmsStoriesGameplayEventListener() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?onEvent\@ScriptActorEventListener\@ScriptModuleMinecraft\@\@UEAA?AW4EventResult\@\@AEBUActorRemoveEffectEvent\@\@\@Z + */ + virtual enum class EventResult onEvent(struct ActorRemoveEffectEvent const &); + /** + * @vftbl 2 + * @symbol ?onEvent\@?$EventListenerDispatcher\@VActorEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z + */ + virtual enum class EventResult onEvent(struct ActorNotificationEvent const &); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol __unk_vfn_4 + */ + virtual void __unk_vfn_4(); + /** + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 + * @symbol __unk_vfn_6 + */ + virtual void __unk_vfn_6(); + /** + * @vftbl 7 + * @symbol __unk_vfn_7 + */ + virtual void __unk_vfn_7(); + /** + * @vftbl 8 + * @symbol __unk_vfn_8 + */ + virtual void __unk_vfn_8(); + /** + * @vftbl 9 + * @symbol __unk_vfn_9 + */ + virtual void __unk_vfn_9(); + /** + * @vftbl 10 + * @symbol __unk_vfn_10 + */ + virtual void __unk_vfn_10(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 12 + * @symbol __unk_vfn_12 + */ + virtual void __unk_vfn_12(); + /** + * @vftbl 13 + * @symbol __unk_vfn_13 + */ + virtual void __unk_vfn_13(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 15 + * @symbol __unk_vfn_15 + */ + virtual void __unk_vfn_15(); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 17 + * @symbol __unk_vfn_17 + */ + virtual void __unk_vfn_17(); + /** + * @vftbl 18 + * @symbol __unk_vfn_18 + */ + virtual void __unk_vfn_18(); + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + virtual void __unk_vfn_19(); + /** + * @vftbl 20 + * @symbol __unk_vfn_20 + */ + virtual void __unk_vfn_20(); + /** + * @vftbl 21 + * @symbol __unk_vfn_21 + */ + virtual void __unk_vfn_21(); + /** + * @vftbl 22 + * @symbol __unk_vfn_22 + */ + virtual void __unk_vfn_22(); + /** + * @vftbl 23 + * @symbol __unk_vfn_23 + */ + virtual void __unk_vfn_23(); + /** + * @vftbl 24 + * @symbol __unk_vfn_24 + */ + virtual void __unk_vfn_24(); + /** + * @vftbl 25 + * @symbol __unk_vfn_25 + */ + virtual void __unk_vfn_25(); + /** + * @vftbl 26 + * @symbol __unk_vfn_26 + */ + virtual void __unk_vfn_26(); + /** + * @vftbl 27 + * @symbol __unk_vfn_27 + */ + virtual void __unk_vfn_27(); + /** + * @vftbl 28 + * @symbol __unk_vfn_28 + */ + virtual void __unk_vfn_28(); + /** + * @vftbl 29 + * @symbol __unk_vfn_29 + */ + virtual void __unk_vfn_29(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); + /** + * @vftbl 31 + * @symbol __unk_vfn_31 + */ + virtual void __unk_vfn_31(); + /** + * @vftbl 32 + * @symbol __unk_vfn_32 + */ + virtual void __unk_vfn_32(); + /** + * @vftbl 33 + * @symbol __unk_vfn_33 + */ + virtual void __unk_vfn_33(); + /** + * @vftbl 34 + * @symbol __unk_vfn_34 + */ + virtual void __unk_vfn_34(); + /** + * @vftbl 35 + * @symbol __unk_vfn_35 + */ + virtual void __unk_vfn_35(); + /** + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 + * @symbol ?onEvent\@RealmsStoriesGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEBUActorAcquiredItemEvent\@\@\@Z + */ + virtual enum class EventResult onEvent(struct ActorAcquiredItemEvent const &); + /** + * @symbol ??0RealmsStoriesGameplayEventListener\@\@QEAA\@AEAVLevelStorage\@\@\@Z + */ + MCAPI RealmsStoriesGameplayEventListener(class LevelStorage &); + +}; diff --git a/LiteLoader/include/llapi/mc/Recipe.hpp b/LiteLoader/include/llapi/mc/Recipe.hpp index b7af3a5775..199e5de969 100644 --- a/LiteLoader/include/llapi/mc/Recipe.hpp +++ b/LiteLoader/include/llapi/mc/Recipe.hpp @@ -41,7 +41,7 @@ class Recipe { virtual std::vector const & assemble(class CraftingContainer &, class CraftingContext &) const = 0; /** * @vftbl 2 - * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ + * @symbol ?getCraftingSize\@DecoratedPotRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const = 0; /** @@ -66,7 +66,7 @@ class Recipe { virtual bool matches(class CraftingContainer const &, class CraftingContext const &) const = 0; /** * @vftbl 7 - * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ + * @symbol ?size\@DecoratedPotRecipe\@\@UEBAHXZ */ virtual int size() const = 0; /** @@ -162,9 +162,9 @@ class Recipe { //protected: /** - * @symbol ??0Recipe\@\@IEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@VHashedString\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z + * @symbol ??0Recipe\@\@IEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@VHashedString\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@VSemVersion\@\@\@Z */ - MCAPI Recipe(class std::basic_string_view>, class HashedString, std::vector const &, class std::optional); + MCAPI Recipe(class std::basic_string_view>, class HashedString, std::vector const &, class std::optional, class SemVersion); protected: diff --git a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp index 05d147ac00..3740cf738e 100644 --- a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp +++ b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp @@ -50,9 +50,9 @@ class RecipeIngredient : public ItemDescriptorCount { */ MCAPI RecipeIngredient(class ItemDescriptor const &, unsigned short); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z */ - MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short); + MCAPI RecipeIngredient(class Block const &, unsigned short); /** * @symbol ??0RecipeIngredient\@\@QEAA\@AEBV0\@\@Z */ @@ -70,9 +70,9 @@ class RecipeIngredient : public ItemDescriptorCount { */ MCAPI RecipeIngredient(class ReadOnlyBinaryStream &); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z */ - MCAPI RecipeIngredient(class Block const &, unsigned short); + MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short); /** * @symbol ??0RecipeIngredient\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp index 6597a13a50..26fe2cce80 100644 --- a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp +++ b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp @@ -39,14 +39,14 @@ class RecipeUnlockingRequirement { * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z */ MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext); - /** - * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@XZ - */ - MCAPI RecipeUnlockingRequirement(); /** * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@V?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z */ MCAPI RecipeUnlockingRequirement(std::vector); + /** + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@XZ + */ + MCAPI RecipeUnlockingRequirement(); /** * @symbol ?canBeUnlockedByContext\@RecipeUnlockingRequirement\@\@QEBA_NW4UnlockingContext\@1\@\@Z */ @@ -56,13 +56,9 @@ class RecipeUnlockingRequirement { */ MCAPI bool canBeUnlockedByIngredient(class RecipeIngredient const &) const; /** - * @symbol ?isUnlockedByIngredients\@RecipeUnlockingRequirement\@\@QEBA_NXZ - */ - MCAPI bool isUnlockedByIngredients() const; - /** - * @symbol ?isValid\@RecipeUnlockingRequirement\@\@QEBA_NXZ + * @symbol ?isUnlockable\@RecipeUnlockingRequirement\@\@QEBA_NXZ */ - MCAPI bool isValid() const; + MCAPI bool isUnlockable() const; /** * @symbol ??1RecipeUnlockingRequirement\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp b/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp index dcf41c4b1c..f8995bd404 100644 --- a/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp +++ b/LiteLoader/include/llapi/mc/RecipeUnlockingSystem.hpp @@ -29,12 +29,12 @@ class RecipeUnlockingSystem { * @symbol ?createSystem\@RecipeUnlockingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - -//protected: /** - * @symbol ?_hasRecipesLeftToUnlock\@RecipeUnlockingSystem\@\@KA_NAEBVRecipes\@\@AEBVUnlockedRecipesServerComponent\@\@\@Z + * @symbol ?isEnabled\@RecipeUnlockingSystem\@\@SA_NAEBVLevel\@\@\@Z */ - MCAPI static bool _hasRecipesLeftToUnlock(class Recipes const &, class UnlockedRecipesServerComponent const &); + MCAPI static bool isEnabled(class Level const &); + +//protected: /** * @symbol ?_unlockRecipes\@RecipeUnlockingSystem\@\@KA?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\@\@AEAVUnlockedRecipesServerComponent\@\@AEBVRecipes\@\@_NAEBV?$optional\@UInventoryChangedData\@RecipeUnlockingSystem\@\@\@3\@\@Z */ @@ -57,10 +57,6 @@ class RecipeUnlockingSystem { * @symbol ?_handleInstructionUnlocks\@RecipeUnlockingSystem\@\@CAXPEAVServerPlayer\@\@AEAVUnlockedRecipesServerComponent\@\@\@Z */ MCAPI static void _handleInstructionUnlocks(class ServerPlayer *, class UnlockedRecipesServerComponent &); - /** - * @symbol ?_tick\@RecipeUnlockingSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@VUnlockedRecipesServerComponent\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tick(class ViewT>, class UnlockedRecipesServerComponent, class ActorOwnerComponent>); protected: diff --git a/LiteLoader/include/llapi/mc/Recipes.hpp b/LiteLoader/include/llapi/mc/Recipes.hpp index 37deb1729f..c4bd24a6d1 100644 --- a/LiteLoader/include/llapi/mc/Recipes.hpp +++ b/LiteLoader/include/llapi/mc/Recipes.hpp @@ -6,6 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" +#include "RecipeUnlockingRequirement.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -83,33 +84,33 @@ struct NormalizedRectangularRecipeResults { */ MCAPI void addFurnaceRecipeAuxData(class ItemInstance const &, class ItemInstance const &, std::vector const &); /** - * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@22AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@AEBVSemVersion\@\@\@Z */ - MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::vector const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); + MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &)>, class std::optional, class SemVersion const &); /** - * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@AEBVSemVersion\@\@\@Z */ - MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); + MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &)>, class std::optional, class SemVersion const &); /** - * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@22AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@AEBVSemVersion\@\@\@Z */ - MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); + MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::vector const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &)>, class std::optional, class SemVersion const &); /** - * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@3\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@3\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@AEBVSemVersion\@\@\@Z */ - MCAPI void addShapedRecipe(std::string, std::vector const &, std::vector const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); + MCAPI void addShapedRecipe(std::string, std::vector const &, std::vector const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &)>, class std::optional, class SemVersion const &); /** - * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@2AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@2AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@AEBVSemVersion\@\@\@Z */ - MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); + MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &)>, class std::optional, class SemVersion const &); /** - * @symbol ?addShapelessRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapelessRecipe\@\@U?$default_delete\@VShapelessRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + * @symbol ?addShapelessRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapelessRecipe\@\@U?$default_delete\@VShapelessRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@AEBVSemVersion\@\@\@Z */ - MCAPI void addShapelessRecipe(std::string, class ItemInstance const &, std::vector const &, std::vector const &, int, class std::function (std::string, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); + MCAPI void addShapelessRecipe(std::string, class ItemInstance const &, std::vector const &, std::vector const &, int, class std::function (std::string, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &)>, class std::optional, class SemVersion const &); /** - * @symbol ?addShulkerBoxRecipe\@Recipes\@\@QEAAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z + * @symbol ?addShulkerBoxRecipe\@Recipes\@\@QEAAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@AEBVSemVersion\@\@\@Z */ - MCAPI void addShulkerBoxRecipe(std::string &, class ItemInstance const &, std::vector const &, std::vector const &, class std::optional); + MCAPI void addShulkerBoxRecipe(std::string &, class ItemInstance const &, std::vector const &, std::vector const &, class std::optional, class SemVersion const &); /** * @symbol ?clearRecipes\@Recipes\@\@QEAAXXZ */ @@ -119,13 +120,17 @@ struct NormalizedRectangularRecipeResults { */ MCAPI struct std::pair extractRecipeObjInfo(class Json::Value const &); /** - * @symbol ?forEachRecipeFor\@Recipes\@\@QEBAXAEBVHashedString\@\@AEBV?$function\@$$A6AXAEBVRecipe\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachUnlockableRecipe\@Recipes\@\@QEBAXAEBV?$function\@$$A6AXAEBVRecipe\@\@\@Z\@std\@\@\@Z */ - MCAPI void forEachRecipeFor(class HashedString const &, class std::function const &) const; + MCAPI void forEachUnlockableRecipe(class std::function const &) const; /** * @symbol ?getFurnaceRecipeResult\@Recipes\@\@QEBA?AVItemInstance\@\@AEBVItemStackBase\@\@AEBVHashedString\@\@\@Z */ MCAPI class ItemInstance getFurnaceRecipeResult(class ItemStackBase const &, class HashedString const &) const; + /** + * @symbol ?getNumberOfUnlockableRecipes\@Recipes\@\@QEBAIXZ + */ + MCAPI unsigned int getNumberOfUnlockableRecipes() const; /** * @symbol ?getRecipeByNetId\@Recipes\@\@QEBAPEBVRecipe\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ @@ -143,15 +148,19 @@ struct NormalizedRectangularRecipeResults { */ MCAPI void init(class ResourcePackManager &, class ExternalRecipeStore &, class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?loadRecipe\@Recipes\@\@QEAA_NAEBU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@AEBVSemVersion\@\@\@Z + * @symbol ?loadRecipe\@Recipes\@\@QEAA_NAEBU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@AEBVSemVersion\@\@1_N\@Z */ - MCAPI bool loadRecipe(struct std::pair const &, class SemVersion const &); + MCAPI bool loadRecipe(struct std::pair const &, class SemVersion const &, class SemVersion const &, bool); /** * @symbol ??1Recipes\@\@QEAA\@XZ */ MCAPI ~Recipes(); //protected: + /** + * @symbol ?_createUnlockingRequirementFromContext\@Recipes\@\@IEBA?AV?$optional\@VRecipeUnlockingRequirement\@\@\@std\@\@W4UnlockingContext\@RecipeUnlockingRequirement\@\@\@Z + */ + MCAPI class std::optional _createUnlockingRequirementFromContext(enum class RecipeUnlockingRequirement::UnlockingContext) const; /** * @symbol ?_loadDataDrivenRecipes\@Recipes\@\@IEAAXAEBV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@std\@\@\@Z */ @@ -160,6 +169,10 @@ struct NormalizedRectangularRecipeResults { * @symbol ?_loadUnlockingRequirementFromJson\@Recipes\@\@IEBA?AV?$optional\@VRecipeUnlockingRequirement\@\@\@std\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI class std::optional _loadUnlockingRequirementFromJson(class Json::Value const &, class SemVersion const &, std::string const &) const; + /** + * @symbol ?extractRecipeFormatVersion\@Recipes\@\@IEAA?AVSemVersion\@\@AEBVValue\@Json\@\@\@Z + */ + MCAPI class SemVersion extractRecipeFormatVersion(class Json::Value const &); /** * @symbol ?_normalizeRectangularRecipe\@Recipes\@\@KA?AUNormalizedRectangularRecipeResults\@1\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RecordItem.hpp b/LiteLoader/include/llapi/mc/RecordItem.hpp index 30b0050716..7036324822 100644 --- a/LiteLoader/include/llapi/mc/RecordItem.hpp +++ b/LiteLoader/include/llapi/mc/RecordItem.hpp @@ -6,7 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "Item.hpp" +#include "ComponentItem.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +17,7 @@ * @brief MC class RecordItem. * */ -class RecordItem : public Item { +class RecordItem : public ComponentItem { #define AFTER_EXTRA // Add Member There @@ -37,10 +37,10 @@ class RecordItem : public Item { */ virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol ?isMusicDisk\@RecordItem\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?setDescriptionId\@RecordItem\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - virtual bool isMusicDisk() const; + virtual class RecordItem & setDescriptionId(std::string const &); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -57,10 +57,10 @@ class RecordItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -71,11 +71,6 @@ class RecordItem : public Item { * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); - /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@RecordItem\@\@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; /** * @vftbl 66 * @symbol __unk_vfn_66 @@ -127,16 +122,18 @@ class RecordItem : public Item { */ virtual void __unk_vfn_116(); /** - * @symbol ??0RecordItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4LevelSoundEvent\@\@\@Z + * @vftbl 119 + * @symbol ?setIconInfo\@RecordItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ - MCAPI RecordItem(std::string const &, int, enum class LevelSoundEvent); + virtual class Item & setIconInfo(std::string const &, int); /** - * @symbol ?getDuration\@RecordItem\@\@QEBAMXZ + * @vftbl 120 + * @symbol ?getIconInfo\@RecordItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ - MCAPI float getDuration() const; + virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @symbol ?getSound\@RecordItem\@\@QEBA?AW4LevelSoundEvent\@\@XZ + * @symbol ??0RecordItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4LevelSoundEvent\@\@\@Z */ - MCAPI enum class LevelSoundEvent getSound() const; + MCAPI RecordItem(std::string const &, int, enum class LevelSoundEvent); }; diff --git a/LiteLoader/include/llapi/mc/RecordItemComponent.hpp b/LiteLoader/include/llapi/mc/RecordItemComponent.hpp index 837ac29340..573b43351b 100644 --- a/LiteLoader/include/llapi/mc/RecordItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RecordItemComponent.hpp @@ -59,6 +59,10 @@ class RecordItemComponent { * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRecordItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @symbol ??0RecordItemComponent\@\@QEAA\@PEAVComponentItem\@\@W4LevelSoundEvent\@\@MH\@Z + */ + MCAPI RecordItemComponent(class ComponentItem *, enum class LevelSoundEvent, float, int); /** * @symbol ?appendFormattedHovertext\@RecordItemComponent\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp b/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp index f4604e1849..a33c7eeaa3 100644 --- a/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp @@ -50,10 +50,10 @@ class RecoveryCompassItem : public AbstractCompassItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp index 057a1a22c3..4df1a7041d 100644 --- a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp @@ -52,10 +52,10 @@ class RedStoneDustItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,7 +117,7 @@ class RedStoneDustItem : public Item { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@RedStoneDustItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp index 313a7f1fd3..eeaf052619 100644 --- a/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp @@ -36,20 +36,10 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RedStoneOreBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RedStoneOreBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RedStoneOreBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,56 +115,66 @@ class RedStoneOreBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@RedStoneOreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@RedStoneOreBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,92 +186,97 @@ class RedStoneOreBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 150 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 148 * @symbol ?animateTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onStandOn\@RedStoneOreBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@RedStoneOreBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@RedStoneOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?_lightUpBlock\@RedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void _lightUpBlock(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp index 01b50ab2c6..58fdd75e3e 100644 --- a/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp @@ -36,25 +36,15 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@RedStoneWireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class RedStoneWireBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class RedStoneWireBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class RedStoneWireBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,75 +121,85 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@RedStoneWireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -216,97 +211,102 @@ class RedStoneWireBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 134 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 135 * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@RedStoneWireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/RedstoneBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp index b5cd60f8eb..99ab3cb6f3 100644 --- a/LiteLoader/include/llapi/mc/RedstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp @@ -36,20 +36,10 @@ class RedstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RedstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RedstoneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RedstoneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RedstoneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,56 +115,66 @@ class RedstoneBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@RedstoneBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@RedstoneBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@RedstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,65 +186,70 @@ class RedstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@RedstoneBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0RedstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp index af31e37bda..f5662170c2 100644 --- a/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp @@ -36,20 +36,10 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RedstoneLampBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RedstoneLampBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RedstoneLampBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +116,70 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@RedstoneLampBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,72 +191,77 @@ class RedstoneLampBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp index 7b3912fae9..6026af7149 100644 --- a/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp @@ -36,20 +36,10 @@ class RedstoneTorchBlock : public TorchBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RedstoneTorchBlock : public TorchBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RedstoneTorchBlock : public TorchBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RedstoneTorchBlock : public TorchBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RedstoneTorchBlock : public TorchBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,71 +115,81 @@ class RedstoneTorchBlock : public TorchBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@RedstoneTorchBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@RedstoneTorchBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@RedstoneTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,87 +201,92 @@ class RedstoneTorchBlock : public TorchBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@RedstoneTorchBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@RedstoneTorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getTickDelay\@RedstoneTorchBlock\@\@UEAAHXZ */ virtual int getTickDelay(); diff --git a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp index 999db431cc..46a8beaca2 100644 --- a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp @@ -34,20 +34,10 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -59,10 +49,10 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -73,11 +63,6 @@ class ReinforcedDeepslateBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -98,6 +83,11 @@ class ReinforcedDeepslateBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -108,11 +98,6 @@ class ReinforcedDeepslateBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -128,46 +113,56 @@ class ReinforcedDeepslateBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 - * @symbol ?canBeOriginalSurface\@ReinforcedDeepslateBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_51 */ - virtual bool canBeOriginalSurface() const; + virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 54 + * @symbol ?canBeOriginalSurface\@ReinforcedDeepslateBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool canBeOriginalSurface() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -179,55 +174,60 @@ class ReinforcedDeepslateBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REINFORCEDDEEPSLATEBLOCK /** * @symbol ?canBeSilkTouched\@ReinforcedDeepslateBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/RelativeFloat.hpp b/LiteLoader/include/llapi/mc/RelativeFloat.hpp index ca659cfacf..e4ecf1552e 100644 --- a/LiteLoader/include/llapi/mc/RelativeFloat.hpp +++ b/LiteLoader/include/llapi/mc/RelativeFloat.hpp @@ -53,5 +53,9 @@ class RelativeFloat { * @symbol ?getValue\@RelativeFloat\@\@QEBAMM\@Z */ MCAPI float getValue(float) const; + /** + * @symbol ?isRelative\@RelativeFloat\@\@QEBA_NXZ + */ + MCAPI bool isRelative() const; }; diff --git a/LiteLoader/include/llapi/mc/ReloadCommand.hpp b/LiteLoader/include/llapi/mc/ReloadCommand.hpp index 6e15137337..4a3d8afe8f 100644 --- a/LiteLoader/include/llapi/mc/ReloadCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReloadCommand.hpp @@ -36,7 +36,7 @@ class ReloadCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ReloadCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ReloadConfigCommand.hpp b/LiteLoader/include/llapi/mc/ReloadConfigCommand.hpp new file mode 100644 index 0000000000..a919210e7f --- /dev/null +++ b/LiteLoader/include/llapi/mc/ReloadConfigCommand.hpp @@ -0,0 +1,51 @@ +/** + * @file ReloadConfigCommand.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Command.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ReloadConfigCommand : public Command { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RELOADCONFIGCOMMAND +public: + class ReloadConfigCommand& operator=(class ReloadConfigCommand const &) = delete; + ReloadConfigCommand(class ReloadConfigCommand const &) = delete; + ReloadConfigCommand() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?execute\@ReloadConfigCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + virtual void execute(class CommandOrigin const &, class CommandOutput &) const; + /** + * @symbol ?setup\@ReloadConfigCommand\@\@SAXAEAVCommandRegistry\@\@AEAUScriptSettings\@\@\@Z + */ + MCAPI static void setup(class CommandRegistry &, struct ScriptSettings &); + +//private: + +private: + /** + * @symbol ?sScriptSettings\@ReloadConfigCommand\@\@0PEAUScriptSettings\@\@EA + */ + MCAPI static struct ScriptSettings * sScriptSettings; + +}; diff --git a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp index 939722d65a..4f1c9c560f 100644 --- a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class RemoveActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RemoveActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RemoveActorPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEACTORPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp index 4d69a3d8d1..6b278adf4b 100644 --- a/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp @@ -5,7 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Packet.hpp" +#include "Bedrock.hpp" +#include "EntityServerPacket.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -16,7 +17,7 @@ * @brief MC class RemoveEntityPacket. * */ -class RemoveEntityPacket : public Packet { +class RemoveEntityPacket : public EntityServerPacket { #define AFTER_EXTRA // Add Member There diff --git a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp index c504c35626..08640a2c64 100644 --- a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class RemoveObjectivePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RemoveObjectivePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RemoveObjectivePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEOBJECTIVEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp b/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp index 82a6268826..94d1d5226b 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp @@ -31,5 +31,9 @@ struct RemovePassengersComponent { * @symbol ??4RemovePassengersComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct RemovePassengersComponent & operator=(struct RemovePassengersComponent &&); + /** + * @symbol ??1RemovePassengersComponent\@\@QEAA\@XZ + */ + MCAPI ~RemovePassengersComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp b/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp index 59e1bc43a4..fc422dae4b 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp @@ -10,30 +10,19 @@ #undef BEFORE_EXTRA -/** - * @brief MC class RemovePassengersSystemImpl. - * - */ -class RemovePassengersSystemImpl { + +namespace RemovePassengersSystemImpl { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_REMOVEPASSENGERSSYSTEMIMPL -public: - class RemovePassengersSystemImpl& operator=(class RemovePassengersSystemImpl const &) = delete; - RemovePassengersSystemImpl(class RemovePassengersSystemImpl const &) = delete; - RemovePassengersSystemImpl() = delete; -#endif - -public: /** - * @symbol ?_removePassengersSystem\@RemovePassengersSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEAURemovePassengersComponent\@\@AEAUVehicleComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z + * @symbol ?removePassengersSystem\@RemovePassengersSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEAURemovePassengersComponent\@\@AEAUVehicleComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z */ - MCAPI static void _removePassengersSystem(class StrictEntityContext &, struct RemovePassengersComponent &, struct VehicleComponent &, class EntityModifierT, class FlagComponent>); + MCAPI void removePassengersSystem(class StrictEntityContext const &, struct RemovePassengersComponent &, struct VehicleComponent &, class EntityModifierT, class FlagComponent>); /** - * @symbol ?removePassengersSystem\@RemovePassengersSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@URemovePassengersComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z + * @symbol ?singleTickRemovePassenger\@RemovePassengersSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBURemovePassengersComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z */ - MCAPI static void removePassengersSystem(class ViewT, class EntityModifierT, class FlagComponent>); + MCAPI void singleTickRemovePassenger(class StrictEntityContext const &, struct PassengerComponent const &, class ViewT, class EntityModifierT, class FlagComponent>); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp b/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp index 874947d866..7cf0c6950d 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp @@ -36,12 +36,4 @@ class RemovePassengersWithoutSeatSystem { */ MCAPI static void removePassengersWithoutSeat(class StrictEntityContext &, class RideableComponent const &, struct VehicleComponent &, class EntityModifierT> &); -//private: - /** - * @symbol ?_tickRemovePassengersWithoutSeat\@RemovePassengersWithoutSeatSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBVRideableComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void _tickRemovePassengersWithoutSeat(class ViewT>, class RideableComponent const, struct VehicleComponent>, class EntityModifierT>); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp index cd250b0c0a..24ab734fcf 100644 --- a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class RemoveVolumeEntityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RemoveVolumeEntityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RemoveVolumeEntityPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEVOLUMEENTITYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RenderParams.hpp b/LiteLoader/include/llapi/mc/RenderParams.hpp index c175cd4b7e..761bb2b953 100644 --- a/LiteLoader/include/llapi/mc/RenderParams.hpp +++ b/LiteLoader/include/llapi/mc/RenderParams.hpp @@ -27,14 +27,14 @@ class RenderParams { #endif public: - /** - * @symbol ??0RenderParams\@\@QEAA\@XZ - */ - MCAPI RenderParams(); /** * @symbol ??0RenderParams\@\@QEAA\@AEBV0\@\@Z */ MCAPI RenderParams(class RenderParams const &); + /** + * @symbol ??0RenderParams\@\@QEAA\@XZ + */ + MCAPI RenderParams(); /** * @symbol ??0RenderParams\@\@QEAA\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RenderingRidingOffsetSystem.hpp b/LiteLoader/include/llapi/mc/RenderingRidingOffsetSystem.hpp new file mode 100644 index 0000000000..bd2c7520d3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/RenderingRidingOffsetSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file RenderingRidingOffsetSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RenderingRidingOffsetSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RENDERINGRIDINGOFFSETSYSTEM +public: + class RenderingRidingOffsetSystem& operator=(class RenderingRidingOffsetSystem const &) = delete; + RenderingRidingOffsetSystem(class RenderingRidingOffsetSystem const &) = delete; + RenderingRidingOffsetSystem() = delete; +#endif + +public: + /** + * @symbol ?getInterpolatedRenderingRidingOffset\@RenderingRidingOffsetSystem\@\@SA?AVVec3\@\@PEBUPassengerRenderingRidingOffsetComponent\@\@M\@Z + */ + MCAPI static class Vec3 getInterpolatedRenderingRidingOffset(struct PassengerRenderingRidingOffsetComponent const *, float); + +}; diff --git a/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp b/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp index 959798d190..f09303cd05 100644 --- a/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp @@ -60,9 +60,9 @@ class RepairableItemComponent { */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?handleItemRepair\@RepairableItemComponent\@\@QEAA?AURepairItemResult\@\@AEAVItemStack\@\@0_N\@Z + * @symbol ?handleItemRepair\@RepairableItemComponent\@\@QEBA?AURepairItemResult\@\@AEAVItemStack\@\@0_N\@Z */ - MCAPI struct RepairItemResult handleItemRepair(class ItemStack &, class ItemStack &, bool); + MCAPI struct RepairItemResult handleItemRepair(class ItemStack &, class ItemStack &, bool) const; /** * @symbol ?isValidRepairItem\@RepairableItemComponent\@\@QEBA_NAEBVItemStackBase\@\@\@Z */ @@ -86,9 +86,9 @@ class RepairableItemComponent { */ MCAPI struct RepairItemEntry const * _getRepairItemEntry(class ItemStackBase const &) const; /** - * @symbol ?_repairItem\@RepairableItemComponent\@\@AEAAHAEAVItemStackBase\@\@0VExpressionNode\@\@\@Z + * @symbol ?_repairItem\@RepairableItemComponent\@\@AEBAHAEAVItemStackBase\@\@0VExpressionNode\@\@\@Z */ - MCAPI int _repairItem(class ItemStackBase &, class ItemStackBase &, class ExpressionNode); + MCAPI int _repairItem(class ItemStackBase &, class ItemStackBase &, class ExpressionNode) const; private: diff --git a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp index 27d7fd2706..5d81bb5755 100644 --- a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp +++ b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp @@ -36,20 +36,10 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RepeaterBlock : public DiodeBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RepeaterBlock : public DiodeBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RepeaterBlock : public DiodeBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,65 +116,75 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,112 +196,117 @@ class RepeaterBlock : public DiodeBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 150 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 148 * @symbol ?animateTick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@RepeaterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?isLocked\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 201 + * @vftbl 199 * @symbol ?isAlternateInput\@RepeaterBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 205 + * @vftbl 203 * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const; /** - * @vftbl 206 + * @vftbl 204 * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const; /** - * @vftbl 207 + * @vftbl 205 * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const; diff --git a/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp index a26b5ee015..6541c4a74d 100644 --- a/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp @@ -37,7 +37,7 @@ class ReplaceItemCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ReplaceItemCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp index 9d6a2a5f8a..5a0eefcc75 100644 --- a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,23 +50,23 @@ class RequestAbilityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestAbilityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestAbilityPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REQUESTABILITYPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~RequestAbilityPacket(); #endif - /** - * @symbol ??0RequestAbilityPacket\@\@QEAA\@W4AbilitiesIndex\@\@_N\@Z - */ - MCAPI RequestAbilityPacket(enum class AbilitiesIndex, bool); /** * @symbol ??0RequestAbilityPacket\@\@QEAA\@XZ */ MCAPI RequestAbilityPacket(); + /** + * @symbol ??0RequestAbilityPacket\@\@QEAA\@W4AbilitiesIndex\@\@_N\@Z + */ + MCAPI RequestAbilityPacket(enum class AbilitiesIndex, bool); /** * @symbol ?getAbility\@RequestAbilityPacket\@\@QEBA?AW4AbilitiesIndex\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp index 07f2e4ab22..a233ff3d8a 100644 --- a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class RequestChunkRadiusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestChunkRadiusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestChunkRadiusPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0RequestChunkRadiusPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp index 766d587a37..61880630a4 100644 --- a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class RequestNetworkSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestNetworkSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestNetworkSettingsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0RequestNetworkSettingsPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp index a4410bb195..1c7ada80e4 100644 --- a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class RequestPermissionsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RequestPermissionsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RequestPermissionsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0RequestPermissionsPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp b/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp index 59af6e4508..ba04b582e7 100644 --- a/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp @@ -31,9 +31,5 @@ class ResetActionStopSystem { * @symbol ?createResetActionStopSystem\@ResetActionStopSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetActionStopSystem(); - /** - * @symbol ?tickResetActionStopSystem\@ResetActionStopSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@UActionOrStopComponent\@\@\@\@\@Z - */ - MCAPI static void tickResetActionStopSystem(class ViewT, class FlagComponent>, struct ActionOrStopComponent>); }; diff --git a/LiteLoader/include/llapi/mc/ResetSlideOffSetSystemImpl.hpp b/LiteLoader/include/llapi/mc/ResetSlideOffSetSystemImpl.hpp new file mode 100644 index 0000000000..61a7fdeb2f --- /dev/null +++ b/LiteLoader/include/llapi/mc/ResetSlideOffSetSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file ResetSlideOffSetSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ResetSlideOffSetSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doResetSlideOffSetSystem\@ResetSlideOffSetSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEAUSlideOffsetComponent\@\@\@Z + */ + MCAPI void doResetSlideOffSetSystem(class StrictEntityContext &, struct MoveRequestComponent const &, struct SlideOffsetComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp b/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp index bddcf887a2..05e6f228d1 100644 --- a/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp +++ b/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp @@ -26,22 +26,22 @@ struct ResolvedItemIconInfo { #endif public: - /** - * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@IH\@Z - */ - MCAPI ResolvedItemIconInfo(unsigned int, int); /** * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemIconInfoType\@\@\@Z */ MCAPI ResolvedItemIconInfo(std::string const &, int, enum class ItemIconInfoType); - /** - * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@XZ - */ - MCAPI ResolvedItemIconInfo(); /** * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMGG\@Z */ MCAPI ResolvedItemIconInfo(std::string const &, float, float, float, float, unsigned short, unsigned short); + /** + * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@IH\@Z + */ + MCAPI ResolvedItemIconInfo(unsigned int, int); + /** + * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@XZ + */ + MCAPI ResolvedItemIconInfo(); /** * @symbol ??1ResolvedItemIconInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourceInformation.hpp b/LiteLoader/include/llapi/mc/ResourceInformation.hpp index fc5649f829..7a38560424 100644 --- a/LiteLoader/include/llapi/mc/ResourceInformation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceInformation.hpp @@ -30,6 +30,10 @@ enum class ResourceType; #endif public: + /** + * @symbol ??0ResourceInformation\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ResourceInformation(class ResourceInformation const &); /** * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@W4ResourceType\@0\@00\@Z */ @@ -38,10 +42,6 @@ enum class ResourceType; * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@000\@Z */ MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, std::string const &, std::string const &, std::string const &); - /** - * @symbol ??0ResourceInformation\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ResourceInformation(class ResourceInformation const &); /** * @symbol ?satisfies\@ResourceInformation\@\@QEBA_NAEBUPackIdVersion\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ResourceLocation.hpp b/LiteLoader/include/llapi/mc/ResourceLocation.hpp index 65665f4b0d..719c575f78 100644 --- a/LiteLoader/include/llapi/mc/ResourceLocation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLocation.hpp @@ -34,14 +34,14 @@ class ResourceLocation { * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@W4ResourceFileSystem\@\@\@Z */ MCAPI ResourceLocation(class Core::Path const &, enum class ResourceFileSystem); - /** - * @symbol ??0ResourceLocation\@\@QEAA\@XZ - */ - MCAPI ResourceLocation(); /** * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ MCAPI ResourceLocation(class Core::Path const &); + /** + * @symbol ??0ResourceLocation\@\@QEAA\@XZ + */ + MCAPI ResourceLocation(); /** * @symbol ?getFullPath\@ResourceLocation\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp index 6c61649a6d..a5ddbaaf53 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ResourcePackChunkDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackChunkDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackChunkDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKCHUNKDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp index da88b91d11..b9f80c3eed 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ResourcePackChunkRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackChunkRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackChunkRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ResourcePackChunkRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp index b9478a06d0..f648fedb3a 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ResourcePackClientResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackClientResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackClientResponsePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ResourcePackClientResponsePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp index 5bd0df9fc8..6654c9a312 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -58,9 +59,9 @@ class ResourcePackDataInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackDataInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackDataInfoPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKDATAINFOPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp index 85ae9dae9c..37d5a2a5f3 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ResourcePackStackPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePackStackPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePackStackPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKSTACKPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp index 7a3ca0521f..81c0028f88 100644 --- a/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -58,22 +59,22 @@ class ResourcePacksInfoPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ResourcePacksInfoPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ResourcePacksInfoPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKSINFOPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ResourcePacksInfoPacket(); #endif - /** - * @symbol ??0ResourcePacksInfoPacket\@\@QEAA\@_NAEAV?$vector\@UPackInfoData\@\@V?$allocator\@UPackInfoData\@\@\@std\@\@\@std\@\@10\@Z - */ - MCAPI ResourcePacksInfoPacket(bool, std::vector &, std::vector &, bool); /** * @symbol ??0ResourcePacksInfoPacket\@\@QEAA\@XZ */ MCAPI ResourcePacksInfoPacket(); + /** + * @symbol ??0ResourcePacksInfoPacket\@\@QEAA\@_NAEAV?$vector\@UPackInfoData\@\@V?$allocator\@UPackInfoData\@\@\@std\@\@\@std\@\@10\@Z + */ + MCAPI ResourcePacksInfoPacket(bool, std::vector &, std::vector &, bool); }; diff --git a/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp b/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp index 39e838f4a3..999feef2b2 100644 --- a/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp +++ b/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp @@ -36,7 +36,7 @@ class ResourceUriCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ResourceUriCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp index 720718774d..1f6c25b542 100644 --- a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp +++ b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp @@ -36,20 +36,10 @@ class RespawnAnchorBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RespawnAnchorBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RespawnAnchorBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RespawnAnchorBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RespawnAnchorBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class RespawnAnchorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -177,101 +172,106 @@ class RespawnAnchorBlock : public BlockLegacy { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@RespawnAnchorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 128 + * @vftbl 129 * @symbol ?canSpawnAt\@RespawnAnchorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 129 + * @vftbl 130 * @symbol ?notifySpawnedAt\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@RespawnAnchorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@RespawnAnchorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@RespawnAnchorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@RespawnAnchorBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@RespawnAnchorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; @@ -300,17 +300,17 @@ class RespawnAnchorBlock : public BlockLegacy { //private: /** - * @symbol ?bumpCharge\@RespawnAnchorBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@F\@Z + * @symbol ?_bumpCharge\@RespawnAnchorBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVPlayer\@\@F\@Z */ - MCAPI static bool bumpCharge(class BlockSource &, class BlockPos const &, short); + MCAPI static void _bumpCharge(class BlockSource &, class BlockPos const &, class Player *, short); /** - * @symbol ?explode\@RespawnAnchorBlock\@\@CAXAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z + * @symbol ?_explode\@RespawnAnchorBlock\@\@CAXAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z */ - MCAPI static void explode(class Player &, class BlockPos const &, class BlockSource &, class Level &); + MCAPI static void _explode(class Player &, class BlockPos const &, class BlockSource &, class Level &); /** - * @symbol ?trySetSpawn\@RespawnAnchorBlock\@\@CA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z + * @symbol ?_trySetSpawn\@RespawnAnchorBlock\@\@CA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z */ - MCAPI static bool trySetSpawn(class Player &, class BlockPos const &, class BlockSource &, class Level &); + MCAPI static bool _trySetSpawn(class Player &, class BlockPos const &, class BlockSource &, class Level &); private: diff --git a/LiteLoader/include/llapi/mc/RespawnPacket.hpp b/LiteLoader/include/llapi/mc/RespawnPacket.hpp index 25b66a76f6..e1db4232e0 100644 --- a/LiteLoader/include/llapi/mc/RespawnPacket.hpp +++ b/LiteLoader/include/llapi/mc/RespawnPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -79,9 +80,9 @@ return #var; virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@RespawnPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@RespawnPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESPAWNPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/RideCommand.hpp b/LiteLoader/include/llapi/mc/RideCommand.hpp index 65b6a8b3e2..2f764005d4 100644 --- a/LiteLoader/include/llapi/mc/RideCommand.hpp +++ b/LiteLoader/include/llapi/mc/RideCommand.hpp @@ -36,7 +36,7 @@ class RideCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@RideCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp b/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp index 5aab0e12d1..fc864b75f2 100644 --- a/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp @@ -37,10 +37,6 @@ class RideJumpTriggerSystem { * @symbol ?_tickRideJumpTriggerSystem\@RideJumpTriggerSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUMoveInputComponent\@\@AEBUPassengerComponent\@\@AEAUJumpRidingScaleComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobOnPlayerJumpRequestComponent\@\@USendPacketsComponent\@\@\@\@\@Z */ MCAPI static void _tickRideJumpTriggerSystem(class StrictEntityContext &, struct MoveInputComponent const &, struct PassengerComponent const &, struct JumpRidingScaleComponent &, struct VanillaClientGameplayComponent &, class ViewT const>, class Optional const>, class Optional>, class EntityModifierT &); - /** - * @symbol ?tickRideJumpTriggerSystem\@RideJumpTriggerSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPlayerInputRequestComponent\@\@\@\@$$CBUMoveInputComponent\@\@$$CBUPassengerComponent\@\@UJumpRidingScaleComponent\@\@UVanillaClientGameplayComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobOnPlayerJumpRequestComponent\@\@USendPacketsComponent\@\@\@\@\@Z - */ - MCAPI static void tickRideJumpTriggerSystem(class ViewT, struct PlayerInputRequestComponent>, struct MoveInputComponent const, struct PassengerComponent const, struct JumpRidingScaleComponent, struct VanillaClientGameplayComponent>, class ViewT const>, class Optional const>, class Optional>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/RideableComponent.hpp b/LiteLoader/include/llapi/mc/RideableComponent.hpp index a1ecac22e0..d44faa14fe 100644 --- a/LiteLoader/include/llapi/mc/RideableComponent.hpp +++ b/LiteLoader/include/llapi/mc/RideableComponent.hpp @@ -24,6 +24,7 @@ class RideableComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RIDEABLECOMPONENT public: class RideableComponent& operator=(class RideableComponent const &) = delete; + RideableComponent(class RideableComponent const &) = delete; #endif public: @@ -31,10 +32,6 @@ class RideableComponent { * @symbol ??0RideableComponent\@\@QEAA\@XZ */ MCAPI RideableComponent(); - /** - * @symbol ??0RideableComponent\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI RideableComponent(class RideableComponent const &); /** * @symbol ??0RideableComponent\@\@QEAA\@$$QEAV0\@\@Z */ @@ -67,17 +64,9 @@ class RideableComponent { * @symbol ??4RideableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class RideableComponent & operator=(class RideableComponent &&); - /** - * @symbol ?positionPassenger\@RideableComponent\@\@QEBAXAEAVActor\@\@0\@Z - */ - MCAPI void positionPassenger(class Actor &, class Actor &) const; /** * @symbol ?pullInEntity\@RideableComponent\@\@QEBA_NAEAVActor\@\@0\@Z */ MCAPI bool pullInEntity(class Actor &, class Actor &) const; - /** - * @symbol ??1RideableComponent\@\@QEAA\@XZ - */ - MCAPI ~RideableComponent(); }; diff --git a/LiteLoader/include/llapi/mc/RoleChecker.hpp b/LiteLoader/include/llapi/mc/RoleChecker.hpp index f5972ce604..41fb65cf7a 100644 --- a/LiteLoader/include/llapi/mc/RoleChecker.hpp +++ b/LiteLoader/include/llapi/mc/RoleChecker.hpp @@ -33,9 +33,9 @@ class RoleChecker { */ MCAPI RoleChecker(); /** - * @symbol ?checkRole\@RoleChecker\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXW4ADRole\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z\@3\@\@Z + * @symbol ?checkRole\@RoleChecker\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXW4Role\@edu\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z\@3\@\@Z */ - MCAPI void checkRole(std::string const &, class std::function); + MCAPI void checkRole(std::string const &, class std::function); /** * @symbol ?lookupInProgress\@RoleChecker\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp index 89ab6a55f5..c9b2849acb 100644 --- a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp @@ -36,20 +36,10 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RootedDirtBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RootedDirtBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RootedDirtBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,61 +115,71 @@ class RootedDirtBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@RootedDirtBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 94 + * @vftbl 97 * @symbol ?tryToTill\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,60 +191,65 @@ class RootedDirtBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 176 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?use\@RootedDirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0RootedDirtBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp index 30cd6b97ec..ae625923da 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp @@ -36,20 +36,10 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RotatedPillarBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RotatedPillarBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RotatedPillarBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 102 + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 105 * @symbol ?asItemInstance\@RotatedPillarBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@RotatedPillarBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,62 +181,67 @@ class RotatedPillarBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 148 + * @vftbl 146 * @symbol ?getMappedFace\@RotatedPillarBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@RotatedPillarBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp index df5075a7dd..65db0ce913 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp @@ -36,20 +36,10 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 101 - * @symbol ?spawnResources\@RotatedPillarInfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** * @vftbl 104 - * @symbol __unk_vfn_104 + * @symbol ?spawnResources\@RotatedPillarInfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,62 +176,67 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 189 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 186 * @symbol ?getResourceCount\@RotatedPillarInfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@RotatedPillarInfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp b/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp index cd89390655..6465e5b701 100644 --- a/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp +++ b/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp @@ -40,9 +40,9 @@ class RotationData { */ MCAPI class Vec2 ComputeRotation(class Actor const &, class std::optional const &, int); /** - * @symbol ?getFacingDirectionFacingEntity\@RotationCommandUtils\@\@YA?AVVec3\@\@PEAVActor\@\@\@Z + * @symbol ?getFacingDirectionFacingEntity\@RotationCommandUtils\@\@YA?AVVec3\@\@AEBVActor\@\@\@Z */ - MCAPI class Vec3 getFacingDirectionFacingEntity(class Actor *); + MCAPI class Vec3 getFacingDirectionFacingEntity(class Actor const &); /** * @symbol ?getFacingDirectionFacingPosition\@RotationCommandUtils\@\@YA?AVVec3\@\@HAEBVCommandOrigin\@\@VCommandPositionFloat\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/RotationUtil.hpp b/LiteLoader/include/llapi/mc/RotationUtil.hpp index 0eadd8a8f2..69b1aa0a1f 100644 --- a/LiteLoader/include/llapi/mc/RotationUtil.hpp +++ b/LiteLoader/include/llapi/mc/RotationUtil.hpp @@ -33,13 +33,13 @@ namespace RotationUtil { * @symbol ?getShuffledRotations\@RotationUtil\@\@YA?AV?$vector\@W4Rotation\@\@V?$allocator\@W4Rotation\@\@\@std\@\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI std::vector getShuffledRotations(class Random &); - /** - * @symbol ?rotate\@RotationUtil\@\@YA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z - */ - MCAPI class BlockPos rotate(class BlockPos const &, enum class Rotation); /** * @symbol ?rotate\@RotationUtil\@\@YAEW4Rotation\@\@E\@Z */ MCAPI unsigned char rotate(enum class Rotation, unsigned char); + /** + * @symbol ?rotate\@RotationUtil\@\@YA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z + */ + MCAPI class BlockPos rotate(class BlockPos const &, enum class Rotation); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SaddleItem.hpp b/LiteLoader/include/llapi/mc/SaddleItem.hpp index 6c0a8c6982..9d1b9a291e 100644 --- a/LiteLoader/include/llapi/mc/SaddleItem.hpp +++ b/LiteLoader/include/llapi/mc/SaddleItem.hpp @@ -47,10 +47,10 @@ class SaddleItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -116,4 +116,12 @@ class SaddleItem : public Item { */ MCAPI SaddleItem(std::string const &, short); +//private: + /** + * @symbol ?_tryEquipSaddleViaComponents\@SaddleItem\@\@CA_NAEAVActor\@\@AEBVItemStack\@\@\@Z + */ + MCAPI static bool _tryEquipSaddleViaComponents(class Actor &, class ItemStack const &); + +private: + }; diff --git a/LiteLoader/include/llapi/mc/Salmon.hpp b/LiteLoader/include/llapi/mc/Salmon.hpp index cce03fc5fc..15af8d2622 100644 --- a/LiteLoader/include/llapi/mc/Salmon.hpp +++ b/LiteLoader/include/llapi/mc/Salmon.hpp @@ -37,125 +37,125 @@ class Salmon : public Fish { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 323 + * @vftbl 306 * @symbol ?createAIGoals\@Salmon\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Salmon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SandBlock.hpp b/LiteLoader/include/llapi/mc/SandBlock.hpp index e3c79b9eb1..07b972f198 100644 --- a/LiteLoader/include/llapi/mc/SandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandBlock.hpp @@ -36,20 +36,10 @@ class SandBlock : public FallingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SandBlock : public FallingBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SandBlock : public FallingBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SandBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SandBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,66 +115,76 @@ class SandBlock : public FallingBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@SandBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,100 +196,105 @@ class SandBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@SandBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@SandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** * @symbol ??0SandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SandStoneBlock.hpp b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp index 95a3c09cc3..c36d275004 100644 --- a/LiteLoader/include/llapi/mc/SandStoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp @@ -36,20 +36,10 @@ class SandstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SandstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SandstoneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SandstoneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SandstoneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,51 +115,61 @@ class SandstoneBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@SandstoneBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SandstoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,72 +181,77 @@ class SandstoneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@SandstoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SandstoneBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SandstoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SaplingBlock.hpp b/LiteLoader/include/llapi/mc/SaplingBlock.hpp index 4a924727f6..83a3bd7e50 100644 --- a/LiteLoader/include/llapi/mc/SaplingBlock.hpp +++ b/LiteLoader/include/llapi/mc/SaplingBlock.hpp @@ -31,20 +31,10 @@ class SaplingBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class SaplingBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class SaplingBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class SaplingBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class SaplingBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,65 +111,75 @@ class SaplingBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@SaplingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@SaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@SaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,92 +191,97 @@ class SaplingBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@SaplingBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@SaplingBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@SaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@SaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@SaplingBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp index 77e1c910d1..702fe09994 100644 --- a/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp @@ -52,10 +52,10 @@ class SaplingBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@SaplingBlockItem\@\@UEBAHH\@Z diff --git a/LiteLoader/include/llapi/mc/SaveCommand.hpp b/LiteLoader/include/llapi/mc/SaveCommand.hpp index 5479d92073..27fd0106da 100644 --- a/LiteLoader/include/llapi/mc/SaveCommand.hpp +++ b/LiteLoader/include/llapi/mc/SaveCommand.hpp @@ -38,7 +38,7 @@ enum class State; */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SaveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SayCommand.hpp b/LiteLoader/include/llapi/mc/SayCommand.hpp index 34429aa2dc..34e4dcfa15 100644 --- a/LiteLoader/include/llapi/mc/SayCommand.hpp +++ b/LiteLoader/include/llapi/mc/SayCommand.hpp @@ -36,7 +36,7 @@ class SayCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SayCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingActionSystem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingActionSystem.hpp new file mode 100644 index 0000000000..c619465f9c --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScaffoldingActionSystem.hpp @@ -0,0 +1,24 @@ +/** + * @file ScaffoldingActionSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ScaffoldingActionSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createSystem\@ScaffoldingActionSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScaffoldingActionSystemImpl.hpp b/LiteLoader/include/llapi/mc/ScaffoldingActionSystemImpl.hpp new file mode 100644 index 0000000000..1c03906eaa --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScaffoldingActionSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file ScaffoldingActionSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ScaffoldingActionSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?descendThroughBlockAllowed\@ScaffoldingActionSystemImpl\@\@YAXAEAUSynchedActorDataComponent\@\@AEAUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@\@Z + */ + MCAPI void descendThroughBlockAllowed(struct SynchedActorDataComponent &, struct StateVectorComponent &, struct FallDistanceComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp index 8db2bd125d..d9594b09cf 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp @@ -37,29 +37,24 @@ class ScaffoldingBlock : public FallingBlock { virtual void __unk_vfn_0(); /** * @vftbl 5 + * @symbol ?clip\@ScaffoldingBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + */ + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + /** + * @vftbl 6 * @symbol ?getCollisionShape\@ScaffoldingBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@ScaffoldingBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +65,11 @@ class ScaffoldingBlock : public FallingBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@ScaffoldingBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +82,9 @@ class ScaffoldingBlock : public FallingBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@ScaffoldingBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class ScaffoldingBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class ScaffoldingBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,75 +136,85 @@ class ScaffoldingBlock : public FallingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 52 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 55 * @symbol ?canBeAscendedByJumping\@ScaffoldingBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@ScaffoldingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@ScaffoldingBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@ScaffoldingBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@ScaffoldingBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -226,95 +226,95 @@ class ScaffoldingBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 126 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 127 * @symbol ?canSlide\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** * @vftbl 174 - * @symbol ?clip\@ScaffoldingBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z - */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; - /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@ScaffoldingBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCAFFOLDINGBLOCK /** * @symbol ?waterSpreadCausesSpawn\@ScaffoldingBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp index a26ba6714f..56aa009614 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp @@ -52,10 +52,10 @@ class ScaffoldingBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -112,7 +112,7 @@ class ScaffoldingBlockItem : public BlockItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@ScaffoldingBlockItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp deleted file mode 100644 index 3428c9a2b8..0000000000 --- a/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file ScaffoldingInputSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ScaffoldingInputSystem. - * - */ -class ScaffoldingInputSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCAFFOLDINGINPUTSYSTEM -public: - class ScaffoldingInputSystem& operator=(class ScaffoldingInputSystem const &) = delete; - ScaffoldingInputSystem(class ScaffoldingInputSystem const &) = delete; - ScaffoldingInputSystem() = delete; -#endif - -public: - /** - * @symbol ?createScaffoldingInputSystem\@ScaffoldingInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createScaffoldingInputSystem(); - /** - * @symbol ?doScaffoldingInputSystem\@ScaffoldingInputSystem\@\@SAXAEBUMoveInputComponent\@\@AEBUPlayerInputModeComponent\@\@AEAUFallDistanceComponent\@\@AEAUStateVectorComponent\@\@AEAUSynchedActorDataComponent\@\@\@Z - */ - MCAPI static void doScaffoldingInputSystem(struct MoveInputComponent const &, struct PlayerInputModeComponent const &, struct FallDistanceComponent &, struct StateVectorComponent &, struct SynchedActorDataComponent &); - -}; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingIntentSystem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingIntentSystem.hpp new file mode 100644 index 0000000000..6db144728f --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScaffoldingIntentSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file ScaffoldingIntentSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ScaffoldingIntentSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCAFFOLDINGINTENTSYSTEM +public: + class ScaffoldingIntentSystem& operator=(class ScaffoldingIntentSystem const &) = delete; + ScaffoldingIntentSystem(class ScaffoldingIntentSystem const &) = delete; + ScaffoldingIntentSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@ScaffoldingIntentSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingSensingSystem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingSensingSystem.hpp deleted file mode 100644 index e06cfe6519..0000000000 --- a/LiteLoader/include/llapi/mc/ScaffoldingSensingSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ScaffoldingSensingSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ScaffoldingSensingSystem. - * - */ -class ScaffoldingSensingSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCAFFOLDINGSENSINGSYSTEM -public: - class ScaffoldingSensingSystem& operator=(class ScaffoldingSensingSystem const &) = delete; - ScaffoldingSensingSystem(class ScaffoldingSensingSystem const &) = delete; - ScaffoldingSensingSystem() = delete; -#endif - -public: - /** - * @symbol ?createScaffoldingSensingSystem\@ScaffoldingSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createScaffoldingSensingSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/ScheduleCommand.hpp b/LiteLoader/include/llapi/mc/ScheduleCommand.hpp index 5fd52d75a4..d693a277f1 100644 --- a/LiteLoader/include/llapi/mc/ScheduleCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScheduleCommand.hpp @@ -42,7 +42,7 @@ struct FunctionInfo { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ScheduleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ScopedSideBySideTrigger.hpp b/LiteLoader/include/llapi/mc/ScopedSideBySideTrigger.hpp deleted file mode 100644 index cf2e9f76a3..0000000000 --- a/LiteLoader/include/llapi/mc/ScopedSideBySideTrigger.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ScopedSideBySideTrigger.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ScopedSideBySideTrigger. - * - */ -class ScopedSideBySideTrigger { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCOPEDSIDEBYSIDETRIGGER -public: - class ScopedSideBySideTrigger& operator=(class ScopedSideBySideTrigger const &) = delete; - ScopedSideBySideTrigger(class ScopedSideBySideTrigger const &) = delete; - ScopedSideBySideTrigger() = delete; -#endif - -public: - /** - * @symbol ?end\@ScopedSideBySideTrigger\@\@QEAA_NXZ - */ - MCAPI bool end(); - /** - * @symbol ??1ScopedSideBySideTrigger\@\@QEAA\@XZ - */ - MCAPI ~ScopedSideBySideTrigger(); - /** - * @symbol ?tryTriggerIf\@ScopedSideBySideTrigger\@\@SA?AV1\@_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z - */ - MCAPI static class ScopedSideBySideTrigger tryTriggerIf(bool, struct IActorMovementProxy &, enum class SideBySideExtractionId); - -}; diff --git a/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp b/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp index 2483450528..cc6be8a7cc 100644 --- a/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp +++ b/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp @@ -45,6 +45,10 @@ struct ScorePacketInfo { #endif public: + /** + * @symbol ??0ScorePacketInfo\@\@QEAA\@$$QEAU0\@\@Z + */ + //MCAPI ScorePacketInfo(struct ScorePacketInfo &&); /** * @symbol ??1ScorePacketInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Scoreboard.hpp b/LiteLoader/include/llapi/mc/Scoreboard.hpp index b93d910a32..4de6b1fdc3 100644 --- a/LiteLoader/include/llapi/mc/Scoreboard.hpp +++ b/LiteLoader/include/llapi/mc/Scoreboard.hpp @@ -426,6 +426,10 @@ class Scoreboard { * @symbol ?getScoreboardEventCoordinator\@Scoreboard\@\@QEAAAEAVScoreboardEventCoordinator\@\@XZ */ MCAPI class ScoreboardEventCoordinator & getScoreboardEventCoordinator(); + /** + * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z + */ + MCAPI struct ScoreboardId const & getScoreboardId(class Player const &) const; /** * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVActor\@\@\@Z */ @@ -434,10 +438,6 @@ class Scoreboard { * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const; - /** - * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z - */ - MCAPI struct ScoreboardId const & getScoreboardId(class Player const &) const; /** * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ @@ -467,13 +467,9 @@ class Scoreboard { */ MCAPI int modifyPlayerScore(bool &, struct ScoreboardId const &, class Objective &, int, enum class PlayerScoreSetFunction); /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?modifyPlayerScore\@Scoreboard\@\@QEAAHAEA_NPEAVScoreboardIdentityRef\@\@AEAVObjective\@\@HW4PlayerScoreSetFunction\@\@\@Z */ - MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(class CompoundTag const &); - /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z - */ - MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); + MCAPI int modifyPlayerScore(bool &, class ScoreboardIdentityRef *, class Objective &, int, enum class PlayerScoreSetFunction); /** * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z */ @@ -483,17 +479,25 @@ class Scoreboard { */ MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &); /** - * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBVCompoundTag\@\@\@Z */ - MCAPI bool removeObjective(class Objective *); + MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(class CompoundTag const &); /** - * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ - MCAPI void removeScoreListener(class Player const &, std::string const &); + MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); + /** + * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z + */ + MCAPI bool removeObjective(class Objective *); /** * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@\@Z */ MCAPI void removeScoreListener(class Player const &); + /** + * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void removeScoreListener(class Player const &, std::string const &); /** * @symbol ?replaceFakePlayer\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp index 7e0ecc7c03..fd3c5e7399 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp @@ -47,7 +47,7 @@ struct SetScoreOutput { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ScoreboardCommand\@\@EEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp index 1e9e487a93..802b6b0d8e 100644 --- a/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp @@ -78,6 +78,26 @@ class ScriptBlockGameplayHandler { virtual void __unk_vfn_8(); /** * @vftbl 9 + * @symbol __unk_vfn_9 + */ + virtual void __unk_vfn_9(); + /** + * @vftbl 10 + * @symbol __unk_vfn_10 + */ + virtual void __unk_vfn_10(); + /** + * @vftbl 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 12 + * @symbol __unk_vfn_12 + */ + virtual void __unk_vfn_12(); + /** + * @vftbl 13 * @symbol ?handleEvent\@ScriptBlockGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBUPistonActionEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct PistonActionEvent const &); diff --git a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp deleted file mode 100644 index 70fbfee69f..0000000000 --- a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @file ScriptCustomEventPacket.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Packet.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class ScriptCustomEventPacket. - * - */ -class ScriptCustomEventPacket : public Packet { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTCUSTOMEVENTPACKET -public: - class ScriptCustomEventPacket& operator=(class ScriptCustomEventPacket const &) = delete; - ScriptCustomEventPacket(class ScriptCustomEventPacket const &) = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getId\@ScriptCustomEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ - */ - virtual enum class MinecraftPacketIds getId() const; - /** - * @vftbl 2 - * @symbol ?getName\@ScriptCustomEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - virtual std::string getName() const; - /** - * @vftbl 3 - * @symbol ?write\@ScriptCustomEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z - */ - virtual void write(class BinaryStream &) const; - /** - * @vftbl 7 - * @symbol ?_read\@ScriptCustomEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z - */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); - /** - * @symbol ??0ScriptCustomEventPacket\@\@QEAA\@XZ - */ - MCAPI ScriptCustomEventPacket(); - -}; diff --git a/LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp index aa8b5523d8..428bd573a3 100644 --- a/LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDeferredEventCoordinator.hpp @@ -29,4 +29,20 @@ class ScriptDeferredEventCoordinator { */ MCAPI void sendAllDeferredEvents(); +//private: + /** + * @symbol ?_sendFlushSystemAfterEvents\@ScriptDeferredEventCoordinator\@\@AEAA_NXZ + */ + MCAPI bool _sendFlushSystemAfterEvents(); + /** + * @symbol ?_sendFlushWorldAfterEvents\@ScriptDeferredEventCoordinator\@\@AEAA_NXZ + */ + MCAPI bool _sendFlushWorldAfterEvents(); + +private: + /** + * @symbol ?sEventExecutionOrder\@ScriptDeferredEventCoordinator\@\@0V?$vector\@UDocumentableEventExecution\@ScriptDeferredEventCoordinator\@\@V?$allocator\@UDocumentableEventExecution\@ScriptDeferredEventCoordinator\@\@\@std\@\@\@std\@\@B + */ + MCAPI static std::vector const sEventExecutionOrder; + }; diff --git a/LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp index e8d1992498..7d0a2b81db 100644 --- a/LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDeferredEventListener.hpp @@ -26,17 +26,29 @@ class ScriptDeferredEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTDEFERREDEVENTLISTENER /** - * @symbol ?onFlushAfterEvents\@ScriptDeferredEventListener\@\@UEAA_NXZ + * @symbol ?onFlushSystemAfterEvents\@ScriptDeferredEventListener\@\@UEAA_NXZ */ - MCVAPI bool onFlushAfterEvents(); + MCVAPI bool onFlushSystemAfterEvents(); + /** + * @symbol ?onFlushWorldAfterEvents\@ScriptDeferredEventListener\@\@UEAA_NXZ + */ + MCVAPI bool onFlushWorldAfterEvents(); /** * @symbol ?onLevelTickEnd\@ScriptDeferredEventListener\@\@UEAAXXZ */ MCVAPI void onLevelTickEnd(); /** - * @symbol ?onRunSystemEvents\@ScriptDeferredEventListener\@\@UEAA_NXZ + * @symbol ?onPostFlushAfterEvents\@ScriptDeferredEventListener\@\@UEAAXXZ + */ + MCVAPI void onPostFlushAfterEvents(); + /** + * @symbol ?onPreFlushAfterEvents\@ScriptDeferredEventListener\@\@UEAAXXZ + */ + MCVAPI void onPreFlushAfterEvents(); + /** + * @symbol ?onRunSystemTick\@ScriptDeferredEventListener\@\@UEAA_NXZ */ - MCVAPI bool onRunSystemEvents(); + MCVAPI bool onRunSystemTick(); #endif }; diff --git a/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp b/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp index 9472b446fa..bea9a903f2 100644 --- a/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp @@ -31,7 +31,7 @@ class ScriptEventCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ScriptEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp index d91e314277..0c9f7ee145 100644 --- a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class ScriptMessagePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ScriptMessagePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ScriptMessagePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTMESSAGEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp index 7436bc8e4a..be6f1b5330 100644 --- a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp +++ b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp @@ -32,8 +32,16 @@ enum class ScriptTimeOfDay; enum class ScriptMessageSourceType; +enum class ScriptEventSource; + +enum class ScriptDisplayObjectiveSlotId; + struct ScriptRawMessageScoreInterface; +class ScriptScoreboardIdentity; + +class ScriptActor; + struct ScriptRawMessageInterface; struct ScriptNavigationResult { @@ -54,6 +62,14 @@ struct ScriptNavigationResult { * @symbol ?SetUpScriptAssertHandler\@ScriptModuleMinecraft\@\@YAXXZ */ MCAPI void SetUpScriptAssertHandler(); + /** + * @symbol ?_buildSignalId\@ScriptModuleMinecraft\@\@YA_KPEBD000\@Z + */ + MCAPI unsigned __int64 _buildSignalId(char const *, char const *, char const *, char const *); + /** + * @symbol ?_handleDefinePropertyError\@ScriptModuleMinecraft\@\@YA?AUError\@Scripting\@\@W4DynamicPropertyDefinePropertyError\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI struct Scripting::Error _handleDefinePropertyError(enum class DynamicPropertyDefinePropertyError, std::string const &); /** * @symbol ?bindBlockLocation\@ScriptModuleMinecraft\@\@YA?AV?$ClassBindingBuilder\@VBlockPos\@\@\@Scripting\@\@XZ */ @@ -71,17 +87,21 @@ struct ScriptNavigationResult { */ MCAPI class Scripting::EnumBindingBuilder bindItemLockMode(); /** - * @symbol ?bindMessageSourceTypeV010\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptMessageSourceType\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ + * @symbol ?bindScriptDisplayObjectiveSlotId\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptDisplayObjectiveSlotId\@ScriptModuleMinecraft\@\@\@Scripting\@\@XZ */ - MCAPI class Scripting::EnumBindingBuilder bindMessageSourceTypeV010(); + MCAPI class Scripting::EnumBindingBuilder bindScriptDisplayObjectiveSlotId(); /** - * @symbol ?bindMessageSourceTypeV1\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptMessageSourceType\@ScriptModuleMinecraft\@\@\@Scripting\@\@XZ + * @symbol ?bindScriptEventSource\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptEventSource\@ScriptModuleMinecraft\@\@\@Scripting\@\@XZ */ - MCAPI class Scripting::EnumBindingBuilder bindMessageSourceTypeV1(); + MCAPI class Scripting::EnumBindingBuilder bindScriptEventSource(); /** * @symbol ?bindTimeOfDay\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptTimeOfDay\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ */ MCAPI class Scripting::EnumBindingBuilder bindTimeOfDay(); + /** + * @symbol ?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(class std::variant, class Scripting::StrongTypedObjectHandle, std::string> const &); /** * @symbol ?rawMessageOrStringToJson\@ScriptModuleMinecraft\@\@YA?AVValue\@Json\@\@AEBV?$variant\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UScriptRawMessageInterface\@ScriptModuleMinecraft\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp index 4414a12d7a..3c4d6f4716 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp @@ -20,19 +20,21 @@ class ScriptPackConfiguration { #define AFTER_EXTRA #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTPACKCONFIGURATION +public: + class ScriptPackConfiguration& operator=(class ScriptPackConfiguration const &) = delete; + ScriptPackConfiguration() = delete; +#endif + public: /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@XZ + * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ScriptPackConfiguration(); + MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&); /** * @symbol ??0ScriptPackConfiguration\@\@QEAA\@AEBV0\@\@Z */ MCAPI ScriptPackConfiguration(class ScriptPackConfiguration const &); - /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&); /** * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEBAAEBVScriptPackPermissions\@\@XZ */ @@ -45,10 +47,6 @@ class ScriptPackConfiguration { * @symbol ?getVariables\@ScriptPackConfiguration\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@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\@\@VValue\@Json\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getVariables() const; - /** - * @symbol ??4ScriptPackConfiguration\@\@QEAAAEAV0\@AEBV0\@\@Z - */ - MCAPI class ScriptPackConfiguration & operator=(class ScriptPackConfiguration const &); /** * @symbol ??4ScriptPackConfiguration\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp index 39f4e45448..96835fbebf 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp @@ -23,25 +23,40 @@ class ScriptPackConfigurationManager { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTPACKCONFIGURATIONMANAGER public: class ScriptPackConfigurationManager& operator=(class ScriptPackConfigurationManager const &) = delete; + ScriptPackConfigurationManager() = delete; #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTPACKCONFIGURATIONMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScriptPackConfigurationManager(); +#endif /** * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@AEBV0\@\@Z */ MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager const &); /** - * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ + * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager &&); + /** + * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@V?$optional\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@Z + */ + MCAPI ScriptPackConfigurationManager(class std::optional>); + /** + * @symbol ?getConfigPath\@ScriptPackConfigurationManager\@\@QEBAAEBV?$optional\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@XZ */ - MCAPI ScriptPackConfigurationManager(); + MCAPI class std::optional> const & getConfigPath() const; /** * @symbol ?getPackConfiguration\@ScriptPackConfigurationManager\@\@QEBAAEBVScriptPackConfiguration\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class ScriptPackConfiguration const & getPackConfiguration(std::string const &) const; /** - * @symbol ?loadPackConfigs\@ScriptPackConfigurationManager\@\@QEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?loadPackConfigs\@ScriptPackConfigurationManager\@\@QEAAXXZ */ - MCAPI void loadPackConfigs(class Core::Path const &); + MCAPI void loadPackConfigs(); //private: diff --git a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp index bbd6ef30a6..7dd912a8ff 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp @@ -22,13 +22,10 @@ class ScriptPackPermissions { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCRIPTPACKPERMISSIONS public: class ScriptPackPermissions& operator=(class ScriptPackPermissions const &) = delete; + ScriptPackPermissions() = delete; #endif public: - /** - * @symbol ??0ScriptPackPermissions\@\@QEAA\@XZ - */ - MCAPI ScriptPackPermissions(); /** * @symbol ??0ScriptPackPermissions\@\@QEAA\@AEBV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp index f61d89c47e..cb42bb6a0d 100644 --- a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp @@ -46,14 +46,6 @@ class ScriptPlugin { */ MCVAPI ~ScriptPlugin(); #endif - /** - * @symbol ?getModuleDescriptor\@ScriptPlugin\@\@QEBAAEBUModuleDescriptor\@Scripting\@\@XZ - */ - MCAPI struct Scripting::ModuleDescriptor const & getModuleDescriptor() const; - /** - * @symbol ?getScriptContext\@ScriptPlugin\@\@QEAAAEAVScriptContext\@Scripting\@\@XZ - */ - MCAPI class Scripting::ScriptContext & getScriptContext(); /** * @symbol ?hasErrors\@ScriptPlugin\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp b/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp index 6cc51e3628..49d195f439 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp @@ -5,8 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Scripting.hpp" #include "ResourceInformation.hpp" +#include "Scripting.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,10 +31,6 @@ class ScriptPluginManager { #endif public: - /** - * @symbol ??0ScriptPluginManager\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@_NV?$unique_ptr\@VIScriptTelemetryLogger\@\@U?$default_delete\@VIScriptTelemetryLogger\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI ScriptPluginManager(class Scripting::ScriptEngine &, bool, std::unique_ptr); /** * @symbol ?discoverPlugins\@ScriptPluginManager\@\@QEAA?AVScriptPluginManagerResult\@\@W4ResourceType\@ResourceInformation\@\@AEBVIScriptPluginSourceEnumerator\@\@AEBVScriptPackConfigurationManager\@\@AEBV?$vector\@V?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@V?$allocator\@V?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@\@2\@\@std\@\@\@Z */ @@ -43,14 +39,6 @@ class ScriptPluginManager { * @symbol ?getPluginStats\@ScriptPluginManager\@\@QEBA?AV?$vector\@UScriptPluginStats\@\@V?$allocator\@UScriptPluginStats\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getPluginStats() const; - /** - * @symbol ?getPlugins\@ScriptPluginManager\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VScriptPlugin\@\@U?$default_delete\@VScriptPlugin\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VScriptPlugin\@\@U?$default_delete\@VScriptPlugin\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getPlugins() const; - /** - * @symbol ?releaseAll\@ScriptPluginManager\@\@QEAAXXZ - */ - MCAPI void releaseAll(); /** * @symbol ?releasePlugins\@ScriptPluginManager\@\@QEAAXXZ */ @@ -59,10 +47,6 @@ class ScriptPluginManager { * @symbol ?runAll\@ScriptPluginManager\@\@QEAA?AVScriptPluginManagerResult\@\@XZ */ MCAPI class ScriptPluginManagerResult runAll(); - /** - * @symbol ??1ScriptPluginManager\@\@QEAA\@XZ - */ - MCAPI ~ScriptPluginManager(); /** * @symbol ?getPackCapability\@ScriptPluginManager\@\@SA?AVPackCapability\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp b/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp index e09c136146..eef5fc3ccd 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp @@ -43,9 +43,5 @@ class ScriptPluginPackSourceEnumerator { */ MCVAPI ~ScriptPluginPackSourceEnumerator(); #endif - /** - * @symbol ??0ScriptPluginPackSourceEnumerator\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@2\@\@Z - */ - MCAPI ScriptPluginPackSourceEnumerator(std::string const &, std::vector const &); }; diff --git a/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp b/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp index 1a16a71239..66569e7011 100644 --- a/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp @@ -57,9 +57,9 @@ class ScriptScriptingEventHandler { //private: /** - * @symbol ?_handleWatchdogTerminateEvent\@ScriptScriptingEventHandler\@\@AEBA_NAEAUBeforeWatchdogTerminateEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptSystemEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleWatchdogTerminateEvent\@ScriptScriptingEventHandler\@\@AEBA_NAEAUBeforeWatchdogTerminateEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptSystemBeforeEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ - MCAPI bool _handleWatchdogTerminateEvent(struct BeforeWatchdogTerminateEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; + MCAPI bool _handleWatchdogTerminateEvent(struct BeforeWatchdogTerminateEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: diff --git a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp index 6b84eed04a..ff1ff34d28 100644 --- a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Scripting.hpp" #define BEFORE_EXTRA @@ -38,9 +37,5 @@ class ScriptTickListener { */ MCVAPI void onLevelTickEnd(); #endif - /** - * @symbol ??0ScriptTickListener\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@AEAVScriptFormPromiseTracker\@\@\@Z - */ - MCAPI ScriptTickListener(class Scripting::ScriptEngine &, class ScriptFormPromiseTracker &); }; diff --git a/LiteLoader/include/llapi/mc/ScriptUtils.hpp b/LiteLoader/include/llapi/mc/ScriptUtils.hpp index 7905cd0500..f10edadcf1 100644 --- a/LiteLoader/include/llapi/mc/ScriptUtils.hpp +++ b/LiteLoader/include/llapi/mc/ScriptUtils.hpp @@ -21,16 +21,16 @@ namespace ScriptUtils { #undef AFTER_EXTRA /** - * @symbol ?functionError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?functionError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI struct Scripting::Error functionError(std::string const &); + MCAPI struct Scripting::Error functionError(class std::basic_string_view>); /** - * @symbol ?getPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI struct Scripting::Error getPropertyError(std::string const &); + MCAPI struct Scripting::Error getPropertyError(class std::basic_string_view>); /** - * @symbol ?setPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI struct Scripting::Error setPropertyError(std::string const &); + MCAPI struct Scripting::Error setPropertyError(class std::basic_string_view>); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Scripting.hpp b/LiteLoader/include/llapi/mc/Scripting.hpp index e392f77296..2785970c78 100644 --- a/LiteLoader/include/llapi/mc/Scripting.hpp +++ b/LiteLoader/include/llapi/mc/Scripting.hpp @@ -32,8 +32,13 @@ class EnumBindingBuilder { EnumBindingBuilder(EnumBindingBuilder const&&) = delete; }; +template +class StrongTypedObjectHandle; + struct Version; +struct Error; + enum class LogLevel : int { Verbose = 0x0, Info = 0x1, diff --git a/LiteLoader/include/llapi/mc/SculkBlock.hpp b/LiteLoader/include/llapi/mc/SculkBlock.hpp index 314335daf7..977113a26f 100644 --- a/LiteLoader/include/llapi/mc/SculkBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkBlock.hpp @@ -36,20 +36,10 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SculkBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SculkBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SculkBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,62 +171,67 @@ class SculkBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SculkBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SculkBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp b/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp index 4925391e73..33bf8926dd 100644 --- a/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp @@ -36,20 +36,10 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SculkCatalystBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SculkCatalystBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SculkCatalystBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,77 +171,82 @@ class SculkCatalystBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@SculkCatalystBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SculkCatalystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SculkCatalystBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp index f74d6a0b4a..78e5f648af 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp @@ -36,30 +36,20 @@ class SculkSensorBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 17 + * @vftbl 20 * @symbol ?liquidCanFlowIntoFromDirection\@SculkSensorBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@SculkSensorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class SculkSensorBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class SculkSensorBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class SculkSensorBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class SculkSensorBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -140,56 +125,66 @@ class SculkSensorBlock : public ActorBlock { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@SculkSensorBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@SculkSensorBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@SculkSensorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 - */ - virtual void __unk_vfn_81(); - /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -202,101 +197,106 @@ class SculkSensorBlock : public ActorBlock { virtual void __unk_vfn_124(); /** * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 126 * @symbol ?getComparatorSignal\@SculkSensorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onStandOn\@SculkSensorBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 184 + * @vftbl 181 * @symbol ?getEmissiveBrightness\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SculkSensorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp index b740fb4ac6..59d0821ef3 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp @@ -65,6 +65,11 @@ class SculkSensorBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -91,24 +96,29 @@ class SculkSensorBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKSENSORBLOCKACTOR /** * @symbol __unk_destructor_-1 */ MCVAPI ~SculkSensorBlockActor(); #endif - /** - * @symbol ??0SculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z - */ - MCAPI SculkSensorBlockActor(class BlockPos const &); /** * @symbol ??0SculkSensorBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I$$QEAV?$unique_ptr\@VSculkSensorVibrationConfig\@\@U?$default_delete\@VSculkSensorVibrationConfig\@\@\@std\@\@\@4\@\@Z */ MCAPI SculkSensorBlockActor(enum class BlockActorType, class BlockPos const &, std::string const &, unsigned int, std::unique_ptr &&); + /** + * @symbol ??0SculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + */ + MCAPI SculkSensorBlockActor(class BlockPos const &); /** * @symbol ?getLatestReceivedVibrationFrequency\@SculkSensorBlockActor\@\@QEBAHXZ */ diff --git a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp index 2b5aaa4902..c5e86e2064 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp @@ -36,25 +36,15 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@SculkShriekerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class SculkShriekerBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class SculkShriekerBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class SculkShriekerBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +121,55 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 78 - * @symbol ?setupRedstoneComponent\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** * @vftbl 81 - * @symbol __unk_vfn_81 + * @symbol ?setupRedstoneComponent\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_81(); + virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,97 +181,102 @@ class SculkShriekerBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@SculkShriekerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 + * @vftbl 149 * @symbol ?init\@SculkShriekerBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onStandOn\@SculkShriekerBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SculkShriekerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp index 8360263d5b..87ed8198b9 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp @@ -63,6 +63,11 @@ class SculkShriekerBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -89,10 +94,15 @@ class SculkShriekerBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0SculkShriekerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp index f019a7281a..c8fe90e5c4 100644 --- a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp @@ -36,20 +36,10 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SculkVeinBlock : public MultifaceBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SculkVeinBlock : public MultifaceBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SculkVeinBlock : public MultifaceBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 68 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@SculkVeinBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,77 +181,82 @@ class SculkVeinBlock : public MultifaceBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 188 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 185 * @symbol ?getResourceItem\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SculkVeinBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getMultifaceBlock\@SculkVeinBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getMultifaceSpreader\@SculkVeinBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const; diff --git a/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp index f40188691e..c22fa1f5c4 100644 --- a/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp @@ -36,20 +36,10 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SeaLanternBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SeaLanternBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SeaLanternBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,62 +171,67 @@ class SeaLanternBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SeaLanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SeaLanternBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SeaPickleBlock.hpp b/LiteLoader/include/llapi/mc/SeaPickleBlock.hpp index a9cbbddb6b..f92c6b6e91 100644 --- a/LiteLoader/include/llapi/mc/SeaPickleBlock.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleBlock.hpp @@ -31,30 +31,20 @@ class SeaPickleBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SeaPickleBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@SeaPickleBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class SeaPickleBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class SeaPickleBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class SeaPickleBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class SeaPickleBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +121,80 @@ class SeaPickleBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@SeaPickleBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@SeaPickleBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,107 +206,112 @@ class SeaPickleBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@SeaPickleBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@SeaPickleBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 152 + * @vftbl 150 * @symbol ?getLightEmission\@SeaPickleBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@SeaPickleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SeaPickleBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@SeaPickleBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SeaPickleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?checkAlive\@SeaPickleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; diff --git a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp index c2971f18af..867b2525b2 100644 --- a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp @@ -52,10 +52,10 @@ class SeaPickleBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@SeaPickleBlockItem\@\@UEBAHH\@Z @@ -117,7 +117,7 @@ class SeaPickleBlockItem : public BlockItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@SeaPickleBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/SeagrassBlock.hpp b/LiteLoader/include/llapi/mc/SeagrassBlock.hpp index 0b6549b5a8..4b15b153ca 100644 --- a/LiteLoader/include/llapi/mc/SeagrassBlock.hpp +++ b/LiteLoader/include/llapi/mc/SeagrassBlock.hpp @@ -32,29 +32,19 @@ class SeagrassBlock : public BlockLegacy { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@SeagrassBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@SeagrassBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@SeagrassBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class SeagrassBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class SeagrassBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class SeagrassBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class SeagrassBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +121,80 @@ class SeagrassBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@SeagrassBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SeagrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,92 +206,97 @@ class SeagrassBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@SeagrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@SeagrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SeagrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SeagrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SeagrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@SeagrassBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SeagrassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp b/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp index 84821930a1..a3aaaa28ef 100644 --- a/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp +++ b/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp @@ -27,14 +27,14 @@ class SeatDescriptionUtility { #endif public: - /** - * @symbol ?getSeatDescriptionOfPassenger\@SeatDescriptionUtility\@\@SAAEBUSeatDescription\@\@AEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@AEBUVehicleComponent\@\@AEBVStrictEntityContext\@\@\@Z - */ - MCAPI static struct SeatDescription const & getSeatDescriptionOfPassenger(std::vector const &, struct VehicleComponent const &, class StrictEntityContext const &); /** * @symbol ?getSeatDescriptionOfPassenger\@SeatDescriptionUtility\@\@SAAEBUSeatDescription\@\@AEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@HH\@Z */ MCAPI static struct SeatDescription const & getSeatDescriptionOfPassenger(std::vector const &, int, int); + /** + * @symbol ?getSeatDescriptionOfPassenger\@SeatDescriptionUtility\@\@SAAEBUSeatDescription\@\@AEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@AEBUVehicleComponent\@\@AEBVStrictEntityContext\@\@\@Z + */ + MCAPI static struct SeatDescription const & getSeatDescriptionOfPassenger(std::vector const &, struct VehicleComponent const &, class StrictEntityContext const &); /** * @symbol ?getSeatRidingHeightOffset\@SeatDescriptionUtility\@\@SAMMMM\@Z */ diff --git a/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp b/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp index 9734be2cd1..b3aeb19ee3 100644 --- a/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp +++ b/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp @@ -29,9 +29,9 @@ class SemVersionConstraint { public: /** * @vftbl 0 - * @symbol ?doValidate\@SemVersionConstraint\@\@EEBA_NAEBVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z + * @symbol ?doValidate\@SemVersionConstraint\@\@EEBA_NAEBVmeta_any\@entt\@\@AEAVSerializerContext\@cereal\@\@\@Z */ - virtual bool doValidate(class entt::meta_any const &, class SerializerContext &) const; + virtual bool doValidate(class entt::meta_any const &, class cereal::SerializerContext &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEMVERSIONCONSTRAINT /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp b/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp index dce8f71d67..2f30719e70 100644 --- a/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp +++ b/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp @@ -28,20 +28,12 @@ class SendLinkPacketOfPassengersSystem { public: /** - * @symbol ?createSystem\@SendLinkPacketOfPassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?sendLinkPacketOfPassengers\@SendLinkPacketOfPassengersSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEAUVehicleComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@\@\@$$CBUActorUniqueIDComponent\@\@\@\@\@Z + * @symbol ?createCleanupSystem\@SendLinkPacketOfPassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void sendLinkPacketOfPassengers(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct VehicleComponent &, class EntityModifierT> &, class ViewT, struct ActorUniqueIDComponent const>); - -//private: + MCAPI static struct TickingSystemWithInfo createCleanupSystem(); /** - * @symbol ?_tickSendLinkPacketOfPassengers\@SendLinkPacketOfPassengersSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@$$CBUActorUniqueIDComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@\@\@Z + * @symbol ?createSystem\@SendLinkPacketOfPassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void _tickSendLinkPacketOfPassengers(class ViewT, class FlagComponent>, struct ActorUniqueIDComponent const, struct VehicleComponent>, class EntityModifierT>, class ViewT, struct ActorUniqueIDComponent const>, class ViewT, class FlagComponent>>); - -private: + MCAPI static struct TickingSystemWithInfo createSystem(); }; diff --git a/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystemImpl.hpp b/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystemImpl.hpp new file mode 100644 index 0000000000..fe17a1517e --- /dev/null +++ b/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file SendLinkPacketOfPassengersSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SendLinkPacketOfPassengersSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?sendLinkPacketOfPassengers\@SendLinkPacketOfPassengersSystemImpl\@\@YAXU?$type_list\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@entt\@\@AEBVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEAUVehicleComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@\@\@$$CBUActorUniqueIDComponent\@\@\@\@\@Z + */ + MCAPI void sendLinkPacketOfPassengers(struct entt::type_list, class FlagComponent>>, class StrictEntityContext const &, struct ActorUniqueIDComponent const &, struct VehicleComponent &, class EntityModifierT, class ViewT, struct ActorUniqueIDComponent const>); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp b/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp deleted file mode 100644 index 165ff5d635..0000000000 --- a/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file SendPacketsSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SendPacketsSystemImpl. - * - */ -class SendPacketsSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SENDPACKETSSYSTEMIMPL -public: - class SendPacketsSystemImpl& operator=(class SendPacketsSystemImpl const &) = delete; - SendPacketsSystemImpl(class SendPacketsSystemImpl const &) = delete; - SendPacketsSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?_sendPacketsSystem\@SendPacketsSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBVActorOwnerComponent\@\@AEAUSendPacketsComponent\@\@\@Z - */ - MCAPI static void _sendPacketsSystem(class StrictEntityContext &, class ActorOwnerComponent const &, struct SendPacketsComponent &); - /** - * @symbol ?sendPacketsSystem\@SendPacketsSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVActorOwnerComponent\@\@USendPacketsComponent\@\@\@\@\@Z - */ - MCAPI static void sendPacketsSystem(class ViewT); - -}; diff --git a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp index f4217c56d8..e84e3ef5f4 100644 --- a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp +++ b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp @@ -35,13 +35,10 @@ struct SerializedAbilitiesData { public: struct SerializedAbilitiesData& operator=(struct SerializedAbilitiesData const &) = delete; SerializedAbilitiesData(struct SerializedAbilitiesData const &) = delete; + SerializedAbilitiesData() = delete; #endif public: - /** - * @symbol ??0SerializedAbilitiesData\@\@QEAA\@XZ - */ - MCAPI SerializedAbilitiesData(); /** * @symbol ??0SerializedAbilitiesData\@\@QEAA\@UActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SerializedSkin.hpp b/LiteLoader/include/llapi/mc/SerializedSkin.hpp index 39d66fccf6..e70e8a8552 100644 --- a/LiteLoader/include/llapi/mc/SerializedSkin.hpp +++ b/LiteLoader/include/llapi/mc/SerializedSkin.hpp @@ -5,9 +5,23 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "mce.hpp" +#include "AnimatedImageData.hpp" +#include "SemVersion.hpp" +#include "SerializedPersonaPieceHandle.hpp" +#include "persona.hpp" +#include "TintMapColor.hpp" + +enum class TrustedSkinFlag : __int8 +{ + Unset = 0x0, + False = 0x1, + True = 0x2, +}; #undef BEFORE_EXTRA @@ -19,29 +33,53 @@ class SerializedSkin { #define AFTER_EXTRA // Add Member There - char filler[0x250]; +public: + std::string mId; + std::string mPlayFabId; + std::string mFullId; + std::string mResourcePatch; + std::string mDefaultGeometryName; + mce::Image mSkinImage; + mce::Image mCapeImage; + std::vector mSkinAnimatedImages; + Json::Value mGeometryData; + SemVersion mGeometryDataEngineVersion; + Json::Value mGeometryDataMutable; + std::string mAnimationData; + std::string mCapeId; + std::vector mPersonaPieces; + persona::ArmSize::Type mArmSizeType; + std::unordered_map mPieceTintColors; + mce::Color mSkinColor; + TrustedSkinFlag mIsTrustedSkin; + bool mIsPremium; + bool mIsPersona; + bool mIsPersonaCapeOnClassicSkin; + bool mIsPrimaryUser; + bool mOverridesPlayerAppearance; + // char filler[0x250]; #undef AFTER_EXTRA public: /** * @symbol ??0SerializedSkin\@\@QEAA\@AEBVSubClientConnectionRequest\@\@\@Z */ MCAPI SerializedSkin(class SubClientConnectionRequest const &); - /** - * @symbol ??0SerializedSkin\@\@QEAA\@XZ - */ - MCAPI SerializedSkin(); /** * @symbol ??0SerializedSkin\@\@QEAA\@AEBV0\@\@Z */ MCAPI SerializedSkin(class SerializedSkin const &); /** - * @symbol ??0SerializedSkin\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0SerializedSkin\@\@QEAA\@XZ */ - MCAPI SerializedSkin(class SerializedSkin &&); + MCAPI SerializedSkin(); /** * @symbol ??0SerializedSkin\@\@QEAA\@AEBVConnectionRequest\@\@\@Z */ MCAPI SerializedSkin(class ConnectionRequest const &); + /** + * @symbol ??0SerializedSkin\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI SerializedSkin(class SerializedSkin &&); /** * @symbol ?getName\@SerializedSkin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ @@ -55,9 +93,9 @@ class SerializedSkin { */ MCAPI class SerializedSkin & operator=(class SerializedSkin const &); /** - * @symbol ?read\@SerializedSkin\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@SerializedSkin\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI bool read(class ReadOnlyBinaryStream &); + MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream &); /** * @symbol ?setArmSizeFromString\@SerializedSkin\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SerializerContext.hpp b/LiteLoader/include/llapi/mc/SerializerContext.hpp deleted file mode 100644 index ccf66d5d6d..0000000000 --- a/LiteLoader/include/llapi/mc/SerializerContext.hpp +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @file SerializerContext.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class SerializerContext. - * - */ -class SerializerContext { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERIALIZERCONTEXT -public: - class SerializerContext& operator=(class SerializerContext const &) = delete; -#endif - -public: - /** - * @symbol ??0SerializerContext\@\@QEAA\@XZ - */ - MCAPI SerializerContext(); - /** - * @symbol ??0SerializerContext\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI SerializerContext(class SerializerContext const &); - /** - * @symbol ?clear\@SerializerContext\@\@QEAAXXZ - */ - MCAPI void clear(); - /** - * @symbol ?consumeContext\@SerializerContext\@\@QEAAX$$QEAV1\@\@Z - */ - MCAPI void consumeContext(class SerializerContext &&); - /** - * @symbol ?detachContext\@SerializerContext\@\@QEAA?AV1\@XZ - */ - MCAPI class SerializerContext detachContext(); - /** - * @symbol ?getErrors\@SerializerContext\@\@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 - */ - MCAPI std::vector getErrors() const; - /** - * @symbol ?getLog\@SerializerContext\@\@QEBAAEBV?$vector\@ULogEntry\@SerializerContext\@\@V?$allocator\@ULogEntry\@SerializerContext\@\@\@std\@\@\@std\@\@XZ - */ - MCAPI std::vector const & getLog() const; - /** - * @symbol ?log\@SerializerContext\@\@QEAA?AW4ResultCode\@internal\@reflection\@\@W4234\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI enum class reflection::internal::ResultCode log(enum class reflection::internal::ResultCode, std::string); - /** - * @symbol ?popContext\@SerializerContext\@\@QEAAXXZ - */ - MCAPI void popContext(); - /** - * @symbol ?pushContext\@SerializerContext\@\@QEAAAEAV1\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z - */ - MCAPI class SerializerContext & pushContext(struct std::pair); - /** - * @symbol ??1SerializerContext\@\@QEAA\@XZ - */ - MCAPI ~SerializerContext(); - /** - * @symbol ?contextString\@SerializerContext\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z - */ - MCAPI static std::string contextString(std::vector> const &); - -}; diff --git a/LiteLoader/include/llapi/mc/SerializerEnumMapping.hpp b/LiteLoader/include/llapi/mc/SerializerEnumMapping.hpp deleted file mode 100644 index e293a2e826..0000000000 --- a/LiteLoader/include/llapi/mc/SerializerEnumMapping.hpp +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @file SerializerEnumMapping.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class SerializerEnumMapping. - * - */ -class SerializerEnumMapping { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERIALIZERENUMMAPPING -public: - class SerializerEnumMapping& operator=(class SerializerEnumMapping const &) = delete; - SerializerEnumMapping(class SerializerEnumMapping const &) = delete; - SerializerEnumMapping() = delete; -#endif - -public: - /** - * @symbol ?lookup\@SerializerEnumMapping\@\@QEBA_N_JAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI bool lookup(__int64, std::string &) const; - /** - * @symbol ?lookup\@SerializerEnumMapping\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_J\@Z - */ - MCAPI bool lookup(std::string const &, __int64 &) const; - /** - * @symbol ??4SerializerEnumMapping\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class SerializerEnumMapping & operator=(class SerializerEnumMapping &&); - /** - * @symbol ?toString\@SerializerEnumMapping\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCAPI std::string toString() const; - -}; diff --git a/LiteLoader/include/llapi/mc/SerializerTraits.hpp b/LiteLoader/include/llapi/mc/SerializerTraits.hpp deleted file mode 100644 index 48f1ed933a..0000000000 --- a/LiteLoader/include/llapi/mc/SerializerTraits.hpp +++ /dev/null @@ -1,68 +0,0 @@ -/** - * @file SerializerTraits.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SerializerTraits. - * - */ -struct SerializerTraits { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -public: - /** - * @symbol ??0SerializerTraits\@\@QEAA\@XZ - */ - MCAPI SerializerTraits(); - /** - * @symbol ??0SerializerTraits\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI SerializerTraits(struct SerializerTraits const &); - /** - * @symbol ??0SerializerTraits\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI SerializerTraits(struct SerializerTraits &&); - /** - * @symbol ?name\@SerializerTraits\@\@QEAAAEAU1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI struct SerializerTraits & name(std::string); - /** - * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@AEBU0\@\@Z - */ - MCAPI struct SerializerTraits & operator=(struct SerializerTraits const &); - /** - * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct SerializerTraits & operator=(struct SerializerTraits &&); - /** - * @symbol ?setEnumDocumentation\@SerializerTraits\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI void setEnumDocumentation(std::string); - /** - * @symbol ?validate\@SerializerTraits\@\@QEAAAEAU1\@V?$function\@$$A6A_NAEAVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z\@std\@\@\@Z - */ - MCAPI struct SerializerTraits & validate(class std::function); - /** - * @symbol ??1SerializerTraits\@\@QEAA\@XZ - */ - MCAPI ~SerializerTraits(); - -//private: - /** - * @symbol ?performValidation\@SerializerTraits\@\@AEBA_NVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z - */ - MCAPI bool performValidation(class entt::meta_any, class SerializerContext &) const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp deleted file mode 100644 index 4ea74af356..0000000000 --- a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @file ServerAutoStepSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ServerAutoStepSystem. - * - */ -class ServerAutoStepSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERAUTOSTEPSYSTEM -public: - class ServerAutoStepSystem& operator=(class ServerAutoStepSystem const &) = delete; - ServerAutoStepSystem(class ServerAutoStepSystem const &) = delete; - ServerAutoStepSystem() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol __unk_vfn_1 - */ - virtual void __unk_vfn_1(); - /** - * @vftbl 2 - * @symbol __unk_vfn_2 - */ - virtual void __unk_vfn_2(); - /** - * @vftbl 3 - * @symbol __unk_vfn_3 - */ - virtual void __unk_vfn_3(); - /** - * @vftbl 4 - * @symbol ?tick\@ServerAutoStepSystem\@\@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\@\@\@\@V?$FlagComponent\@UAutoStepRequestFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UMoveRequestComponent\@\@USlideOffsetComponent\@\@USubBBsComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z - */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Read, struct Write, struct MoveRequestComponent, struct SlideOffsetComponent, struct SubBBsComponent, struct SideBySidePlaybackBlocksComponent>, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); - /** - * @symbol ?createServerAutoStepSystem\@ServerAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createServerAutoStepSystem(); - /** - * @symbol ?createServerAutoStepSystemSideBySide\@ServerAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createServerAutoStepSystemSideBySide(); - -}; diff --git a/LiteLoader/include/llapi/mc/ServerInstance.hpp b/LiteLoader/include/llapi/mc/ServerInstance.hpp index 05bc4c50b4..f8fc2e16d9 100644 --- a/LiteLoader/include/llapi/mc/ServerInstance.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstance.hpp @@ -111,6 +111,10 @@ class ServerInstance { * @symbol ?getEditorManager\@ServerInstance\@\@QEBA?AV?$NonOwnerPointer\@VIEditorManager\@Editor\@\@\@Bedrock\@\@XZ */ MCAPI class Bedrock::NonOwnerPointer getEditorManager() const; + /** + * @symbol ?getScriptManager\@ServerInstance\@\@QEAAPEAVServerScriptManager\@\@XZ + */ + MCAPI class ServerScriptManager * getScriptManager(); /** * @symbol ?getScriptingEngineV2\@ServerInstance\@\@QEAAPEAVScriptEngine\@Scripting\@\@XZ */ @@ -120,9 +124,13 @@ class ServerInstance { */ MCAPI class ItemRegistryRef getServerItemRegistry() 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\@\@AEAVIResourcePackRepository\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@6\@AEAVResourcePackManager\@\@V?$function\@$$A6A?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@\@Z\@9\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@9\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@9\@PEAVLevelData\@\@55V?$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\@\@77V?$optional\@UPlayerMovementSettings\@\@\@9\@V?$optional\@UScriptSettings\@\@\@9\@AEBVExperiments\@\@7MV?$optional\@_N\@9\@W4ForceBlockNetworkIdsAreHashes\@\@AEBUNetworkPermissions\@\@V?$not_null\@V?$NonOwnerPointer\@VNetworkSession\@\@\@Bedrock\@\@\@6\@\@Z + * @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\@\@AEAVIResourcePackRepository\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@6\@AEAVResourcePackManager\@\@V?$function\@$$A6A?AV?$OwnerPtrT\@U?$SharePtrRefTraits\@VLevelStorage\@\@\@\@\@\@AEAVScheduler\@\@\@Z\@9\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@9\@PEAVLevelData\@\@55V?$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\@\@Z + */ + MCAPI bool initializeServer(class IMinecraftApp &, class AllowList &, class PermissionsFile *, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1>>, std::string, std::string, std::string, class LevelSettings, int, bool, struct ConnectionDefinition, bool, std::vector const &, std::string, class mce::UUID const &, class IMinecraftEventing &, class IResourcePackRepository &, class gsl::not_null> const &, class ResourcePackManager &, class std::function> (class Scheduler &)>, std::string const &, class LevelData *, std::string, std::string, std::unique_ptr, class ResourcePackManager *, class std::function, class std::function, class ServerMetrics *, class DebugEndPoint *, bool, class std::shared_ptr, struct NetworkSettingOptions const &, bool, bool, bool, class std::optional, class std::optional, class Experiments const &, bool, float, class std::optional, enum class ForceBlockNetworkIdsAreHashes, struct NetworkPermissions const &, class gsl::not_null>); + /** + * @symbol ?isRealmsStoriesEnabled\@ServerInstance\@\@QEBA_NXZ */ - MCAPI bool initializeServer(class IMinecraftApp &, class AllowList &, class PermissionsFile *, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1>>, std::string, std::string, std::string, class LevelSettings, int, bool, struct ConnectionDefinition, bool, std::vector const &, std::string, class mce::UUID const &, class IMinecraftEventing &, class IResourcePackRepository &, class gsl::not_null> const &, class ResourcePackManager &, class std::function (class Scheduler &)>, std::unique_ptr, std::string const &, class LevelData *, std::string, std::string, std::unique_ptr, class ResourcePackManager *, class std::function, class std::function, class ServerMetrics *, class DebugEndPoint *, bool, class std::shared_ptr, struct NetworkSettingOptions const &, bool, bool, class std::optional, class std::optional, class Experiments const &, bool, float, class std::optional, enum class ForceBlockNetworkIdsAreHashes, struct NetworkPermissions const &, class gsl::not_null>); + MCAPI bool isRealmsStoriesEnabled() const; /** * @symbol ?leaveGameSync\@ServerInstance\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ServerLevel.hpp b/LiteLoader/include/llapi/mc/ServerLevel.hpp index b11e111e64..0398dd3ae3 100644 --- a/LiteLoader/include/llapi/mc/ServerLevel.hpp +++ b/LiteLoader/include/llapi/mc/ServerLevel.hpp @@ -107,10 +107,6 @@ class ServerLevel { * @symbol ?runCommand\@ServerLevel\@\@UEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z */ MCVAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem); - /** - * @symbol ?saveAdditionalData\@ServerLevel\@\@UEAAXXZ - */ - MCVAPI void saveAdditionalData(); /** * @symbol ?setCommandsEnabled\@ServerLevel\@\@UEAAX_N\@Z */ @@ -129,9 +125,9 @@ class ServerLevel { MCVAPI ~ServerLevel(); #endif /** - * @symbol ??0ServerLevel\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@4\@AEAVIMinecraftEventing\@\@AEAVResourcePackManager\@\@4V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVMinecraftCommands\@\@AEAVScheduler\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@4\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@4\@VItemRegistryRef\@\@_N_NAEBUNetworkPermissions\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@\@Z + * @symbol ??0ServerLevel\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$OwnerPtrT\@U?$SharePtrRefTraits\@VLevelStorage\@\@\@\@\@\@AEAVIMinecraftEventing\@\@AEAVResourcePackManager\@\@3V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVMinecraftCommands\@\@AEAVScheduler\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@std\@\@VItemRegistryRef\@\@_N_NAEBUNetworkPermissions\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@\@Z */ - MCAPI ServerLevel(class gsl::not_null> const &, std::unique_ptr, std::unique_ptr, class IMinecraftEventing &, class ResourcePackManager &, class ResourcePackManager &, class gsl::not_null>, class MinecraftCommands &, class Scheduler &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, bool, bool, struct NetworkPermissions const &, class std::weak_ptr); + MCAPI ServerLevel(class gsl::not_null> const &, class OwnerPtrT>, class IMinecraftEventing &, class ResourcePackManager &, class ResourcePackManager &, class gsl::not_null>, class MinecraftCommands &, class Scheduler &, class gsl::not_null> const &, class WeakRefT, std::unique_ptr, std::unique_ptr, class ItemRegistryRef, bool, bool, struct NetworkPermissions const &, class std::weak_ptr); /** * @symbol ?addServerChunksToPacket\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEAVNetworkChunkPublisherUpdatePacket\@\@\@Z */ @@ -198,6 +194,10 @@ class ServerLevel { * @symbol ?_initializePlayerSleepManager\@ServerLevel\@\@AEAAXXZ */ MCAPI void _initializePlayerSleepManager(); + /** + * @symbol ?_initializeScoreboard\@ServerLevel\@\@AEAAXXZ + */ + MCAPI void _initializeScoreboard(); /** * @symbol ?_onActorEntityAdded\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z */ @@ -214,10 +214,6 @@ class ServerLevel { * @symbol ?_onNewDimensionCreated\@ServerLevel\@\@AEAAXAEAVDimension\@\@\@Z */ MCAPI void _onNewDimensionCreated(class Dimension &); - /** - * @symbol ?_onPlayerDeath\@ServerLevel\@\@AEAAXAEAVPlayer\@\@\@Z - */ - MCAPI void _onPlayerDeath(class Player &); /** * @symbol ?_onPlayerWakeUp\@ServerLevel\@\@AEAAXAEAVPlayer\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp index a37366552a..1afdff6239 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp @@ -63,9 +63,13 @@ class ServerNetworkHandler { */ MCVAPI class GameSpecificNetEventCallback * getGameSpecificNetEventCallback(); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z */ @@ -91,125 +95,121 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class CompletedUsingItemPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class UpdatePlayerGameTypePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class TickSyncPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class UpdatePlayerGameTypePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetDefaultGameTypePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormResponsePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ModalFormResponsePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EmotePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDisconnectPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class DisconnectPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z */ @@ -223,37 +223,37 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class InteractPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormResponsePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ModalFormResponsePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z */ @@ -271,9 +271,21 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z */ @@ -290,14 +302,22 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SettingsCommandPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class SubClientLoginPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class TickSyncPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z */ @@ -306,14 +326,6 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorAbsolutePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MoveActorAbsolutePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z */ @@ -338,14 +350,14 @@ class ServerNetworkHandler { * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class SubClientLoginPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimatePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AnimatePacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class InteractPacket const &); /** * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z */ @@ -355,21 +367,9 @@ class ServerNetworkHandler { */ MCVAPI void handle(class NetworkIdentifier const &, class LecternUpdatePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class SetDefaultGameTypePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &); - /** - * @symbol ?onDisconnect\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z + * @symbol ?onDisconnect\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@W4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N2\@Z */ - MCVAPI void onDisconnect(class NetworkIdentifier const &, std::string const &, bool, std::string const &); + MCVAPI void onDisconnect(class NetworkIdentifier const &, enum class Connection::DisconnectFailReason, std::string const &, bool, std::string const &); /** * @symbol ?onInvalidPlayerJoinedLobby\@ServerNetworkHandler\@\@UEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ @@ -440,13 +440,13 @@ class ServerNetworkHandler { */ MCAPI void disallowIncomingConnections(); /** - * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@W4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ - MCAPI void disconnectClient(class NetworkIdentifier const &, enum class SubClientId, std::string const &, bool); + MCAPI void disconnectClient(class NetworkIdentifier const &, enum class Connection::DisconnectFailReason, std::string const &, bool); /** - * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@W4DisconnectFailReason\@Connection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ - MCAPI void disconnectClient(class NetworkIdentifier const &, std::string const &, bool); + MCAPI void disconnectClient(class NetworkIdentifier const &, enum class SubClientId, enum class Connection::DisconnectFailReason, std::string const &, bool); /** * @symbol ?engineCancelResponseHelper\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp b/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp index 5d7ddad6c9..5a8703dbfa 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp @@ -28,28 +28,24 @@ class ServerNetworkSystem { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERNETWORKSYSTEM /** - * @symbol ?createSignalServiceSigninJob\@ServerNetworkSystem\@\@UEAA?AV?$shared_ptr\@VSignalServiceSigninJob\@\@\@std\@\@$$QEAV?$function\@$$A6AX_N\@Z\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@V?$not_null\@V?$NonOwnerPointer\@VDisconnectionRequestHandler\@\@\@Bedrock\@\@\@gsl\@\@V?$not_null\@V?$NonOwnerPointer\@VMultiplayerServiceManager\@Social\@\@\@Bedrock\@\@\@7\@V?$not_null\@V?$NonOwnerPointer\@VIMinecraftEventing\@\@\@Bedrock\@\@\@7\@\@Z + * @symbol ?createSignalServiceSigninJob\@ServerNetworkSystem\@\@UEAA?AV?$shared_ptr\@VSignalServiceSigninJob\@\@\@std\@\@$$QEAV?$function\@$$A6AX_N\@Z\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@V?$not_null\@V?$NonOwnerPointer\@VDisconnectionRequestHandler\@\@\@Bedrock\@\@\@gsl\@\@V?$not_null\@V?$NonOwnerPointer\@VServicesManager\@\@\@Bedrock\@\@\@7\@V?$not_null\@V?$NonOwnerPointer\@VIMinecraftEventing\@\@\@Bedrock\@\@\@7\@_N\@Z */ - MCVAPI class std::shared_ptr createSignalServiceSigninJob(class std::function &&, class std::function &&, class gsl::not_null>, class gsl::not_null>, class gsl::not_null>); - /** - * @symbol ?getTransportLayer\@ServerNetworkSystem\@\@UEBA?AW4TransportLayer\@\@XZ - */ - MCVAPI enum class TransportLayer getTransportLayer() const; - /** - * @symbol ?hasNetworkSession\@ServerNetworkSystem\@\@UEBA_NXZ - */ - MCVAPI bool hasNetworkSession() const; + MCVAPI class std::shared_ptr createSignalServiceSigninJob(class std::function &&, class std::function &&, class gsl::not_null>, class gsl::not_null>, class gsl::not_null>, bool); #endif /** - * @symbol ??0ServerNetworkSystem\@\@QEAA\@AEAVScheduler\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBUNetworkSystemToggles\@\@AEBV?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@V?$ServiceReference\@VServicesManager\@\@\@\@V?$not_null\@V?$NonOwnerPointer\@VNetworkSession\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0ServerNetworkSystem\@\@QEAA\@AEAVScheduler\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBUNetworkSystemToggles\@\@AEBV?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@V?$ServiceReference\@VServicesManager\@\@\@\@V?$not_null\@V?$NonOwnerPointer\@VNetworkSessionOwner\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ - MCAPI ServerNetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference, class gsl::not_null>); + MCAPI ServerNetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference, class gsl::not_null>); //private: /** - * @symbol ?_createConstructionDependencies\@ServerNetworkSystem\@\@CA?AUDependencies\@NetworkSystem\@\@W4TransportLayer\@\@PEAV1\@AEAVScheduler\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBUNetworkSystemToggles\@\@V?$ServiceReference\@VServicesManager\@\@\@\@AEBVNetherNetTransportFactory\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z + * @symbol ?_initNetworkStatistics\@ServerNetworkSystem\@\@AEAAXAEBUNetworkSystemToggles\@\@AEBV?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@\@Z + */ + MCAPI void _initNetworkStatistics(struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &); + /** + * @symbol ?_createConstructionDependencies\@ServerNetworkSystem\@\@CA?AUDependencies\@NetworkSystem\@\@PEAV1\@AEAVScheduler\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBUNetworkSystemToggles\@\@V?$ServiceReference\@VServicesManager\@\@\@\@AEBVNetherNetTransportFactory\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@V?$function\@$$A6A_NXZ\@6\@V?$not_null\@V?$NonOwnerPointer\@VNetworkSessionOwner\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ - MCAPI static struct NetworkSystem::Dependencies _createConstructionDependencies(enum class TransportLayer, class ServerNetworkSystem *, class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class ServiceReference, class NetherNetTransportFactory const &, class Bedrock::NonOwnerPointer const &); + MCAPI static struct NetworkSystem::Dependencies _createConstructionDependencies(class ServerNetworkSystem *, class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class ServiceReference, class NetherNetTransportFactory const &, class Bedrock::NonOwnerPointer const &, class std::function, class gsl::not_null>); private: diff --git a/LiteLoader/include/llapi/mc/ServerPlayer.hpp b/LiteLoader/include/llapi/mc/ServerPlayer.hpp index 001af44d86..d4bb0359fa 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayer.hpp @@ -50,497 +50,497 @@ class ServerPlayer : public Player { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@ServerPlayer\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 113 + * @vftbl 102 * @symbol ?isValidTarget\@ServerPlayer\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool isValidTarget(class Actor *) const; /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@ServerPlayer\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 148 + * @vftbl 136 * @symbol ?setArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 158 + * @vftbl 146 * @symbol ?setOffhandSlot\@ServerPlayer\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 163 + * @vftbl 151 * @symbol ?load\@ServerPlayer\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 175 + * @vftbl 163 * @symbol ?canChangeDimensionsUsingPortal\@ServerPlayer\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 177 + * @vftbl 165 * @symbol ?changeDimension\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimension(class AutomaticID); /** - * @vftbl 178 + * @vftbl 166 * @symbol ?getControllingPlayer\@ServerPlayer\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 179 + * @vftbl 167 * @symbol ?checkFallDamage\@ServerPlayer\@\@UEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 181 + * @vftbl 169 * @symbol ?handleFallDistanceOnServer\@ServerPlayer\@\@UEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 207 + * @vftbl 194 * @symbol ?onEffectAdded\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectAdded(class MobEffectInstance &); /** - * @vftbl 208 + * @vftbl 195 * @symbol ?onEffectUpdated\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectUpdated(class MobEffectInstance &); /** - * @vftbl 209 + * @vftbl 196 * @symbol ?onEffectRemoved\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectRemoved(class MobEffectInstance &); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?knockback\@ServerPlayer\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@ServerPlayer\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 305 + * @vftbl 288 * @symbol ?hurtArmorSlots\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z */ virtual void hurtArmorSlots(class ActorDamageSource const &, int, class std::bitset<4>); /** - * @vftbl 306 + * @vftbl 289 * @symbol ?setDamagedArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setDamagedArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 307 + * @vftbl 290 * @symbol ?sendArmorDamage\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmorDamage(class std::bitset<4>); /** - * @vftbl 308 + * @vftbl 291 * @symbol ?sendArmor\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmor(class std::bitset<4>); /** - * @vftbl 318 + * @vftbl 301 * @symbol ?clearVanishEnchantedItemsOnDeath\@ServerPlayer\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 319 + * @vftbl 302 * @symbol ?sendInventory\@ServerPlayer\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?prepareRegion\@ServerPlayer\@\@UEAAXAEAVChunkSource\@\@\@Z */ virtual void prepareRegion(class ChunkSource &); /** - * @vftbl 346 + * @vftbl 326 * @symbol ?destroyRegion\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyRegion(); /** - * @vftbl 351 + * @vftbl 331 * @symbol ?changeDimensionWithCredits\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimensionWithCredits(class AutomaticID); /** - * @vftbl 352 + * @vftbl 332 * @symbol ?tickWorld\@ServerPlayer\@\@UEAAXAEBUTick\@\@\@Z */ virtual void tickWorld(struct Tick const &); /** - * @vftbl 353 - * @symbol __unk_vfn_353 + * @vftbl 333 + * @symbol __unk_vfn_333 */ - virtual void __unk_vfn_353(); + virtual void __unk_vfn_333(); /** - * @vftbl 355 + * @vftbl 335 * @symbol ?moveView\@ServerPlayer\@\@UEAAXXZ */ virtual void moveView(); /** - * @vftbl 356 + * @vftbl 336 * @symbol ?moveSpawnView\@ServerPlayer\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void moveSpawnView(class Vec3 const &, class AutomaticID); /** - * @vftbl 359 + * @vftbl 339 * @symbol ?checkMovementStats\@ServerPlayer\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void checkMovementStats(class Vec3 const &); /** - * @vftbl 360 - * @symbol __unk_vfn_360 + * @vftbl 340 + * @symbol __unk_vfn_340 */ - virtual void __unk_vfn_360(); + virtual void __unk_vfn_340(); /** - * @vftbl 361 - * @symbol __unk_vfn_361 + * @vftbl 341 + * @symbol __unk_vfn_341 */ - virtual void __unk_vfn_361(); + virtual void __unk_vfn_341(); /** - * @vftbl 362 + * @vftbl 342 * @symbol ?respawn\@ServerPlayer\@\@UEAAXXZ */ virtual void respawn(); /** - * @vftbl 363 - * @symbol __unk_vfn_363 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_363(); + virtual void __unk_vfn_343(); /** - * @vftbl 364 - * @symbol __unk_vfn_364 + * @vftbl 344 + * @symbol __unk_vfn_344 */ - virtual void __unk_vfn_364(); + virtual void __unk_vfn_344(); /** - * @vftbl 369 - * @symbol __unk_vfn_369 + * @vftbl 349 + * @symbol __unk_vfn_349 */ - virtual void __unk_vfn_369(); + virtual void __unk_vfn_349(); /** - * @vftbl 370 - * @symbol __unk_vfn_370 + * @vftbl 350 + * @symbol __unk_vfn_350 */ - virtual void __unk_vfn_370(); + virtual void __unk_vfn_350(); /** - * @vftbl 371 + * @vftbl 351 * @symbol ?openTrading\@ServerPlayer\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z */ virtual void openTrading(struct ActorUniqueID const &, bool); /** - * @vftbl 373 - * @symbol __unk_vfn_373 + * @vftbl 353 + * @symbol __unk_vfn_353 */ - virtual void __unk_vfn_373(); + virtual void __unk_vfn_353(); /** - * @vftbl 374 + * @vftbl 354 * @symbol ?openNpcInteractScreen\@ServerPlayer\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z */ virtual void openNpcInteractScreen(class std::shared_ptr); /** - * @vftbl 375 + * @vftbl 355 * @symbol ?openInventory\@ServerPlayer\@\@UEAAXXZ */ virtual void openInventory(); /** - * @vftbl 376 - * @symbol __unk_vfn_376 + * @vftbl 356 + * @symbol __unk_vfn_356 */ - virtual void __unk_vfn_376(); + virtual void __unk_vfn_356(); /** - * @vftbl 377 - * @symbol __unk_vfn_377 + * @vftbl 357 + * @symbol __unk_vfn_357 */ - virtual void __unk_vfn_377(); + virtual void __unk_vfn_357(); /** - * @vftbl 378 + * @vftbl 358 * @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 &, std::string const &, std::string const &); /** - * @vftbl 379 + * @vftbl 359 * @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 &, std::string const &, std::string const &); /** - * @vftbl 380 + * @vftbl 360 * @symbol ?displayTextObjectWhisperMessage\@ServerPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ virtual void displayTextObjectWhisperMessage(std::string const &, std::string const &, std::string const &); /** - * @vftbl 381 + * @vftbl 361 * @symbol ?displayWhisperMessage\@ServerPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ virtual void displayWhisperMessage(std::string const &, std::string const &, std::string const &, std::string const &); /** - * @vftbl 383 + * @vftbl 363 * @symbol ?stopSleepInBed\@ServerPlayer\@\@UEAAX_N0\@Z */ virtual void stopSleepInBed(bool, bool); /** - * @vftbl 387 + * @vftbl 367 * @symbol ?openSign\@ServerPlayer\@\@UEAAXAEBVBlockPos\@\@_N\@Z */ virtual void openSign(class BlockPos const &, bool); /** - * @vftbl 388 - * @symbol __unk_vfn_388 + * @vftbl 368 + * @symbol __unk_vfn_368 */ - virtual void __unk_vfn_388(); + virtual void __unk_vfn_368(); /** - * @vftbl 389 + * @vftbl 369 * @symbol ?isHostingPlayer\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 390 + * @vftbl 370 * @symbol ?isLoading\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isLoading() const; /** - * @vftbl 391 + * @vftbl 371 * @symbol ?isPlayerInitialized\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isPlayerInitialized() const; /** - * @vftbl 392 - * @symbol __unk_vfn_392 + * @vftbl 372 + * @symbol __unk_vfn_372 */ - virtual void __unk_vfn_392(); + virtual void __unk_vfn_372(); /** - * @vftbl 395 + * @vftbl 375 * @symbol ?setPlayerGameType\@ServerPlayer\@\@UEAAXW4GameType\@\@\@Z */ virtual void setPlayerGameType(enum class GameType); /** - * @vftbl 399 - * @symbol __unk_vfn_399 + * @vftbl 379 + * @symbol __unk_vfn_379 */ - virtual void __unk_vfn_399(); + virtual void __unk_vfn_379(); /** - * @vftbl 403 + * @vftbl 383 * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z */ virtual void setContainerData(class IContainerManager &, int, int); /** - * @vftbl 404 + * @vftbl 384 * @symbol ?slotChanged\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@AEAVContainer\@\@HAEBVItemStack\@\@2_N\@Z */ virtual void slotChanged(class IContainerManager &, class Container &, int, class ItemStack const &, class ItemStack const &, bool); /** - * @vftbl 406 + * @vftbl 386 * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z */ virtual void refreshContainer(class IContainerManager &); /** - * @vftbl 408 + * @vftbl 388 * @symbol ?isActorRelevant\@ServerPlayer\@\@UEAA_NAEBVActor\@\@\@Z */ virtual bool isActorRelevant(class Actor const &); /** - * @vftbl 409 + * @vftbl 389 * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isTeacher() const; /** - * @vftbl 410 + * @vftbl 390 * @symbol ?onSuspension\@ServerPlayer\@\@UEAAXXZ */ virtual void onSuspension(); /** - * @vftbl 411 + * @vftbl 391 * @symbol ?onLinkedSlotsChanged\@ServerPlayer\@\@UEAAXXZ */ virtual void onLinkedSlotsChanged(); /** - * @vftbl 417 + * @vftbl 397 * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z */ virtual void sendInventoryTransaction(class InventoryTransaction const &) const; /** - * @vftbl 418 + * @vftbl 398 * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z */ virtual void sendComplexInventoryTransaction(std::unique_ptr) const; /** - * @vftbl 419 + * @vftbl 399 * @symbol ?sendNetworkPacket\@ServerPlayer\@\@UEBAXAEAVPacket\@\@\@Z */ virtual void sendNetworkPacket(class Packet &) const; /** - * @vftbl 420 + * @vftbl 400 * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ */ virtual class PlayerEventCoordinator & getPlayerEventCoordinator(); /** - * @vftbl 421 + * @vftbl 401 * @symbol ?reportMovementTelemetry\@ServerPlayer\@\@UEAAXW4MovementEventType\@\@\@Z */ virtual void reportMovementTelemetry(enum class MovementEventType); /** - * @vftbl 422 - * @symbol __unk_vfn_422 + * @vftbl 402 + * @symbol __unk_vfn_402 */ - virtual void __unk_vfn_422(); + virtual void __unk_vfn_402(); /** - * @vftbl 425 - * @symbol __unk_vfn_425 + * @vftbl 405 + * @symbol __unk_vfn_405 */ - virtual void __unk_vfn_425(); + virtual void __unk_vfn_405(); /** - * @vftbl 426 + * @vftbl 406 * @symbol ?getMaxChunkBuildRadius\@ServerPlayer\@\@UEBAEXZ */ virtual unsigned char getMaxChunkBuildRadius() const; /** - * @vftbl 430 + * @vftbl 410 * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const; /** - * @vftbl 431 + * @vftbl 411 * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer(); /** - * @vftbl 432 + * @vftbl 412 * @symbol ?_getSpawnChunkLimit\@ServerPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 433 + * @vftbl 413 * @symbol ?_updateChunkPublisherView\@ServerPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); @@ -562,6 +562,10 @@ class ServerPlayer : public Player { * @symbol ??0ServerPlayer\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@AEAVNetworkSystem\@\@AEAVActiveTransfersManager\@Server\@ClientBlobCache\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@V?$function\@$$A6AXAEAVServerPlayer\@\@\@Z\@std\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@9V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@H_NAEAVEntityContext\@\@\@Z */ MCAPI ServerPlayer(class Level &, class PacketSender &, class NetworkSystem &, class ClientBlobCache::Server::ActiveTransfersManager &, enum class GameType, class NetworkIdentifier const &, enum class SubClientId, class std::function, class mce::UUID, std::string const &, std::string const &, std::unique_ptr, int, bool, class EntityContext &); + /** + * @symbol ?acceptClientPosition\@ServerPlayer\@\@QEAAXAEBVVec3\@\@\@Z + */ + MCAPI void acceptClientPosition(class Vec3 const &); /** * @symbol ?addActorToReplicationList\@ServerPlayer\@\@QEAAXV?$not_null\@PEAVActor\@\@\@gsl\@\@_N\@Z */ @@ -646,10 +650,6 @@ class ServerPlayer : public Player { * @symbol ?setPlayerInput\@ServerPlayer\@\@QEAAXMM_N0\@Z */ MCAPI void setPlayerInput(float, float, bool, bool); - /** - * @symbol ?setSyncTimeIfClientServerPositionMatches\@ServerPlayer\@\@QEAAXAEBVVec3\@\@\@Z - */ - MCAPI void setSyncTimeIfClientServerPositionMatches(class Vec3 const &); /** * @symbol ?triggerRespawnFromCompletingTheEnd\@ServerPlayer\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp index 8641ad3004..aff0b13930 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp @@ -31,10 +31,6 @@ class ServerPlayerFallDamageSystem { * @symbol ?_doServerPlayerFallDamageSystem\@ServerPlayerFallDamageSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAbilitiesComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasTeleportedFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UHasTeleportedFlag\@\@\@\@V?$FlagComponent\@USendPlayerOnGroundRequestFlag\@\@\@\@UCheckFallDamageRequestComponent\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z */ MCAPI static void _doServerPlayerFallDamageSystem(class StrictEntityContext const &, struct AbilitiesComponent const &, struct SynchedActorDataComponent const &, struct StateVectorComponent const &, struct FallDistanceComponent &, class Optional const>, class Optional const>, class Optional const>, class EntityModifierT, class FlagComponent, struct CheckFallDamageRequestComponent, class FlagComponent>); - /** - * @symbol ?_tickServerPlayerFallDamageSystem\@ServerPlayerFallDamageSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@$$CBUAbilitiesComponent\@\@$$CBUSynchedActorDataComponent\@\@$$CBUStateVectorComponent\@\@UFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasTeleportedFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UHasTeleportedFlag\@\@\@\@V?$FlagComponent\@USendPlayerOnGroundRequestFlag\@\@\@\@UCheckFallDamageRequestComponent\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void _tickServerPlayerFallDamageSystem(class ViewT, class FlagComponent>, struct AbilitiesComponent const, struct SynchedActorDataComponent const, struct StateVectorComponent const, struct FallDistanceComponent, class Optional const>, class Optional const>, class Optional const>>, class EntityModifierT, class FlagComponent, struct CheckFallDamageRequestComponent, class FlagComponent>); /** * @symbol ?createSystem\@ServerPlayerFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp index 17ceac14a7..9de228b9b1 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp @@ -30,8 +30,24 @@ class ServerPlayerMovementSystem { public: /** - * @symbol ?createSystems\@ServerPlayerMovementSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$0BE\@\@std\@\@XZ + * @symbol ?_updateFallDistance\@ServerPlayerMovementSystem\@\@SAXAEBUServerPlayerCurrentMovementComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@\@Z */ - MCAPI static class std::array createSystems(); + MCAPI static void _updateFallDistance(struct ServerPlayerCurrentMovementComponent const &, struct StateVectorComponent const &, struct FallDistanceComponent &); + /** + * @symbol ?createPostInputSystems\@ServerPlayerMovementSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$01\@std\@\@XZ + */ + MCAPI static class std::array createPostInputSystems(); + /** + * @symbol ?createPostTravelSystems\@ServerPlayerMovementSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$03\@std\@\@XZ + */ + MCAPI static class std::array createPostTravelSystems(); + /** + * @symbol ?createPreInputSystems\@ServerPlayerMovementSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$02\@std\@\@XZ + */ + MCAPI static class std::array createPreInputSystems(); + /** + * @symbol ?createServerPlayerMovementFinalSystem\@ServerPlayerMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createServerPlayerMovementFinalSystem(); }; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp index dddc9c1f2e..eedf0a2613 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp @@ -20,8 +20,8 @@ namespace ServerPlayerMovementSystemUtils { #undef AFTER_EXTRA /** - * @symbol ?_handlePlayerAuthInputPacketEnd\@ServerPlayerMovementSystemUtils\@\@YAXAEBUServerPlayerCurrentMovementComponent\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_checkIfServerShouldCorrectForSneaking\@ServerPlayerMovementSystemUtils\@\@YAXU?$type_list\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@entt\@\@AEAUServerPlayerCurrentMovementComponent\@\@AEAVActorOwnerComponent\@\@\@Z */ - MCAPI void _handlePlayerAuthInputPacketEnd(struct ServerPlayerCurrentMovementComponent const &, class ActorOwnerComponent &); + MCAPI void _checkIfServerShouldCorrectForSneaking(struct entt::type_list>>, struct ServerPlayerCurrentMovementComponent &, class ActorOwnerComponent &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ServerScoreboard.hpp b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp index 785be737dc..5f64b7fec1 100644 --- a/LiteLoader/include/llapi/mc/ServerScoreboard.hpp +++ b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp @@ -128,6 +128,10 @@ class ServerScoreboard { * @symbol ?initializeImGui\@ServerScoreboard\@\@QEAAXAEAVLevel\@\@\@Z */ MCAPI void initializeImGui(class Level &); + /** + * @symbol ?initializeWithLevelStorageManager\@ServerScoreboard\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void initializeWithLevelStorageManager(class LevelStorageManager &); /** * @symbol ?serialize\@ServerScoreboard\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ @@ -154,6 +158,10 @@ class ServerScoreboard { MCAPI void setSetDisplayObjectiveCallback(class std::function); //private: + /** + * @symbol ?_onSaveEvent\@ServerScoreboard\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _onSaveEvent(class LevelStorage &); /** * @symbol ?_stopTrackingObjective\@ServerScoreboard\@\@AEAAXAEBVObjective\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp b/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp index ac1d002d8a..79b5da08b5 100644 --- a/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp +++ b/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp @@ -34,7 +34,7 @@ class ServerScriptDebugCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ServerScriptDebugCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/ServerScriptManager.hpp b/LiteLoader/include/llapi/mc/ServerScriptManager.hpp index 06c296475b..1e5dfb5278 100644 --- a/LiteLoader/include/llapi/mc/ServerScriptManager.hpp +++ b/LiteLoader/include/llapi/mc/ServerScriptManager.hpp @@ -117,6 +117,10 @@ class ServerScriptManager { * @symbol ?getScriptEngine\@ServerScriptManager\@\@QEAAAEAVScriptEngine\@Scripting\@\@XZ */ MCAPI class Scripting::ScriptEngine & getScriptEngine(); + /** + * @symbol ?getScriptSettings\@ServerScriptManager\@\@QEAAAEAUScriptSettings\@\@XZ + */ + MCAPI struct ScriptSettings & getScriptSettings(); /** * @symbol ?onMainThreadStartLeaveGame\@ServerScriptManager\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp index 0316eee907..daeec35365 100644 --- a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ServerSettingsRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerSettingsRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerSettingsRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ServerSettingsRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp index ddeb54ddb0..55b93bdd80 100644 --- a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -20,6 +21,8 @@ class ServerSettingsResponsePacket : public Packet { #define AFTER_EXTRA // Add Member There + unsigned int mFormId; + string mFormJSON; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERSETTINGSRESPONSEPACKET @@ -51,9 +54,9 @@ class ServerSettingsResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerSettingsResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerSettingsResponsePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ServerSettingsResponsePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp b/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp index 46ad8e0017..dbad34ddbb 100644 --- a/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp @@ -10,34 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class ServerStandInCauldronSystem. - * - */ -class ServerStandInCauldronSystem { + +namespace ServerStandInCauldronSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERSTANDINCAULDRONSYSTEM -public: - class ServerStandInCauldronSystem& operator=(class ServerStandInCauldronSystem const &) = delete; - ServerStandInCauldronSystem(class ServerStandInCauldronSystem const &) = delete; - ServerStandInCauldronSystem() = delete; -#endif - -public: - /** - * @symbol ?_checkInsideCauldron\@ServerStandInCauldronSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _checkInsideCauldron(class StrictEntityContext &, class ActorOwnerComponent &); - /** - * @symbol ?_tickSystem\@ServerStandInCauldronSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUpdateWaterStateRequestComponent\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickSystem(class ViewT, class ActorOwnerComponent>); /** - * @symbol ?createSystem\@ServerStandInCauldronSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ServerStandInCauldronSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createSystem(); + MCAPI struct TickingSystemWithInfo createSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp index aebfe55e0a..fe49e33d91 100644 --- a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -50,8 +51,8 @@ class ServerStatsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); }; diff --git a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp index c2a25ab907..c987754f89 100644 --- a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ServerToClientHandshakePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ServerToClientHandshakePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ServerToClientHandshakePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERTOCLIENTHANDSHAKEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp index 8f80acc191..1de4e09254 100644 --- a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetActorDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetActorDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetActorDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp index 65c78ca729..944e7c4647 100644 --- a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetActorLinkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetActorLinkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetActorLinkPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORLINKPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp index 0d9c816e06..78f2bd8a29 100644 --- a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp @@ -10,30 +10,19 @@ #undef BEFORE_EXTRA -/** - * @brief MC class SetActorLinkPacketSystemImpl. - * - */ -class SetActorLinkPacketSystemImpl { + +namespace SetActorLinkPacketSystemImpl { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SETACTORLINKPACKETSYSTEMIMPL -public: - class SetActorLinkPacketSystemImpl& operator=(class SetActorLinkPacketSystemImpl const &) = delete; - SetActorLinkPacketSystemImpl(class SetActorLinkPacketSystemImpl const &) = delete; - SetActorLinkPacketSystemImpl() = delete; -#endif - -public: /** - * @symbol ?_setActorLinkPacketSystem\@SetActorLinkPacketSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBURemovePassengersComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UPassengerInitiatedFlag\@\@\@\@\@\@AEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z + * @symbol ?sendActorLinkPacket\@SetActorLinkPacketSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBURemovePassengersComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@$$CBUActorUniqueIDComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z */ - MCAPI static void _setActorLinkPacketSystem(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct RemovePassengersComponent const &, class Optional const>, class Optional const>, class ViewT &, class EntityModifierT); + MCAPI void sendActorLinkPacket(class StrictEntityContext const &, struct ActorUniqueIDComponent const &, struct RemovePassengersComponent const &, class ViewT>, struct ActorUniqueIDComponent const, class Optional const>, class Optional const>>, class EntityModifierT); /** - * @symbol ?setActorLinkPacketSystem\@SetActorLinkPacketSystemImpl\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@$$CBUActorUniqueIDComponent\@\@$$CBURemovePassengersComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UPassengerInitiatedFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z + * @symbol ?singleSendActorLinkPacket\@SetActorLinkPacketSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorUniqueIDComponent\@\@URemovePassengersComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Exclude\@V?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@$$CBUActorUniqueIDComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z */ - MCAPI static void setActorLinkPacketSystem(class ViewT>, struct ActorUniqueIDComponent const, struct RemovePassengersComponent const, class Optional const>, class Optional const>>, class ViewT, class EntityModifierT); + MCAPI void singleSendActorLinkPacket(class StrictEntityContext const &, struct PassengerComponent const &, class ViewT, class ViewT>, struct ActorUniqueIDComponent const, class Optional const>, class Optional const>>, class EntityModifierT); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp index feacacc463..14ea97824b 100644 --- a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class SetActorMotionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetActorMotionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetActorMotionPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORMOTIONPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SetActorMotionPacket(); #endif - /** - * @symbol ??0SetActorMotionPacket\@\@QEAA\@XZ - */ - MCAPI SetActorMotionPacket(); /** * @symbol ??0SetActorMotionPacket\@\@QEAA\@AEBVActor\@\@\@Z */ MCAPI SetActorMotionPacket(class Actor const &); + /** + * @symbol ??0SetActorMotionPacket\@\@QEAA\@XZ + */ + MCAPI SetActorMotionPacket(); }; diff --git a/LiteLoader/include/llapi/mc/SetBlockCommand.hpp b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp index d620b57e91..ec1c9b4cdb 100644 --- a/LiteLoader/include/llapi/mc/SetBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp @@ -36,7 +36,7 @@ class SetBlockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SetBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp index 630d964910..40ed6354c7 100644 --- a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class SetCommandsEnabledPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetCommandsEnabledPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetCommandsEnabledPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETCOMMANDSENABLEDPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SetCommandsEnabledPacket(); #endif - /** - * @symbol ??0SetCommandsEnabledPacket\@\@QEAA\@_N\@Z - */ - MCAPI SetCommandsEnabledPacket(bool); /** * @symbol ??0SetCommandsEnabledPacket\@\@QEAA\@XZ */ MCAPI SetCommandsEnabledPacket(); + /** + * @symbol ??0SetCommandsEnabledPacket\@\@QEAA\@_N\@Z + */ + MCAPI SetCommandsEnabledPacket(bool); }; diff --git a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp index d965aadbab..7c93d35a15 100644 --- a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetDefaultGameTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetDefaultGameTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetDefaultGameTypePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SetDefaultGameTypePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp index dc27bb7faf..edcc834184 100644 --- a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetDifficultyPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetDifficultyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetDifficultyPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETDIFFICULTYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp index 683b855e0e..3786d05621 100644 --- a/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class SetDisplayObjectivePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetDisplayObjectivePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetDisplayObjectivePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETDISPLAYOBJECTIVEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp b/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp deleted file mode 100644 index 1d6cf39207..0000000000 --- a/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file SetEntityInsideSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace SetEntityInsideSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?createCleanupSystem\@SetEntityInsideSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createCleanupSystem(); - /** - * @symbol ?createSpectatorFilterSystem\@SetEntityInsideSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createSpectatorFilterSystem(); - /** - * @symbol ?createSystem\@SetEntityInsideSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI struct TickingSystemWithInfo createSystem(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SetEntityInsideSystemImpl.hpp b/LiteLoader/include/llapi/mc/SetEntityInsideSystemImpl.hpp deleted file mode 100644 index 85cccdb79c..0000000000 --- a/LiteLoader/include/llapi/mc/SetEntityInsideSystemImpl.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @file SetEntityInsideSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class SetEntityInsideSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SETENTITYINSIDESYSTEMIMPL -public: - class SetEntityInsideSystemImpl& operator=(class SetEntityInsideSystemImpl const &) = delete; - SetEntityInsideSystemImpl(class SetEntityInsideSystemImpl const &) = delete; - SetEntityInsideSystemImpl() = delete; -#endif - -public: - -//private: - /** - * @symbol ?_blockProcess\@SetEntityInsideSystemImpl\@\@CAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UInsideBubbleColumnBlockComponent\@\@U?$InsideBlockWithPosAndBlockComponent\@UCactusBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UGenericBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UHoneyBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@USweetBerryBushBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@U?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@V?$FlagComponent\@UWebBlockTag\@\@\@\@\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAU?$InsideBlockWithPosAndBlockComponent\@UGenericBlockFlag\@\@\@\@AEBVIConstBlockSource\@\@P6A_N2\@Z\@Z - */ - MCAPI static void _blockProcess(class StrictEntityContext const &, class EntityModifierT, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosComponent, class FlagComponent>, class Block const &, class BlockPos const &, struct InsideBlockWithPosAndBlockComponent &, class IConstBlockSource const &, bool ( *)(class Block const &)); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/SetHealthPacket.hpp b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp index 44a78b05e3..9fd83fd894 100644 --- a/LiteLoader/include/llapi/mc/SetHealthPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class SetHealthPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetHealthPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetHealthPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETHEALTHPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp index 8bc8444bcc..15481d4ae5 100644 --- a/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetLastHurtByPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetLastHurtByPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetLastHurtByPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETLASTHURTBYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp index 740f750a6b..8c1b308e55 100644 --- a/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetLocalPlayerAsInitializedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetLocalPlayerAsInitializedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetLocalPlayerAsInitializedPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SetLocalPlayerAsInitializedPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp index 935ef16d5d..5d824d84e9 100644 --- a/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp @@ -36,7 +36,7 @@ class SetMaxPlayersCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SetMaxPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp index c4c56385e9..e94e265098 100644 --- a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetPlayerGameTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetPlayerGameTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetPlayerGameTypePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SetPlayerGameTypePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp index ea38f6118c..1bead958f9 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp @@ -31,9 +31,5 @@ class SetPreviousPosRotSystem { * @symbol ?_setPreviousPosRot\@SetPreviousPosRotSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUStateVectorComponent\@\@AEAUActorRotationComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPrevPosRotSetThisTickFlag\@\@\@\@\@\@\@Z */ MCAPI static void _setPreviousPosRot(class StrictEntityContext &, struct StateVectorComponent &, struct ActorRotationComponent &, class EntityModifierT>); - /** - * @symbol ?_setPreviousPosRotSystem\@SetPreviousPosRotSystem\@\@SAXAEBVEntityContext\@\@\@Z - */ - MCAPI static void _setPreviousPosRotSystem(class EntityContext const &); }; diff --git a/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp index b93cefb00d..7578fa7ea5 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp @@ -37,10 +37,6 @@ class SetPreviousPositionSystem { * @symbol ?_doSetPreviousPositionSystem\@SetPreviousPositionSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _doSetPreviousPositionSystem(class StrictEntityContext const &, struct StateVectorComponent &); - /** - * @symbol ?_tickSetPreviousPositionSystem\@SetPreviousPositionSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UNeedSetPreviousPosition\@\@\@\@\@\@UStateVectorComponent\@\@\@\@\@Z - */ - MCAPI static void _tickSetPreviousPositionSystem(class ViewT, class FlagComponent>, struct StateVectorComponent>); private: diff --git a/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp index 8f0e28eea3..e47ba618d5 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp @@ -29,12 +29,4 @@ class SetPreviousWalkDistSystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); -//private: - /** - * @symbol ?_tickWalkDistPrevSystem\@SetPreviousWalkDistSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUWalkDistComponent\@\@UWalkDistPrevComponent\@\@\@\@\@Z - */ - MCAPI static void _tickWalkDistPrevSystem(class ViewT>, struct WalkDistComponent const, struct WalkDistPrevComponent>); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/SetScorePacket.hpp b/LiteLoader/include/llapi/mc/SetScorePacket.hpp index 02137e00e3..510c950e7f 100644 --- a/LiteLoader/include/llapi/mc/SetScorePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScorePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class SetScorePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetScorePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetScorePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETSCOREPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp index 1ab50e6041..e83d498515 100644 --- a/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class SetScoreboardIdentityPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetScoreboardIdentityPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetScoreboardIdentityPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETSCOREBOARDIDENTITYPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp index 6708bd202a..21229859f9 100644 --- a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,19 +52,15 @@ class SetSpawnPositionPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetSpawnPositionPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetSpawnPositionPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETSPAWNPOSITIONPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SetSpawnPositionPacket(); #endif - /** - * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@W4SpawnPositionType\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI SetSpawnPositionPacket(enum class SpawnPositionType, class AutomaticID, class BlockPos const &); /** * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@1\@Z */ @@ -72,5 +69,9 @@ class SetSpawnPositionPacket : public Packet { * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@XZ */ MCAPI SetSpawnPositionPacket(); + /** + * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@W4SpawnPositionType\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI SetSpawnPositionPacket(enum class SpawnPositionType, class AutomaticID, class BlockPos const &); }; diff --git a/LiteLoader/include/llapi/mc/SetTimePacket.hpp b/LiteLoader/include/llapi/mc/SetTimePacket.hpp index c26709a9ea..5aaa7ca99e 100644 --- a/LiteLoader/include/llapi/mc/SetTimePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTimePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SetTimePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetTimePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetTimePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETTIMEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp index c4ef84e77a..a8e57f8948 100644 --- a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ enum class TitleType; virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SetTitlePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SetTitlePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETTITLEPACKET /** * @symbol __unk_destructor_-1 @@ -69,22 +70,22 @@ enum class TitleType; * @symbol ??0SetTitlePacket\@\@QEAA\@XZ */ MCAPI SetTitlePacket(); - /** - * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z - */ - MCAPI SetTitlePacket(int, int, int); /** * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@\@Z */ MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType); /** - * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z */ - MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, std::string const &); + MCAPI SetTitlePacket(int, int, int); /** * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBVResolvedTextObject\@\@\@Z */ MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, class ResolvedTextObject const &); + /** + * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, std::string const &); /** * @symbol ??4SetTitlePacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp index 7e3f4fb685..cb5178f9fc 100644 --- a/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp @@ -36,7 +36,7 @@ class SetWorldSpawnCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SetWorldSpawnCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp index 9c02635ca7..0b4915623d 100644 --- a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp +++ b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SettingsCommandPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SettingsCommandPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SettingsCommandPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SettingsCommandPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp index cb9c39cf92..64ffb0c099 100644 --- a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp @@ -86,9 +86,9 @@ class ShapedRecipe : public Recipe { MCVAPI ~ShapedRecipe(); #endif /** - * @symbol ??0ShapedRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z + * @symbol ??0ShapedRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z */ - MCAPI ShapedRecipe(class std::basic_string_view>, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); + MCAPI ShapedRecipe(class std::basic_string_view>, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &); /** * @symbol ?getIngredientsHashOffset\@ShapedRecipe\@\@QEBA_KHHHH\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp index 389f959890..ce4667fbdc 100644 --- a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp @@ -86,8 +86,8 @@ class ShapelessRecipe : public Recipe { MCVAPI ~ShapelessRecipe(); #endif /** - * @symbol ??0ShapelessRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z + * @symbol ??0ShapelessRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z */ - MCAPI ShapelessRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); + MCAPI ShapelessRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &); }; diff --git a/LiteLoader/include/llapi/mc/ShearsItem.hpp b/LiteLoader/include/llapi/mc/ShearsItem.hpp index 66d92ba292..7095f551dc 100644 --- a/LiteLoader/include/llapi/mc/ShearsItem.hpp +++ b/LiteLoader/include/llapi/mc/ShearsItem.hpp @@ -52,10 +52,10 @@ class ShearsItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@ShearsItem\@\@UEBA_NAEBVBlock\@\@\@Z @@ -142,7 +142,7 @@ class ShearsItem : public Item { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@ShearsItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/Sheep.hpp b/LiteLoader/include/llapi/mc/Sheep.hpp index 1db1c1d2ba..51aded4bde 100644 --- a/LiteLoader/include/llapi/mc/Sheep.hpp +++ b/LiteLoader/include/llapi/mc/Sheep.hpp @@ -37,125 +37,125 @@ class Sheep : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Sheep\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Sheep\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp index 544a2cf8ef..86ffc20f60 100644 --- a/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp @@ -37,10 +37,6 @@ class SheepPreAIStepSystem { * @symbol ?_doSheepPreAIStepSystem\@SheepPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doSheepPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - /** - * @symbol ?_tickSheepPreAIStepSystem\@SheepPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@USheepFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickSheepPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/ShieldItem.hpp b/LiteLoader/include/llapi/mc/ShieldItem.hpp index 41ce8b53ef..76491bd2f7 100644 --- a/LiteLoader/include/llapi/mc/ShieldItem.hpp +++ b/LiteLoader/include/llapi/mc/ShieldItem.hpp @@ -52,10 +52,10 @@ class ShieldItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 49 * @symbol ?isHandEquipped\@ShieldItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp b/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp index f6495e863f..1aedc15f5d 100644 --- a/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp @@ -67,6 +67,10 @@ class ShooterItemComponent { * @symbol ?use\@ShooterItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI bool use(class ItemStack &, class Player &) const; + /** + * @symbol ?useTimeDepleted\@ShooterItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVPlayer\@\@\@Z + */ + MCAPI void useTimeDepleted(class ItemStack &, class Player &) const; /** * @symbol ?bindType\@ShooterItemComponent\@\@SAXXZ */ diff --git a/LiteLoader/include/llapi/mc/ShortTag.hpp b/LiteLoader/include/llapi/mc/ShortTag.hpp index 824131b30a..606d984148 100644 --- a/LiteLoader/include/llapi/mc/ShortTag.hpp +++ b/LiteLoader/include/llapi/mc/ShortTag.hpp @@ -46,9 +46,9 @@ short val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@ShortTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@ShortTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,12 +79,6 @@ short val; * @symbol ?hash\@ShortTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHORTTAG - /** - * @symbol ?write\@ShortTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; -#endif /** * @symbol ??0ShortTag\@\@QEAA\@F\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShovelItem.hpp b/LiteLoader/include/llapi/mc/ShovelItem.hpp index 872d1214e2..431592239b 100644 --- a/LiteLoader/include/llapi/mc/ShovelItem.hpp +++ b/LiteLoader/include/llapi/mc/ShovelItem.hpp @@ -58,10 +58,10 @@ class ShovelItem : public DiggerItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@ShovelItem\@\@UEBA_NAEBVBlock\@\@\@Z @@ -128,7 +128,7 @@ class ShovelItem : public DiggerItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@ShovelItem\@\@MEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp index 424fb92461..5f5d7ec566 100644 --- a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -64,9 +65,9 @@ class ShowCreditsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ShowCreditsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ShowCreditsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHOWCREDITSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp index 71992f32ff..af8f33d952 100644 --- a/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ShowProfilePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ShowProfilePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ShowProfilePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ShowProfilePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp index 20eb7c1f64..1f174da17f 100644 --- a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class ShowStoreOfferPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ShowStoreOfferPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ShowStoreOfferPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0ShowStoreOfferPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Shulker.hpp b/LiteLoader/include/llapi/mc/Shulker.hpp index 9aa6d03d87..d7a840c8b6 100644 --- a/LiteLoader/include/llapi/mc/Shulker.hpp +++ b/LiteLoader/include/llapi/mc/Shulker.hpp @@ -36,206 +36,206 @@ class Shulker : public Mob { * @symbol ?reloadHardcoded\@Shulker\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); + /** + * @vftbl 15 + * @symbol ?_doInitialMove\@Shulker\@\@UEAAXXZ + */ + virtual void _doInitialMove(); /** * @vftbl 16 * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 58 + * @vftbl 52 * @symbol ?isInWall\@Shulker\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Shulker\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 111 + * @vftbl 100 * @symbol ?canAttack\@Shulker\@\@UEBA_NPEAVActor\@\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 129 + * @vftbl 117 * @symbol ?shouldRender\@Shulker\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Shulker\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 140 + * @vftbl 128 * @symbol ?getPickRadius\@Shulker\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Shulker\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Shulker\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Shulker\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Shulker\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Shulker\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 - */ - virtual void __unk_vfn_267(); - /** - * @vftbl 278 - * @symbol ?travel\@Shulker\@\@UEAAXMMM_N\@Z + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void travel(float, float, float, bool); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Shulker\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 294 + * @vftbl 277 * @symbol ?getMaxHeadXRot\@Shulker\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@Shulker\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 335 + * @vftbl 317 * @symbol ?initBodyControl\@Shulker\@\@UEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHULKER /** * @symbol ?breaksFallingBlocks\@Shulker\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp index 08ee9ca1f1..ca100e8d1a 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp @@ -36,20 +36,10 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,75 +171,70 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** * @vftbl 133 - * @symbol ?isAuxValueRelevantForPicking\@ShulkerBoxBlock\@\@UEBA_NXZ + * @symbol ?buildDescriptionId\@ShulkerBoxBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ - virtual bool isAuxValueRelevantForPicking() const; + virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@ShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColorForParticle\@ShulkerBoxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual void __unk_vfn_162(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 */ virtual void __unk_vfn_164(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 - */ - virtual void __unk_vfn_166(); - /** - * @vftbl 169 - * @symbol __unk_vfn_169 - */ - virtual void __unk_vfn_169(); - /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 185 - * @symbol ?getMapColor\@ShulkerBoxBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0ShulkerBoxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp index 3f3d964e6d..3bfbaaf511 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp @@ -91,10 +91,6 @@ class ShulkerBoxBlockActor { * @symbol ?setFacingDir\@ShulkerBoxBlockActor\@\@QEAAXE\@Z */ MCAPI void setFacingDir(unsigned char); - /** - * @symbol ?itemAllowed\@ShulkerBoxBlockActor\@\@SA_NAEBVItemStackBase\@\@\@Z - */ - MCAPI static bool itemAllowed(class ItemStackBase const &); /** * @symbol ?itemAllowedInSlot\@ShulkerBoxBlockActor\@\@SA_NHAEBVItemStackBase\@\@H\@Z */ @@ -109,10 +105,6 @@ class ShulkerBoxBlockActor { * @symbol ?_calculateMovementWithCollisions\@ShulkerBoxBlockActor\@\@AEBA?AVVec3\@\@AEAVBlockSource\@\@PEAVActor\@\@\@Z */ MCAPI class Vec3 _calculateMovementWithCollisions(class BlockSource &, class Actor *) const; - /** - * @symbol ?_moveCollidedEntities\@ShulkerBoxBlockActor\@\@AEBAXAEAVBlockSource\@\@\@Z - */ - MCAPI void _moveCollidedEntities(class BlockSource &) const; private: /** diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp index 2350c198de..1a5e6baf5e 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp @@ -6,7 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "BlockItem.hpp" +#include "AuxDataBlockItem.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +17,7 @@ * @brief MC class ShulkerBoxBlockItem. * */ -class ShulkerBoxBlockItem : public BlockItem { +class ShulkerBoxBlockItem : public AuxDataBlockItem { #define AFTER_EXTRA // Add Member There @@ -52,10 +52,10 @@ class ShulkerBoxBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@ShulkerBoxBlockItem\@\@UEBAHH\@Z @@ -111,11 +111,6 @@ class ShulkerBoxBlockItem : public BlockItem { * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); - /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@ShulkerBoxBlockItem\@\@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; /** * @vftbl 96 * @symbol ?buildEffectDescriptionName\@ShulkerBoxBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp index 8e2c503a37..d99b21ebea 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp @@ -51,9 +51,9 @@ class ShulkerBoxRecipe : public ShapelessRecipe { */ virtual bool itemsMatch(class ItemDescriptor const &, class ItemDescriptor const &) const; /** - * @symbol ??0ShulkerBoxRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z + * @symbol ??0ShulkerBoxRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@AEBVSemVersion\@\@\@Z */ - MCAPI ShulkerBoxRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); + MCAPI ShulkerBoxRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional, class SemVersion const &); /** * @symbol ?ID\@ShulkerBoxRecipe\@\@2VUUID\@mce\@\@B */ diff --git a/LiteLoader/include/llapi/mc/ShulkerBullet.hpp b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp index 38e393df4c..f07163076b 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBullet.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp @@ -42,130 +42,130 @@ class ShulkerBullet : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@ShulkerBullet\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@ShulkerBullet\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 102 + * @vftbl 91 * @symbol ?isOnFire\@ShulkerBullet\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@ShulkerBullet\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@ShulkerBullet\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@ShulkerBullet\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** * @symbol ??0ShulkerBullet\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SideBySide.hpp b/LiteLoader/include/llapi/mc/SideBySide.hpp deleted file mode 100644 index 1293d0ccb6..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySide.hpp +++ /dev/null @@ -1,44 +0,0 @@ -/** - * @file SideBySide.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "SideBySideTrigger.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace SideBySide. - * - */ -namespace SideBySide { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?GLOBAL_MODE\@SideBySide\@\@3W4GlobalMode\@SideBySideTrigger\@\@A - */ - MCAPI extern enum class SideBySideTrigger::GlobalMode GLOBAL_MODE; - /** - * @symbol ?_collectVehiclesAndPassengersNotInView\@SideBySide\@\@YAXAEBVStrictEntityContext\@\@AEBUSideBySideValidationExceptionComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@AEAV?$vector\@U?$pair\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@\@std\@\@V?$allocator\@U?$pair\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@\@std\@\@\@2\@\@std\@\@\@Z - */ - MCAPI void _collectVehiclesAndPassengersNotInView(class StrictEntityContext const &, struct SideBySideValidationExceptionComponent const &, class ViewT> const &, class ViewT, class ViewT, std::vector> &); - /** - * @symbol ?_tryAddFailureComponent\@SideBySide\@\@YAXAEBVStrictEntityContext\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USideBySideValidationFailureComponent\@\@\@\@AEBUSideBySideValidationFailure\@\@\@Z - */ - MCAPI void _tryAddFailureComponent(class StrictEntityContext const &, class EntityModifierT &, struct SideBySideValidationFailure const &); - /** - * @symbol ?combineComparison\@SideBySide\@\@YA?AUSideBySidePartialComparison\@\@AEBU2\@0\@Z - */ - MCAPI struct SideBySidePartialComparison combineComparison(struct SideBySidePartialComparison const &, struct SideBySidePartialComparison const &); - /** - * @symbol ?tickExceptions\@SideBySide\@\@YAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@\@\@$$CBUSideBySideValidationExceptionComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideCopyComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideValidationExceptionComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSideBySideCopyComponent\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@V?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z - */ - MCAPI void tickExceptions(class ViewT, struct SideBySideValidationExceptionComponent const>, class ViewT>, class ViewT, class ViewT, class ViewT, class ViewT, class ViewT, class EntityModifierT, class OptionalGlobalT); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideComparisonRateSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideComparisonRateSystem.hpp deleted file mode 100644 index c05814d8be..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideComparisonRateSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file SideBySideComparisonRateSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideComparisonRateSystem. - * - */ -class SideBySideComparisonRateSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDECOMPARISONRATESYSTEM -public: - class SideBySideComparisonRateSystem& operator=(class SideBySideComparisonRateSystem const &) = delete; - SideBySideComparisonRateSystem(class SideBySideComparisonRateSystem const &) = delete; - SideBySideComparisonRateSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@SideBySideComparisonRateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?tick\@SideBySideComparisonRateSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@VActorOwnerComponent\@\@VActorTickNeededComponent\@\@\@\@\@\@V?$OptionalGlobalT\@USideBySideComparisonRateTickComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UUsesSideBySideComparisonComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT>, class OptionalGlobalT, class EntityModifierT); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideComparisonSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideComparisonSystem.hpp deleted file mode 100644 index 802ac1dd7d..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideComparisonSystem.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file SideBySideComparisonSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideComparisonSystem. - * - */ -class SideBySideComparisonSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDECOMPARISONSYSTEM -public: - class SideBySideComparisonSystem& operator=(class SideBySideComparisonSystem const &) = delete; - SideBySideComparisonSystem(class SideBySideComparisonSystem const &) = delete; - SideBySideComparisonSystem() = delete; -#endif - -public: - /** - * @symbol ?createSideBySideComparisonSystem\@SideBySideComparisonSystem\@\@SA?AUTickingSystemWithInfo\@\@W4SideBySideExtractionId\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@\@Z - */ - MCAPI static struct TickingSystemWithInfo createSideBySideComparisonSystem(enum class SideBySideExtractionId, std::vector const &); - /** - * @symbol ?createSideBySideExceptionSystems\@SideBySideComparisonSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$01\@std\@\@XZ - */ - MCAPI static class std::array createSideBySideExceptionSystems(); - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp b/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp deleted file mode 100644 index 68e2cddfaf..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp +++ /dev/null @@ -1,139 +0,0 @@ -/** - * @file SideBySideConstBlockSource.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideConstBlockSource. - * - */ -class SideBySideConstBlockSource { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDECONSTBLOCKSOURCE -public: - class SideBySideConstBlockSource& operator=(class SideBySideConstBlockSource const &) = delete; - SideBySideConstBlockSource(class SideBySideConstBlockSource const &) = delete; - SideBySideConstBlockSource() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z - */ - virtual class Block const & getBlock(int, int, int) const; - /** - * @vftbl 2 - * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Block const & getBlock(class BlockPos const &) const; - /** - * @vftbl 3 - * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z - */ - virtual class Block const & getBlock(class BlockPos const &, unsigned int) const; - /** - * @vftbl 4 - * @symbol ?getBlockEntity\@SideBySideConstBlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z - */ - virtual class BlockActor const * getBlockEntity(class BlockPos const &) const; - /** - * @vftbl 5 - * @symbol ?getExtraBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Block const & getExtraBlock(class BlockPos const &) const; - /** - * @vftbl 6 - * @symbol ?getLiquidBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Block const & getLiquidBlock(class BlockPos const &) const; - /** - * @vftbl 7 - * @symbol ?hasBlock\@SideBySideConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z - */ - virtual bool hasBlock(class BlockPos const &) const; - /** - * @vftbl 8 - * @symbol ?containsAnyLiquid\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@\@Z - */ - virtual bool containsAnyLiquid(class AABB const &) const; - /** - * @vftbl 9 - * @symbol ?containsMaterial\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z - */ - virtual bool containsMaterial(class AABB const &, enum class MaterialType) const; - /** - * @vftbl 10 - * @symbol ?getMaterial\@SideBySideConstBlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Material const & getMaterial(class BlockPos const &) const; - /** - * @vftbl 11 - * @symbol ?getMaterial\@SideBySideConstBlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z - */ - virtual class Material const & getMaterial(int, int, int) const; - /** - * @vftbl 12 - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z - */ - virtual bool hasChunksAt(struct Bounds const &, bool) const; - /** - * @vftbl 13 - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z - */ - virtual bool hasChunksAt(class BlockPos const &, int, bool) const; - /** - * @vftbl 14 - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z - */ - virtual bool hasChunksAt(class AABB const &, bool) const; - /** - * @vftbl 15 - * @symbol ?getDimensionId\@SideBySideConstBlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ - */ - virtual class AutomaticID getDimensionId() const; - /** - * @vftbl 16 - * @symbol ?fetchAABBs\@SideBySideConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z - */ - virtual void fetchAABBs(std::vector &, class AABB const &, bool) const; - /** - * @vftbl 17 - * @symbol ?fetchCollisionShapes\@SideBySideConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z - */ - virtual void fetchCollisionShapes(std::vector &, class AABB const &, float *, bool, class optional_ref) const; - /** - * @vftbl 18 - * @symbol ?getTallestCollisionShape\@SideBySideConstBlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z - */ - virtual class AABB getTallestCollisionShape(class AABB const &, float *, bool, class optional_ref) const; - /** - * @vftbl 19 - * @symbol ?getBrightness\@SideBySideConstBlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z - */ - virtual float getBrightness(class BlockPos const &) const; - /** - * @symbol ??0SideBySideConstBlockSource\@\@QEAA\@V?$not_null\@PEBUAccessedBlockSourceBlocks\@\@\@gsl\@\@_K\@Z - */ - MCAPI SideBySideConstBlockSource(class gsl::not_null, unsigned __int64); - /** - * @symbol ?getCurrentIndex\@SideBySideConstBlockSource\@\@QEBA_KXZ - */ - MCAPI unsigned __int64 getCurrentIndex() const; - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideCopyComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideCopyComponent.hpp deleted file mode 100644 index 490823fd16..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideCopyComponent.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file SideBySideCopyComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideCopyComponent. - * - */ -struct SideBySideCopyComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDECOPYCOMPONENT -public: - struct SideBySideCopyComponent& operator=(struct SideBySideCopyComponent const &) = delete; - SideBySideCopyComponent(struct SideBySideCopyComponent const &) = delete; - SideBySideCopyComponent() = delete; -#endif - -public: - /** - * @symbol ??0SideBySideCopyComponent\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI SideBySideCopyComponent(struct SideBySideCopyComponent &&); - /** - * @symbol ??4SideBySideCopyComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct SideBySideCopyComponent & operator=(struct SideBySideCopyComponent &&); - /** - * @symbol ??1SideBySideCopyComponent\@\@QEAA\@XZ - */ - MCAPI ~SideBySideCopyComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideCrossEntityRemapSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideCrossEntityRemapSystem.hpp deleted file mode 100644 index 1cdd23c402..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideCrossEntityRemapSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file SideBySideCrossEntityRemapSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideCrossEntityRemapSystem. - * - */ -class SideBySideCrossEntityRemapSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDECROSSENTITYREMAPSYSTEM -public: - class SideBySideCrossEntityRemapSystem& operator=(class SideBySideCrossEntityRemapSystem const &) = delete; - SideBySideCrossEntityRemapSystem(class SideBySideCrossEntityRemapSystem const &) = delete; - SideBySideCrossEntityRemapSystem() = delete; -#endif - -public: - /** - * @symbol ?_remapContext\@SideBySideCrossEntityRemapSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUSideBySideRemappingComponent\@\@\@Z - */ - MCAPI static void _remapContext(class StrictEntityContext &, struct SideBySideRemappingComponent const &); - -//private: - /** - * @symbol ?_removeNullStrictActorIDEntityContextPairs\@SideBySideCrossEntityRemapSystem\@\@CAXAEAV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static void _removeNullStrictActorIDEntityContextPairs(std::vector &); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideErrorHandling.hpp b/LiteLoader/include/llapi/mc/SideBySideErrorHandling.hpp deleted file mode 100644 index 29d98fcbd8..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideErrorHandling.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file SideBySideErrorHandling.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace SideBySideErrorHandling. - * - */ -namespace SideBySideErrorHandling { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?createSideBySideErrorHandlingSystem\@SideBySideErrorHandling\@\@YA?AUTickingSystemWithInfo\@\@W4ErrorLevel\@1\@_N\@Z - */ - MCAPI struct TickingSystemWithInfo createSideBySideErrorHandlingSystem(enum class SideBySideErrorHandling::ErrorLevel, bool); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideExtractionIdExt.hpp b/LiteLoader/include/llapi/mc/SideBySideExtractionIdExt.hpp deleted file mode 100644 index 2324fdd4c4..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideExtractionIdExt.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file SideBySideExtractionIdExt.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace SideBySideExtractionIdExt. - * - */ -namespace SideBySideExtractionIdExt { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?shouldReportErrorsForId\@SideBySideExtractionIdExt\@\@YA_NAEBW4SideBySideExtractionId\@\@\@Z - */ - MCAPI bool shouldReportErrorsForId(enum class SideBySideExtractionId const &); - /** - * @symbol ?toString\@SideBySideExtractionIdExt\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4SideBySideExtractionId\@\@\@Z - */ - MCAPI std::string toString(enum class SideBySideExtractionId const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp deleted file mode 100644 index 0a16b23ac6..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @file SideBySideExtractionSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "SideBySide.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideExtractionSystem. - * - */ -class SideBySideExtractionSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEEXTRACTIONSYSTEM -public: - class SideBySideExtractionSystem& operator=(class SideBySideExtractionSystem const &) = delete; - SideBySideExtractionSystem(class SideBySideExtractionSystem const &) = delete; - SideBySideExtractionSystem() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?registerEvents\@SideBySideExtractionSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z - */ - virtual void registerEvents(class entt::basic_dispatcher> &); - /** - * @symbol ??0SideBySideExtractionSystem\@\@QEAA\@AEBV?$array\@V?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@$0M\@\@std\@\@\@Z - */ - MCAPI SideBySideExtractionSystem(class std::array, 12> const &); - /** - * @symbol ?_onSideBySideExtractionRequest\@SideBySideExtractionSystem\@\@SAXAEBUExtractMethods\@SideBySide\@\@AEBUOnExtractSideBySide\@\@\@Z - */ - MCAPI static void _onSideBySideExtractionRequest(struct SideBySide::ExtractMethods const &, struct OnExtractSideBySide const &); - /** - * @symbol ?onStoreSideBySideResult\@SideBySideExtractionSystem\@\@SAXAEBUOnStoreSideBySideResult\@\@\@Z - */ - MCAPI static void onStoreSideBySideResult(struct OnStoreSideBySideResult const &); - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideFetchCollisionShapesComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideFetchCollisionShapesComponent.hpp deleted file mode 100644 index f35e1d6434..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideFetchCollisionShapesComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SideBySideFetchCollisionShapesComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideFetchCollisionShapesComponent. - * - */ -struct SideBySideFetchCollisionShapesComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEFETCHCOLLISIONSHAPESCOMPONENT -public: - struct SideBySideFetchCollisionShapesComponent& operator=(struct SideBySideFetchCollisionShapesComponent const &) = delete; - SideBySideFetchCollisionShapesComponent(struct SideBySideFetchCollisionShapesComponent const &) = delete; - SideBySideFetchCollisionShapesComponent() = delete; -#endif - -public: - /** - * @symbol ??1SideBySideFetchCollisionShapesComponent\@\@QEAA\@XZ - */ - MCAPI ~SideBySideFetchCollisionShapesComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideLevelSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideLevelSystem.hpp deleted file mode 100644 index 291f9f5974..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideLevelSystem.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @file SideBySideLevelSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -class SideBySideLevelSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDELEVELSYSTEM -public: - class SideBySideLevelSystem& operator=(class SideBySideLevelSystem const &) = delete; - SideBySideLevelSystem(class SideBySideLevelSystem const &) = delete; - SideBySideLevelSystem() = delete; -#endif - -public: - /** - * @symbol ?emptyEventingRequests\@SideBySideLevelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo emptyEventingRequests(); - /** - * @symbol ?emptySoundRequests\@SideBySideLevelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo emptySoundRequests(); - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideMigrationSystemImpl.hpp b/LiteLoader/include/llapi/mc/SideBySideMigrationSystemImpl.hpp deleted file mode 100644 index 1d6b1ae2d2..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideMigrationSystemImpl.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file SideBySideMigrationSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideMigrationSystemImpl. - * - */ -class SideBySideMigrationSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEMIGRATIONSYSTEMIMPL -public: - class SideBySideMigrationSystemImpl& operator=(class SideBySideMigrationSystemImpl const &) = delete; - SideBySideMigrationSystemImpl(class SideBySideMigrationSystemImpl const &) = delete; - SideBySideMigrationSystemImpl() = delete; -#endif - -public: - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySidePartialComparison.hpp b/LiteLoader/include/llapi/mc/SideBySidePartialComparison.hpp deleted file mode 100644 index fa77db5745..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySidePartialComparison.hpp +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file SideBySidePartialComparison.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySidePartialComparison. - * - */ -struct SideBySidePartialComparison { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEPARTIALCOMPARISON -public: - struct SideBySidePartialComparison& operator=(struct SideBySidePartialComparison const &) = delete; - SideBySidePartialComparison() = delete; -#endif - -public: - /** - * @symbol ??0SideBySidePartialComparison\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI SideBySidePartialComparison(struct SideBySidePartialComparison const &); - /** - * @symbol ??4SideBySidePartialComparison\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct SideBySidePartialComparison & operator=(struct SideBySidePartialComparison &&); - /** - * @symbol ?combine\@SideBySidePartialComparison\@\@SA?AV?$optional\@V?$tuple\@P6A_NAEBUAABBShapeComponent\@\@0\@ZP6A_NAEBUActorRotationComponent\@\@1\@ZP6A_NAEBUInsideBlockComponent\@\@2\@ZP6A_NAEBUPassengerComponent\@\@3\@ZP6A_NAEBUPendingRemovePassengersComponent\@\@4\@ZP6A_NAEBUPostTickPositionDeltaComponent\@\@5\@ZP6A_NAEBURenderPositionComponent\@\@6\@ZP6A_NAEBURidingPrevIDComponent\@\@7\@ZP6A_NAEBUStateVectorComponent\@\@8\@ZP6A_NAEBUVehicleComponent\@\@9\@Z\@std\@\@\@std\@\@AEBV23\@0_N\@Z - */ - MCAPI static class std::optional> combine(class std::optional> const &, class std::optional> const &, bool); - /** - * @symbol ?createPartialVehicleComparison\@SideBySidePartialComparison\@\@SA?AU1\@XZ - */ - MCAPI static struct SideBySidePartialComparison createPartialVehicleComparison(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp b/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp deleted file mode 100644 index c2cafca3db..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @file SideBySidePlaybackBlocksComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySidePlaybackBlocksComponent. - * - */ -struct SideBySidePlaybackBlocksComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEPLAYBACKBLOCKSCOMPONENT -public: - struct SideBySidePlaybackBlocksComponent& operator=(struct SideBySidePlaybackBlocksComponent const &) = delete; - SideBySidePlaybackBlocksComponent() = delete; -#endif - -public: - /** - * @symbol ??0SideBySidePlaybackBlocksComponent\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI SideBySidePlaybackBlocksComponent(struct SideBySidePlaybackBlocksComponent const &); - /** - * @symbol ??4SideBySidePlaybackBlocksComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct SideBySidePlaybackBlocksComponent & operator=(struct SideBySidePlaybackBlocksComponent &&); - /** - * @symbol ??1SideBySidePlaybackBlocksComponent\@\@QEAA\@XZ - */ - MCAPI ~SideBySidePlaybackBlocksComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySidePostComparisonSystem.hpp b/LiteLoader/include/llapi/mc/SideBySidePostComparisonSystem.hpp deleted file mode 100644 index fad477ce16..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySidePostComparisonSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SideBySidePostComparisonSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySidePostComparisonSystem. - * - */ -class SideBySidePostComparisonSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEPOSTCOMPARISONSYSTEM -public: - class SideBySidePostComparisonSystem& operator=(class SideBySidePostComparisonSystem const &) = delete; - SideBySidePostComparisonSystem(class SideBySidePostComparisonSystem const &) = delete; - SideBySidePostComparisonSystem() = delete; -#endif - -public: - /** - * @symbol ?createSideBySideCleanupCopyComponentSystem\@SideBySidePostComparisonSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySideCleanupCopyComponentSystem(); - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideResult.hpp b/LiteLoader/include/llapi/mc/SideBySideResult.hpp deleted file mode 100644 index 336951fabc..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideResult.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file SideBySideResult.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideResult. - * - */ -struct SideBySideResult { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDERESULT -public: - struct SideBySideResult& operator=(struct SideBySideResult const &) = delete; - SideBySideResult(struct SideBySideResult const &) = delete; - SideBySideResult() = delete; -#endif - -public: - /** - * @symbol ??0SideBySideResult\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI SideBySideResult(struct SideBySideResult &&); - /** - * @symbol ??1SideBySideResult\@\@QEAA\@XZ - */ - MCAPI ~SideBySideResult(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp deleted file mode 100644 index 66037d0c5b..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SideBySideResultComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideResultComponent. - * - */ -struct SideBySideResultComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDERESULTCOMPONENT -public: - struct SideBySideResultComponent& operator=(struct SideBySideResultComponent const &) = delete; - SideBySideResultComponent(struct SideBySideResultComponent const &) = delete; - SideBySideResultComponent() = delete; -#endif - -public: - /** - * @symbol ??4SideBySideResultComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct SideBySideResultComponent & operator=(struct SideBySideResultComponent &&); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideSimulatorComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideSimulatorComponent.hpp deleted file mode 100644 index f724dc09fb..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideSimulatorComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SideBySideSimulatorComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideSimulatorComponent. - * - */ -struct SideBySideSimulatorComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDESIMULATORCOMPONENT -public: - struct SideBySideSimulatorComponent& operator=(struct SideBySideSimulatorComponent const &) = delete; - SideBySideSimulatorComponent(struct SideBySideSimulatorComponent const &) = delete; - SideBySideSimulatorComponent() = delete; -#endif - -public: - /** - * @symbol ??1SideBySideSimulatorComponent\@\@QEAA\@XZ - */ - MCAPI ~SideBySideSimulatorComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideSimulatorSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideSimulatorSystem.hpp deleted file mode 100644 index f47239ef0b..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideSimulatorSystem.hpp +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @file SideBySideSimulatorSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideSimulatorSystem. - * - */ -class SideBySideSimulatorSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDESIMULATORSYSTEM -public: - class SideBySideSimulatorSystem& operator=(class SideBySideSimulatorSystem const &) = delete; - SideBySideSimulatorSystem(class SideBySideSimulatorSystem const &) = delete; - SideBySideSimulatorSystem() = delete; -#endif - -public: - /** - * @symbol ?_clearRemappings\@SideBySideSimulatorSystem\@\@SAXV?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z - */ - MCAPI static void _clearRemappings(class OptionalGlobalT); - /** - * @symbol ?createBegin\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createBegin(); - /** - * @symbol ?createClearRemappingsSystem\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createClearRemappingsSystem(); - /** - * @symbol ?createEnd\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createEnd(); - /** - * @symbol ?createMigrator\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@W4SideBySideExtractionId\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@\@Z - */ - MCAPI static struct TickingSystemWithInfo createMigrator(enum class SideBySideExtractionId, std::vector const &); - /** - * @symbol ?createSideBySideResultMigratorSystem\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySideResultMigratorSystem(); - /** - * @symbol ?tickBegin\@SideBySideSimulatorSystem\@\@SAXVEntityFactory\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@USideBySideSimulatorComponent\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@V?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z - */ - MCAPI static void tickBegin(class EntityFactory, class EntityModifierT, struct SideBySideSimulatorComponent, class FlagComponent>, class OptionalGlobalT); - /** - * @symbol ?tickEnd\@SideBySideSimulatorSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideSimulatorComponent\@\@\@\@VEntityFactory\@\@\@Z - */ - MCAPI static void tickEnd(class ViewT, class EntityFactory); - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp deleted file mode 100644 index 8f2d52f402..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @file SideBySideTrigger.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideTrigger. - * - */ -class SideBySideTrigger { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDETRIGGER -public: - class SideBySideTrigger& operator=(class SideBySideTrigger const &) = delete; - SideBySideTrigger(class SideBySideTrigger const &) = delete; - SideBySideTrigger() = delete; -#endif - -public: - /** - * @symbol ?flagUnsupportedComparisonFrame\@SideBySideTrigger\@\@SAXAEAVActor\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEAUSideBySidePartialComparison\@\@\@Z - */ - MCAPI static void flagUnsupportedComparisonFrame(class Actor &, class std::basic_string_view>, struct SideBySidePartialComparison *); - /** - * @symbol ?flagUnsupportedComparisonFrame\@SideBySideTrigger\@\@SAXAEAUIActorMovementProxy\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEAUSideBySidePartialComparison\@\@\@Z - */ - MCAPI static void flagUnsupportedComparisonFrame(struct IActorMovementProxy &, class std::basic_string_view>, struct SideBySidePartialComparison *); - /** - * @symbol ?shouldSimulateLegacy\@SideBySideTrigger\@\@SA_NAEBUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z - */ - MCAPI static bool shouldSimulateLegacy(struct IActorMovementProxy const &, enum class SideBySideExtractionId); - /** - * @symbol ?shouldSimulateLegacy\@SideBySideTrigger\@\@SA_NAEBVActor\@\@W4SideBySideExtractionId\@\@\@Z - */ - MCAPI static bool shouldSimulateLegacy(class Actor const &, enum class SideBySideExtractionId); - /** - * @symbol ?storeSideBySideResult\@SideBySideTrigger\@\@SAXAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@USideBySideResult\@\@\@Z - */ - MCAPI static void storeSideBySideResult(struct IActorMovementProxy &, enum class SideBySideExtractionId, struct SideBySideResult); - /** - * @symbol ?storeSideBySideResult\@SideBySideTrigger\@\@SAXAEAVActor\@\@W4SideBySideExtractionId\@\@USideBySideResult\@\@\@Z - */ - MCAPI static void storeSideBySideResult(class Actor &, enum class SideBySideExtractionId, struct SideBySideResult); - /** - * @symbol ?tryRecordBlockSource\@SideBySideTrigger\@\@SA?AVConditionalRecordingConstBlockSource\@\@_NV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@AEAUIActorMovementProxy\@\@\@Z - */ - MCAPI static class ConditionalRecordingConstBlockSource tryRecordBlockSource(bool, class gsl::not_null, struct IActorMovementProxy &); - /** - * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAVActor\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z - */ - MCAPI static bool tryTrigger(class Actor &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); - /** - * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z - */ - MCAPI static bool tryTrigger(struct IActorMovementProxy &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); - /** - * @symbol ?tryTriggerCurrentPostSimulation\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@\@Z - */ - MCAPI static bool tryTriggerCurrentPostSimulation(struct IActorMovementProxy &, class std::optional); - -//private: - /** - * @symbol ?_setGlobalMode\@SideBySideTrigger\@\@CAXW4GlobalMode\@1\@\@Z - */ - MCAPI static void _setGlobalMode(enum class SideBySideTrigger::GlobalMode); - -private: - -}; diff --git a/LiteLoader/include/llapi/mc/SideBySideValidationExceptionComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideValidationExceptionComponent.hpp deleted file mode 100644 index 8d9e44f2c0..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideValidationExceptionComponent.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file SideBySideValidationExceptionComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideValidationExceptionComponent. - * - */ -struct SideBySideValidationExceptionComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEVALIDATIONEXCEPTIONCOMPONENT -public: - struct SideBySideValidationExceptionComponent& operator=(struct SideBySideValidationExceptionComponent const &) = delete; - SideBySideValidationExceptionComponent() = delete; -#endif - -public: - /** - * @symbol ??0SideBySideValidationExceptionComponent\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI SideBySideValidationExceptionComponent(struct SideBySideValidationExceptionComponent &&); - /** - * @symbol ??0SideBySideValidationExceptionComponent\@\@QEAA\@AEBU0\@\@Z - */ - MCAPI SideBySideValidationExceptionComponent(struct SideBySideValidationExceptionComponent const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideValidationFailure.hpp b/LiteLoader/include/llapi/mc/SideBySideValidationFailure.hpp deleted file mode 100644 index 2b139254cf..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideValidationFailure.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file SideBySideValidationFailure.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideValidationFailure. - * - */ -struct SideBySideValidationFailure { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEVALIDATIONFAILURE -public: - struct SideBySideValidationFailure& operator=(struct SideBySideValidationFailure const &) = delete; - SideBySideValidationFailure(struct SideBySideValidationFailure const &) = delete; - SideBySideValidationFailure() = delete; -#endif - -public: - /** - * @symbol ?generateMessage\@SideBySideValidationFailure\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N00AEBV23\@AEBVVec3\@\@\@Z - */ - MCAPI std::string generateMessage(bool, bool, bool, std::string const &, class Vec3 const &) const; - /** - * @symbol ??1SideBySideValidationFailure\@\@QEAA\@XZ - */ - MCAPI ~SideBySideValidationFailure(); - /** - * @symbol ?toString\@SideBySideValidationFailure\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4FailureReason\@1\@\@Z - */ - MCAPI static std::string toString(enum class SideBySideValidationFailure::FailureReason); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SignBlock.hpp b/LiteLoader/include/llapi/mc/SignBlock.hpp index c44a388521..fbd803e4e7 100644 --- a/LiteLoader/include/llapi/mc/SignBlock.hpp +++ b/LiteLoader/include/llapi/mc/SignBlock.hpp @@ -38,25 +38,20 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -68,10 +63,10 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -82,11 +77,6 @@ class SignBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -107,6 +97,11 @@ class SignBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -117,11 +112,6 @@ class SignBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -138,60 +128,70 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 68 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 * @symbol ?checkIsPathable\@SignBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SignBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -203,102 +203,102 @@ class SignBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@SignBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SignBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getEntityResourceItem\@SignBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getYRotationInDegrees\@SignBlock\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getYRotationInDegrees(class Block const &) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?_canSurvive\@SignBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool _canSurvive(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?_getItemInstance\@SignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 198 + * @vftbl 196 * @symbol ?_getShape\@SignBlock\@\@MEBAXHAEAVAABB\@\@\@Z */ virtual void _getShape(int, class AABB &) const; diff --git a/LiteLoader/include/llapi/mc/SignBlockActor.hpp b/LiteLoader/include/llapi/mc/SignBlockActor.hpp index 433ec68642..753ec68d45 100644 --- a/LiteLoader/include/llapi/mc/SignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SignBlockActor.hpp @@ -77,6 +77,11 @@ enum class SignType; * @symbol ?getImmersiveReaderText\@SignBlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::string getImmersiveReaderText(class BlockSource &); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -104,31 +109,36 @@ enum class SignType; virtual void __unk_vfn_35(); /** * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 37 * @symbol ?getUgcStrings\@SignBlockActor\@\@UEBA?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\@\@AEBVCompoundTag\@\@\@Z */ virtual std::vector getUgcStrings(class CompoundTag const &) const; /** - * @vftbl 37 + * @vftbl 38 * @symbol ?setUgcStrings\@SignBlockActor\@\@UEBAXAEAVCompoundTag\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void setUgcStrings(class CompoundTag &, std::vector const &) const; /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** - * @vftbl 39 + * @vftbl 40 * @symbol ?_getUpdatePacket\@SignBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@SignBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 41 + * @vftbl 42 * @symbol ?_playerCanUpdate\@SignBlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; diff --git a/LiteLoader/include/llapi/mc/SignItem.hpp b/LiteLoader/include/llapi/mc/SignItem.hpp index d79abba55f..05161cacc7 100644 --- a/LiteLoader/include/llapi/mc/SignItem.hpp +++ b/LiteLoader/include/llapi/mc/SignItem.hpp @@ -53,10 +53,10 @@ class SignItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -118,12 +118,12 @@ class SignItem : public Item { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@SignItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getBlockToPlace\@SignItem\@\@UEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z */ virtual class Block const * getBlockToPlace(unsigned char, class Actor const &, class BlockPos) const; diff --git a/LiteLoader/include/llapi/mc/SignalServiceSigninJob.hpp b/LiteLoader/include/llapi/mc/SignalServiceSigninJob.hpp index ddffa5311f..359bf2256b 100644 --- a/LiteLoader/include/llapi/mc/SignalServiceSigninJob.hpp +++ b/LiteLoader/include/llapi/mc/SignalServiceSigninJob.hpp @@ -31,9 +31,9 @@ class SignalServiceSigninJob { virtual void __unk_vfn_0(); /** * @vftbl 1 - * @symbol ?signin\@SignalServiceSigninJob\@\@UEAAX_N\@Z + * @symbol ?signin\@SignalServiceSigninJob\@\@UEAAX_NV?$optional\@V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@\@std\@\@\@Z */ - virtual void signin(bool); + virtual void signin(bool, class std::optional>>); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIGNALSERVICESIGNINJOB /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/Silverfish.hpp b/LiteLoader/include/llapi/mc/Silverfish.hpp index 7cb6c0bbc5..4048451856 100644 --- a/LiteLoader/include/llapi/mc/Silverfish.hpp +++ b/LiteLoader/include/llapi/mc/Silverfish.hpp @@ -37,147 +37,147 @@ class Silverfish : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Silverfish\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Silverfish\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 + * @vftbl 255 * @symbol ?spawnAnim\@Silverfish\@\@UEAAXXZ */ virtual void spawnAnim(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Silverfish\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Silverfish\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?isDarkEnoughToSpawn\@Silverfish\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; diff --git a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp index 8c4aeee209..7cbcca4954 100644 --- a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -53,23 +54,23 @@ enum class Subtype; virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SimpleEventPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SimpleEventPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMPLEEVENTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SimpleEventPacket(); #endif - /** - * @symbol ??0SimpleEventPacket\@\@QEAA\@AEBW4Subtype\@0\@\@Z - */ - MCAPI SimpleEventPacket(enum class SimpleEventPacket::Subtype const &); /** * @symbol ??0SimpleEventPacket\@\@QEAA\@XZ */ MCAPI SimpleEventPacket(); + /** + * @symbol ??0SimpleEventPacket\@\@QEAA\@AEBW4Subtype\@0\@\@Z + */ + MCAPI SimpleEventPacket(enum class SimpleEventPacket::Subtype const &); /** * @symbol ?getSubtype\@SimpleEventPacket\@\@QEBAAEBW4Subtype\@1\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SimplexNoise.hpp b/LiteLoader/include/llapi/mc/SimplexNoise.hpp index 848372b4f7..459d85fe2b 100644 --- a/LiteLoader/include/llapi/mc/SimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/SimplexNoise.hpp @@ -33,13 +33,13 @@ class SimplexNoise { * @symbol ??0SimplexNoise\@\@QEAA\@AEAVIRandom\@\@_N\@Z */ MCAPI SimplexNoise(class IRandom &, bool); - /** - * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec2\@\@\@Z - */ - MCAPI float _getValue(class Vec2 const &) const; /** * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float _getValue(class Vec3 const &) const; + /** + * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec2\@\@\@Z + */ + MCAPI float _getValue(class Vec2 const &) const; }; diff --git a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp index d6421de60e..a40a212aba 100644 --- a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp +++ b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp @@ -56,232 +56,232 @@ class SimulatedPlayer : public ServerPlayer { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 43 + * @vftbl 38 * @symbol ?teleportTo\@SimulatedPlayer\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@SimulatedPlayer\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 353 - * @symbol __unk_vfn_353 + * @vftbl 333 + * @symbol __unk_vfn_333 */ - virtual void __unk_vfn_353(); + virtual void __unk_vfn_333(); /** - * @vftbl 360 - * @symbol __unk_vfn_360 + * @vftbl 340 + * @symbol __unk_vfn_340 */ - virtual void __unk_vfn_360(); + virtual void __unk_vfn_340(); /** - * @vftbl 361 - * @symbol __unk_vfn_361 + * @vftbl 341 + * @symbol __unk_vfn_341 */ - virtual void __unk_vfn_361(); + virtual void __unk_vfn_341(); /** - * @vftbl 363 - * @symbol __unk_vfn_363 + * @vftbl 343 + * @symbol __unk_vfn_343 */ - virtual void __unk_vfn_363(); + virtual void __unk_vfn_343(); /** - * @vftbl 364 - * @symbol __unk_vfn_364 + * @vftbl 344 + * @symbol __unk_vfn_344 */ - virtual void __unk_vfn_364(); + virtual void __unk_vfn_344(); /** - * @vftbl 369 - * @symbol __unk_vfn_369 + * @vftbl 349 + * @symbol __unk_vfn_349 */ - virtual void __unk_vfn_369(); + virtual void __unk_vfn_349(); /** - * @vftbl 370 - * @symbol __unk_vfn_370 + * @vftbl 350 + * @symbol __unk_vfn_350 */ - virtual void __unk_vfn_370(); + virtual void __unk_vfn_350(); /** - * @vftbl 373 - * @symbol __unk_vfn_373 + * @vftbl 353 + * @symbol __unk_vfn_353 */ - virtual void __unk_vfn_373(); + virtual void __unk_vfn_353(); /** - * @vftbl 376 - * @symbol __unk_vfn_376 + * @vftbl 356 + * @symbol __unk_vfn_356 */ - virtual void __unk_vfn_376(); + virtual void __unk_vfn_356(); /** - * @vftbl 377 - * @symbol __unk_vfn_377 + * @vftbl 357 + * @symbol __unk_vfn_357 */ - virtual void __unk_vfn_377(); + virtual void __unk_vfn_357(); /** - * @vftbl 388 - * @symbol __unk_vfn_388 + * @vftbl 368 + * @symbol __unk_vfn_368 */ - virtual void __unk_vfn_388(); + virtual void __unk_vfn_368(); /** - * @vftbl 389 + * @vftbl 369 * @symbol ?isHostingPlayer\@SimulatedPlayer\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 392 - * @symbol __unk_vfn_392 + * @vftbl 372 + * @symbol __unk_vfn_372 */ - virtual void __unk_vfn_392(); + virtual void __unk_vfn_372(); /** - * @vftbl 399 - * @symbol __unk_vfn_399 + * @vftbl 379 + * @symbol __unk_vfn_379 */ - virtual void __unk_vfn_399(); + virtual void __unk_vfn_379(); /** - * @vftbl 422 - * @symbol __unk_vfn_422 + * @vftbl 402 + * @symbol __unk_vfn_402 */ - virtual void __unk_vfn_422(); + virtual void __unk_vfn_402(); /** - * @vftbl 423 + * @vftbl 403 * @symbol ?getXuid\@SimulatedPlayer\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getXuid() const; /** - * @vftbl 424 + * @vftbl 404 * @symbol ?getMovementSettings\@SimulatedPlayer\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ virtual struct PlayerMovementSettings const & getMovementSettings() const; /** - * @vftbl 425 - * @symbol __unk_vfn_425 + * @vftbl 405 + * @symbol __unk_vfn_405 */ - virtual void __unk_vfn_425(); + virtual void __unk_vfn_405(); /** - * @vftbl 428 + * @vftbl 408 * @symbol ?_createChunkSource\@SimulatedPlayer\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 432 + * @vftbl 412 * @symbol ?_getSpawnChunkLimit\@SimulatedPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 433 + * @vftbl 413 * @symbol ?_updateChunkPublisherView\@SimulatedPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); @@ -332,13 +332,13 @@ class SimulatedPlayer : public ServerPlayer { */ MCAPI void simulateDisconnect(); /** - * @symbol ?simulateGiveItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@_N\@Z + * @symbol ?simulateFly\@SimulatedPlayer\@\@QEAAXXZ */ - MCAPI bool simulateGiveItem(class ItemStack &, bool); + MCAPI void simulateFly(); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?simulateGiveItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@_N\@Z */ - MCAPI bool simulateInteract(class Actor &); + MCAPI bool simulateGiveItem(class ItemStack &, bool); /** * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z */ @@ -347,6 +347,10 @@ class SimulatedPlayer : public ServerPlayer { * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NXZ */ MCAPI bool simulateInteract(); + /** + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z + */ + MCAPI bool simulateInteract(class Actor &); /** * @symbol ?simulateJump\@SimulatedPlayer\@\@QEAA_NXZ */ @@ -355,10 +359,6 @@ class SimulatedPlayer : public ServerPlayer { * @symbol ?simulateLocalMove\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z */ MCAPI void simulateLocalMove(class Vec3 const &, float); - /** - * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVBlockPos\@\@\@Z - */ - MCAPI void simulateLookAt(class BlockPos const &); /** * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEAVActor\@\@\@Z */ @@ -367,6 +367,10 @@ class SimulatedPlayer : public ServerPlayer { * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void simulateLookAt(class Vec3 const &); + /** + * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVBlockPos\@\@\@Z + */ + MCAPI void simulateLookAt(class BlockPos const &); /** * @symbol ?simulateMoveToLocation\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z */ @@ -399,6 +403,10 @@ class SimulatedPlayer : public ServerPlayer { * @symbol ?simulateStopDestroyingBlock\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void simulateStopDestroyingBlock(); + /** + * @symbol ?simulateStopFlying\@SimulatedPlayer\@\@QEAAXXZ + */ + MCAPI void simulateStopFlying(); /** * @symbol ?simulateStopInteracting\@SimulatedPlayer\@\@QEAAXXZ */ diff --git a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp index 595d202807..d2ebe709ca 100644 --- a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SimulationTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SimulationTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SimulationTypePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SimulationTypePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Skeleton.hpp b/LiteLoader/include/llapi/mc/Skeleton.hpp index 42e90bec65..8a3d0efa88 100644 --- a/LiteLoader/include/llapi/mc/Skeleton.hpp +++ b/LiteLoader/include/llapi/mc/Skeleton.hpp @@ -37,155 +37,155 @@ class Skeleton : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Skeleton\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 112 + * @vftbl 101 * @symbol ?setTarget\@Skeleton\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 169 + * @vftbl 157 * @symbol ?canFreeze\@Skeleton\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 205 + * @vftbl 192 * @symbol ?canBeAffected\@Skeleton\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 217 + * @vftbl 204 * @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 &); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@Skeleton\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 296 + * @vftbl 279 * @symbol ?doHurtTarget\@Skeleton\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Skeleton\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SkullBlock.hpp b/LiteLoader/include/llapi/mc/SkullBlock.hpp index 6ff3855b6f..da4f2671f1 100644 --- a/LiteLoader/include/llapi/mc/SkullBlock.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlock.hpp @@ -36,25 +36,20 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@SkullBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@SkullBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @symbol __unk_vfn_22 */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; + virtual void __unk_vfn_22(); /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@SkullBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class SkullBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class SkullBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class SkullBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,65 +126,75 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@SkullBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SkullBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SkullBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@SkullBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,30 +206,40 @@ class SkullBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 142 - * @symbol ?getVisualShape\@SkullBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_153(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_162(); + /** + * @vftbl 163 + * @symbol __unk_vfn_163 + */ + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 @@ -237,41 +247,31 @@ class SkullBlock : public ActorBlock { virtual void __unk_vfn_164(); /** * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 - */ - virtual void __unk_vfn_166(); - /** - * @vftbl 167 * @symbol ?onPlace\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getEntityResourceItem\@SkullBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SkullBlockActor.hpp b/LiteLoader/include/llapi/mc/SkullBlockActor.hpp index 44f4337b42..227524ab12 100644 --- a/LiteLoader/include/llapi/mc/SkullBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlockActor.hpp @@ -67,6 +67,11 @@ enum class SkullType; * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -93,17 +98,22 @@ enum class SkullType; */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@SkullBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@SkullBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/SkullItem.hpp b/LiteLoader/include/llapi/mc/SkullItem.hpp index 1190fbf208..51759a9299 100644 --- a/LiteLoader/include/llapi/mc/SkullItem.hpp +++ b/LiteLoader/include/llapi/mc/SkullItem.hpp @@ -52,10 +52,10 @@ class SkullItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 42 * @symbol ?getBlockShape\@SkullItem\@\@UEBA?AW4BlockShape\@\@XZ @@ -167,7 +167,7 @@ class SkullItem : public Item { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@SkullItem\@\@EEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/SlabBlock.hpp b/LiteLoader/include/llapi/mc/SlabBlock.hpp index 181cca17e2..1e71a87fdf 100644 --- a/LiteLoader/include/llapi/mc/SlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlock.hpp @@ -36,30 +36,25 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 6 + * @vftbl 12 + * @symbol ?getVisualShape\@SlabBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + */ + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; + /** + * @vftbl 15 * @symbol ?isObstructingChests\@SlabBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 17 + * @vftbl 20 * @symbol ?liquidCanFlowIntoFromDirection\@SlabBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +66,10 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +80,6 @@ class SlabBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -112,9 +102,9 @@ class SlabBlock : public BlockLegacy { virtual void __unk_vfn_41(); /** * @vftbl 42 - * @symbol ?isDoubleSlabBlock\@SlabBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_42 */ - virtual bool isDoubleSlabBlock() const; + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -127,9 +117,9 @@ class SlabBlock : public BlockLegacy { virtual void __unk_vfn_44(); /** * @vftbl 45 - * @symbol __unk_vfn_45 + * @symbol ?isDoubleSlabBlock\@SlabBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_45(); + virtual bool isDoubleSlabBlock() const; /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,70 +136,80 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@SlabBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 79 + * @vftbl 82 * @symbol ?getRedstoneProperty\@SlabBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@SlabBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@SlabBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 120 + * @vftbl 121 * @symbol ?getMobToSpawn\@SlabBlock\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ virtual class MobSpawnerData const * getMobToSpawn(class SpawnConditions const &, class BlockSource &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,67 +221,67 @@ class SlabBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@SlabBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SlabBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SlabBlockItem.hpp b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp index 47dfb27179..c29a94952f 100644 --- a/LiteLoader/include/llapi/mc/SlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp @@ -52,10 +52,10 @@ class SlabBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -117,7 +117,7 @@ class SlabBlockItem : public BlockItem { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@SlabBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/Slime.hpp b/LiteLoader/include/llapi/mc/Slime.hpp index 73012a0861..52f964ad4e 100644 --- a/LiteLoader/include/llapi/mc/Slime.hpp +++ b/LiteLoader/include/llapi/mc/Slime.hpp @@ -47,192 +47,192 @@ class Slime : public Monster { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Slime\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Slime\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Slime\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Slime\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Slime\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Slime\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Slime\@\@MEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 346 + * @vftbl 326 * @symbol ?getSquishSound\@Slime\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getSquishSound(); /** - * @vftbl 347 + * @vftbl 327 * @symbol ?setSlimeSize\@Slime\@\@MEAAXH\@Z */ virtual void setSlimeSize(int); /** - * @vftbl 348 + * @vftbl 328 * @symbol ?doPlayJumpSound\@Slime\@\@MEAA_NXZ */ virtual bool doPlayJumpSound(); /** - * @vftbl 349 + * @vftbl 329 * @symbol ?doPlayLandSound\@Slime\@\@MEAA_NXZ */ virtual bool doPlayLandSound(); /** - * @vftbl 350 + * @vftbl 330 * @symbol ?playJumpSound\@Slime\@\@MEAAXXZ */ virtual void playJumpSound(); /** - * @vftbl 351 + * @vftbl 331 * @symbol ?playLandSound\@Slime\@\@MEAAXXZ */ virtual void playLandSound(); /** - * @vftbl 352 + * @vftbl 332 * @symbol ?decreaseSquish\@Slime\@\@MEAAXXZ */ virtual void decreaseSquish(); /** - * @vftbl 353 + * @vftbl 333 * @symbol ?createChild\@Slime\@\@MEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@H\@Z */ virtual class OwnerPtrT createChild(int); diff --git a/LiteLoader/include/llapi/mc/SlimeBlock.hpp b/LiteLoader/include/llapi/mc/SlimeBlock.hpp index 22a28e4029..d1f881339f 100644 --- a/LiteLoader/include/llapi/mc/SlimeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlimeBlock.hpp @@ -36,20 +36,10 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SlimeBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SlimeBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SlimeBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 80 - * @symbol ?updateEntityAfterFallOn\@SlimeBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 83 + * @symbol ?updateEntityAfterFallOn\@SlimeBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ - virtual void __unk_vfn_81(); + virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,70 +176,75 @@ class SlimeBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 163 + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 161 * @symbol ?onStandOn\@SlimeBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 168 + * @vftbl 166 * @symbol ?onFallOn\@SlimeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 181 + * @vftbl 178 * @symbol ?getExtraRenderLayers\@SlimeBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SLIMEBLOCK /** * @symbol ?isBounceBlock\@SlimeBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp index 6fe44479c7..12ddb8d3b0 100644 --- a/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp @@ -37,10 +37,6 @@ class SlimePreNormalTickSystem { * @symbol ?_doSlimePreNormalTickSystem\@SlimePreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@\@Z */ MCAPI static void _doSlimePreNormalTickSystem(class StrictEntityContext &, class ActorOwnerComponent &, class Optional const>, class EntityModifierT>); - /** - * @symbol ?_tickSlimePreNormalTickSystem\@SlimePreNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@USlimeFlag\@\@\@\@\@\@VActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@\@Z - */ - MCAPI static void _tickSlimePreNormalTickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent, class Optional const>>, class EntityModifierT>); private: diff --git a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp index 0effed49f2..f056af881c 100644 --- a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp @@ -36,25 +36,15 @@ class SmallDripleafBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SmallDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +55,11 @@ class SmallDripleafBlock : public BushBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@SmallDripleafBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +72,9 @@ class SmallDripleafBlock : public BushBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@SmallDripleafBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class SmallDripleafBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class SmallDripleafBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,75 +126,85 @@ class SmallDripleafBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@SmallDripleafBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@SmallDripleafBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,82 +216,87 @@ class SmallDripleafBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 151 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 149 * @symbol ?init\@SmallDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@SmallDripleafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SmallDripleafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SmallFireball.hpp b/LiteLoader/include/llapi/mc/SmallFireball.hpp index d6f047370a..6e8b47534f 100644 --- a/LiteLoader/include/llapi/mc/SmallFireball.hpp +++ b/LiteLoader/include/llapi/mc/SmallFireball.hpp @@ -37,120 +37,120 @@ class SmallFireball : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@SmallFireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@SmallFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** * @symbol ??0SmallFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp index fb90398af8..cc7cda56df 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp @@ -36,20 +36,10 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SmithingTableBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SmithingTableBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SmithingTableBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,60 +171,65 @@ class SmithingTableBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@SmithingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SMITHINGTABLEBLOCK /** * @symbol ?isCraftingBlock\@SmithingTableBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp b/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp index 8e8752f3dd..beaaeed70a 100644 --- a/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTemplateItem.hpp @@ -47,10 +47,10 @@ class SmithingTemplateItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/SmokerBlock.hpp b/LiteLoader/include/llapi/mc/SmokerBlock.hpp index 96f4ef26d1..f869a0152c 100644 --- a/LiteLoader/include/llapi/mc/SmokerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmokerBlock.hpp @@ -36,20 +36,10 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SmokerBlock : public FurnaceBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SmokerBlock : public FurnaceBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SmokerBlock : public FurnaceBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,67 +176,72 @@ class SmokerBlock : public FurnaceBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 176 + * @vftbl 171 + * @symbol __unk_vfn_171 + */ + virtual void __unk_vfn_171(); + /** + * @vftbl 173 * @symbol ?use\@SmokerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SnapshotFilenameAndLength.hpp b/LiteLoader/include/llapi/mc/SnapshotFilenameAndLength.hpp new file mode 100644 index 0000000000..9d032bd2c8 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SnapshotFilenameAndLength.hpp @@ -0,0 +1,32 @@ +/** + * @file SnapshotFilenameAndLength.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct SnapshotFilenameAndLength { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SNAPSHOTFILENAMEANDLENGTH +public: + struct SnapshotFilenameAndLength& operator=(struct SnapshotFilenameAndLength const &) = delete; + SnapshotFilenameAndLength(struct SnapshotFilenameAndLength const &) = delete; + SnapshotFilenameAndLength() = delete; +#endif + +public: + /** + * @symbol ?toString\@SnapshotFilenameAndLength\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string toString(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp index 44512be42a..8850be1416 100644 --- a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp @@ -46,24 +46,31 @@ struct SneakMovementSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol ?tick\@SneakMovementSystem\@\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol ?tick\@SneakMovementSystem\@\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, class FlagComponent, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?containsSneakCollisionShapes\@SneakMovementSystem\@\@SA_NAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@2V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBVIConstBlockSource\@\@_NAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?singleTick\@SneakMovementSystem\@\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEAVStrictEntityContext\@\@\@Z */ - MCAPI static bool containsSneakCollisionShapes(class StrictEntityContext const &, class LocalSpatialEntityFetcher &, class AABB const &, class AABB const &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, class IConstBlockSource const &, bool, std::vector &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + 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, class Optional, struct AABBShapeComponent, class FlagComponent, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class StrictEntityContext &); + /** + * @symbol ?containsSneakCollisionShapes\@SneakMovementSystem\@\@SA_NAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@2V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBVIConstBlockSource\@\@_NAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + */ + MCAPI static bool containsSneakCollisionShapes(class StrictEntityContext const &, class LocalSpatialEntityFetcher &, class AABB const &, class AABB const &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, class IConstBlockSource const &, bool, std::vector &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, class FlagComponent, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?create\@SneakMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?createSideBySide\@SneakMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?tickSneakMovementSystem\@SneakMovementSystem\@\@SAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUMoveInputComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@AEBUMaxAutoStepComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUMoveRequestComponent\@\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBULocalSpatialEntityFetcherFactoryComponent\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); + MCAPI static void tickSneakMovementSystem(class StrictEntityContext const &, class Optional const>, class Optional const>, class Optional, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, struct MaxAutoStepComponent const &, struct SynchedActorDataComponent const &, struct MoveRequestComponent &, struct StateVectorComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, class FlagComponent, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, struct LocalSpatialEntityFetcherFactoryComponent const &, class LocalSpatialEntityFetcher &, class IConstBlockSource const &); + +//private: /** - * @symbol ?tickSneakMovementSystem\@SneakMovementSystem\@\@SAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUMoveInputComponent\@\@\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@AEBUMaxAutoStepComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUMoveRequestComponent\@\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEBULocalSpatialEntityFetcherFactoryComponent\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?_createViews\@SneakMovementSystem\@\@AEAA\@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\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - MCAPI static void tickSneakMovementSystem(class StrictEntityContext const &, class Optional const>, class Optional const>, class Optional, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, struct MaxAutoStepComponent const &, struct SynchedActorDataComponent const &, struct MoveRequestComponent &, struct StateVectorComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, struct LocalSpatialEntityFetcherFactoryComponent const &, class LocalSpatialEntityFetcher &, class IConstBlockSource const &); + MCAPI _createViews(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, class FlagComponent, struct DimensionTypeComponent, struct MaxAutoStepComponent, struct MoveInputComponent, class FlagComponent, struct SynchedActorDataComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp index da38ec5ae4..d6ddde9b30 100644 --- a/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp @@ -29,12 +29,8 @@ class SneakTriggerSystem { */ MCAPI static struct TickingSystemWithInfo createTriggerSystem(bool); /** - * @symbol ?determinePose\@SneakTriggerSystem\@\@SA?AUPlayerPoseTransitions\@1\@AEAUDeterminePoseArgs\@1\@\@Z + * @symbol ?updatePlayerState\@SneakTriggerSystem\@\@SA?AUPlayerPoseTransitions\@1\@AEBVGetCollisionShapeInterface\@\@AEBVAABB\@\@AEBVVec2\@\@_N3333333MAEBVIConstBlockSource\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static struct SneakTriggerSystem::PlayerPoseTransitions determinePose(struct SneakTriggerSystem::DeterminePoseArgs &); - /** - * @symbol ?doSneakTriggerSystemClient\@SneakTriggerSystem\@\@SAXAEAUDeterminePoseArgs\@1\@AEBVStrictEntityContext\@\@AEAUPlayerActionComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UShouldUpdateBoundingBoxRequestComponent\@\@\@\@\@Z - */ - MCAPI static void doSneakTriggerSystemClient(struct SneakTriggerSystem::DeterminePoseArgs &, class StrictEntityContext const &, struct PlayerActionComponent &, class EntityModifierT); + MCAPI static struct SneakTriggerSystem::PlayerPoseTransitions updatePlayerState(class GetCollisionShapeInterface const &, class AABB const &, class Vec2 const &, bool, bool, bool, bool, bool, bool, bool, bool, float, class IConstBlockSource const &, std::vector &); }; diff --git a/LiteLoader/include/llapi/mc/Sniffer.hpp b/LiteLoader/include/llapi/mc/Sniffer.hpp index 2fd0333d91..427c6412e2 100644 --- a/LiteLoader/include/llapi/mc/Sniffer.hpp +++ b/LiteLoader/include/llapi/mc/Sniffer.hpp @@ -32,125 +32,125 @@ class Sniffer : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@Sniffer\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Sniffer\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SnifferEggBlock.hpp b/LiteLoader/include/llapi/mc/SnifferEggBlock.hpp index 70578b6320..a0e30bc0b1 100644 --- a/LiteLoader/include/llapi/mc/SnifferEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/SnifferEggBlock.hpp @@ -31,20 +31,10 @@ class SnifferEggBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class SnifferEggBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class SnifferEggBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class SnifferEggBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class SnifferEggBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,50 +111,60 @@ class SnifferEggBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@SnifferEggBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SnifferEggBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,77 +176,82 @@ class SnifferEggBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@SnifferEggBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SnifferEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SnifferEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SnifferEggBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SnowBlock.hpp b/LiteLoader/include/llapi/mc/SnowBlock.hpp index 783a655130..718900cef2 100644 --- a/LiteLoader/include/llapi/mc/SnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/SnowBlock.hpp @@ -36,25 +36,15 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@SnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class SnowBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class SnowBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class SnowBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,40 +121,50 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,62 +176,67 @@ class SnowBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Snowball.hpp b/LiteLoader/include/llapi/mc/Snowball.hpp index 105e1f45e8..273dac5bcc 100644 --- a/LiteLoader/include/llapi/mc/Snowball.hpp +++ b/LiteLoader/include/llapi/mc/Snowball.hpp @@ -42,110 +42,110 @@ class Snowball : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** * @symbol ??0Snowball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SnowballItem.hpp b/LiteLoader/include/llapi/mc/SnowballItem.hpp index 4be2b6f6ce..32cbe2a464 100644 --- a/LiteLoader/include/llapi/mc/SnowballItem.hpp +++ b/LiteLoader/include/llapi/mc/SnowballItem.hpp @@ -6,7 +6,7 @@ #define AUTO_GENERATED #include "llapi/Global.h" #include "Json.hpp" -#include "Item.hpp" +#include "ComponentItem.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -17,7 +17,7 @@ * @brief MC class SnowballItem. * */ -class SnowballItem : public Item { +class SnowballItem : public ComponentItem { #define AFTER_EXTRA // Add Member There @@ -36,6 +36,11 @@ class SnowballItem : public Item { * @symbol __unk_vfn_0 */ virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol ?setDescriptionId\@SnowballItem\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + virtual class SnowballItem & setDescriptionId(std::string const &); /** * @vftbl 11 * @symbol __unk_vfn_11 @@ -52,15 +57,10 @@ class SnowballItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 23 - * @symbol ?isThrowable\@SnowballItem\@\@UEBA_NXZ + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual bool isThrowable() const; + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -106,16 +106,16 @@ class SnowballItem : public Item { * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); - /** - * @vftbl 84 - * @symbol ?use\@SnowballItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z - */ - virtual class ItemStack & use(class ItemStack &, class Player &) const; /** * @vftbl 85 * @symbol ?dispense\@SnowballItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + /** + * @vftbl 95 + * @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; /** * @vftbl 115 * @symbol __unk_vfn_115 @@ -126,5 +126,19 @@ class SnowballItem : public Item { * @symbol __unk_vfn_116 */ virtual void __unk_vfn_116(); + /** + * @vftbl 119 + * @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); + /** + * @vftbl 120 + * @symbol ?getIconInfo\@SnowballItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + */ + virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; + /** + * @symbol ??0SnowballItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI SnowballItem(std::string const &, int); }; diff --git a/LiteLoader/include/llapi/mc/SoulFireBlock.hpp b/LiteLoader/include/llapi/mc/SoulFireBlock.hpp index 27904ea4e6..b2fe2c0b39 100644 --- a/LiteLoader/include/llapi/mc/SoulFireBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulFireBlock.hpp @@ -31,25 +31,15 @@ class SoulFireBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SoulFireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SoulFireBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SoulFireBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SoulFireBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SoulFireBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,65 +116,70 @@ class SoulFireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@SoulFireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 88 + * @vftbl 91 * @symbol ?mayPick\@SoulFireBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SoulFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,75 +191,85 @@ class SoulFireBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SoulFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); + /** + * @vftbl 188 + * @symbol ?entityInside\@SoulFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SOULFIREBLOCK /** * @symbol ?canBeSilkTouched\@SoulFireBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp index 70e7f262a5..519a6526aa 100644 --- a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp @@ -36,30 +36,20 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@SoulSandBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SoulSandBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class SoulSandBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class SoulSandBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class SoulSandBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,50 +126,60 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 95 + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 98 * @symbol ?breaksFallingBlocks\@SoulSandBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,70 +191,75 @@ class SoulSandBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0SoulSandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp b/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp index 115a546abd..86ef7d93cf 100644 --- a/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp +++ b/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp @@ -35,9 +35,5 @@ class SoulSpeedAttributeSystem { * @symbol ?createSystem\@SoulSpeedAttributeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tickSystem\@SoulSpeedAttributeSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void tickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); }; diff --git a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp index a4e776a732..619432261b 100644 --- a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp @@ -36,20 +36,10 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SoulTorchBlock : public TorchBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SoulTorchBlock : public TorchBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SoulTorchBlock : public TorchBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,65 +171,70 @@ class SoulTorchBlock : public TorchBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 150 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 148 * @symbol ?animateTick\@SoulTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@SoulTorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0SoulTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/SparklerItem.hpp b/LiteLoader/include/llapi/mc/SparklerItem.hpp index e70b62cd38..d79178daaf 100644 --- a/LiteLoader/include/llapi/mc/SparklerItem.hpp +++ b/LiteLoader/include/llapi/mc/SparklerItem.hpp @@ -58,10 +58,10 @@ struct ColorInfo { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 49 * @symbol ?isHandEquipped\@SparklerItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp b/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp index 094a2a0e58..a0a0f7d932 100644 --- a/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp +++ b/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp @@ -28,9 +28,9 @@ class SpatialQueryUtility { public: /** - * @symbol ?forEachBlockInAABB\@SpatialQueryUtility\@\@SAXAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBV?$function\@$$A6AXAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachBlockInAABB\@SpatialQueryUtility\@\@SAXAEBVIConstBlockSource\@\@AEBVAABB\@\@MAEBV?$function\@$$A6AXAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@Z */ - MCAPI static void forEachBlockInAABB(class IConstBlockSource const &, class AABB const &, class std::function const &); + MCAPI static void forEachBlockInAABB(class IConstBlockSource const &, class AABB const &, float, class std::function const &); /** * @symbol ?testForCollidableMobs\@SpatialQueryUtility\@\@SAXAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@2V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp index f94e81b155..8f12aaf7df 100644 --- a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SpawnExperienceOrbPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SpawnExperienceOrbPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SpawnExperienceOrbPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPAWNEXPERIENCEORBPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp index a2e9ea6851..eedd0db412 100644 --- a/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SpawnParticleEffectPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SpawnParticleEffectPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SpawnParticleEffectPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPAWNPARTICLEEFFECTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp index 67accd4846..a974e0b390 100644 --- a/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp @@ -36,7 +36,7 @@ class SpawnPointCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SpawnSettings.hpp b/LiteLoader/include/llapi/mc/SpawnSettings.hpp index b5c3a34aa5..5aa932e468 100644 --- a/LiteLoader/include/llapi/mc/SpawnSettings.hpp +++ b/LiteLoader/include/llapi/mc/SpawnSettings.hpp @@ -22,11 +22,14 @@ struct SpawnSettings { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SPAWNSETTINGS public: struct SpawnSettings& operator=(struct SpawnSettings const &) = delete; - SpawnSettings(struct SpawnSettings const &) = delete; SpawnSettings() = delete; #endif public: + /** + * @symbol ??0SpawnSettings\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI SpawnSettings(struct SpawnSettings const &); /** * @symbol ??1SpawnSettings\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SpectatorFilterSystemImpl.hpp b/LiteLoader/include/llapi/mc/SpectatorFilterSystemImpl.hpp deleted file mode 100644 index c6b8533325..0000000000 --- a/LiteLoader/include/llapi/mc/SpectatorFilterSystemImpl.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file SpectatorFilterSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace SpectatorFilterSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?doTick\@SpectatorFilterSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBUActorGameTypeComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UIgnoresEntityInsideFlagComponent\@\@\@\@AEBUExternalDataInterface\@\@\@Z - */ - MCAPI void doTick(class StrictEntityContext const &, struct ActorGameTypeComponent const &, class EntityModifierT, struct ExternalDataInterface const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Spider.hpp b/LiteLoader/include/llapi/mc/Spider.hpp index 7e86f145ea..f168c13d59 100644 --- a/LiteLoader/include/llapi/mc/Spider.hpp +++ b/LiteLoader/include/llapi/mc/Spider.hpp @@ -39,152 +39,147 @@ enum class Type; */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol ?setBlockMovementSlowdownMultiplier\@Spider\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z - */ - virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); - /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Spider\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 129 + * @vftbl 117 * @symbol ?shouldRender\@Spider\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 205 + * @vftbl 192 * @symbol ?canBeAffected\@Spider\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Spider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 346 + * @vftbl 326 * @symbol ?getModelScale\@Spider\@\@UEBAMXZ */ virtual float getModelScale() const; /** - * @vftbl 347 + * @vftbl 327 * @symbol ?getSpiderType\@Spider\@\@UEBA?AW4Type\@1\@XZ */ virtual enum class Spider::Type getSpiderType() const; diff --git a/LiteLoader/include/llapi/mc/SplashPotionItem.hpp b/LiteLoader/include/llapi/mc/SplashPotionItem.hpp index b619383d9e..77c86c9d69 100644 --- a/LiteLoader/include/llapi/mc/SplashPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/SplashPotionItem.hpp @@ -53,10 +53,10 @@ class SplashPotionItem : public PotionItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@SplashPotionItem\@\@UEBA_NXZ @@ -148,7 +148,7 @@ class SplashPotionItem : public PotionItem { */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getPotionType\@SplashPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ */ virtual enum class Potion::PotionType getPotionType() const; diff --git a/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp b/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp index 8d7f9e6a42..642b1df2fc 100644 --- a/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp +++ b/LiteLoader/include/llapi/mc/SplitBlockUtils.hpp @@ -24,6 +24,10 @@ namespace SplitBlockUtils { * @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 ?LegacyCoralInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B */ @@ -44,6 +48,10 @@ namespace SplitBlockUtils { * @symbol ?LegacyLogInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B */ MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyLogInfo; + /** + * @symbol ?LegacyShulkerBoxInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B + */ + MCAPI extern struct SplitBlockUtils::LegacyBlockInfo const LegacyShulkerBoxInfo; /** * @symbol ?LegacyWoolInfo\@SplitBlockUtils\@\@3ULegacyBlockInfo\@1\@B */ diff --git a/LiteLoader/include/llapi/mc/SpongeBlock.hpp b/LiteLoader/include/llapi/mc/SpongeBlock.hpp index 5b0c2ec1a4..62f0e4dfa6 100644 --- a/LiteLoader/include/llapi/mc/SpongeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SpongeBlock.hpp @@ -36,20 +36,10 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SpongeBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SpongeBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SpongeBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,55 +116,65 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@SpongeBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,87 +186,92 @@ class SpongeBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@SpongeBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/SporeBlossomBlock.hpp b/LiteLoader/include/llapi/mc/SporeBlossomBlock.hpp index db4f28f258..41bfba1bdb 100644 --- a/LiteLoader/include/llapi/mc/SporeBlossomBlock.hpp +++ b/LiteLoader/include/llapi/mc/SporeBlossomBlock.hpp @@ -31,25 +31,15 @@ class SporeBlossomBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SporeBlossomBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SporeBlossomBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SporeBlossomBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SporeBlossomBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SporeBlossomBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,55 +116,65 @@ class SporeBlossomBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@SporeBlossomBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SporeBlossomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SporeBlossomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,70 +186,75 @@ class SporeBlossomBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@SporeBlossomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SporeBlossomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SporeBlossomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPOREBLOSSOMBLOCK /** * @symbol ?canBeSilkTouched\@SporeBlossomBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp b/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp index d58e9ca0b6..c3abedb791 100644 --- a/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp @@ -50,6 +50,11 @@ class SporeBlossomBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +81,15 @@ class SporeBlossomBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 + */ + virtual void __unk_vfn_36(); + /** + * @vftbl 39 + * @symbol __unk_vfn_39 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_39(); /** * @symbol ??0SporeBlossomBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp index 060c0f8318..12b645288f 100644 --- a/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp @@ -36,7 +36,7 @@ class SpreadPlayersCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SpreadPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp b/LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp index 62599be505..7a017b4290 100644 --- a/LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SprintTriggerSystemImpl.hpp @@ -17,8 +17,8 @@ namespace SprintTriggerSystemImpl { #undef AFTER_EXTRA /** - * @symbol ?doTick\@SprintTriggerSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@$$CBUItemInUseComponent\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEBV?$Optional\@$$CBUPassengerComponent\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@AEBUAbilitiesComponent\@\@AEBUMobEffectsComponent\@\@AEBUMoveInputComponent\@\@AEBUPlayerInputModeComponent\@\@AEBV?$Optional\@UPlayerActionComponent\@\@\@\@AEAUAttributesComponent\@\@AEAUPlayerInputRequestComponent\@\@AEAUVanillaClientGameplayComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UVehicleComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCanVehicleSprintFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USynchedActorDataComponent\@\@\@\@AEBUExternalDataInterface\@\@\@Z + * @symbol ?doTick\@SprintTriggerSystemImpl\@\@YAXAEBVStrictEntityContext\@\@AEBV?$Optional\@$$CBUItemInUseComponent\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEBV?$Optional\@$$CBUPassengerComponent\@\@\@\@AEBV?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@AEBUAbilitiesComponent\@\@AEBUMobEffectsComponent\@\@AEBUMoveInputComponent\@\@AEBUPlayerInputModeComponent\@\@AEBUStateVectorComponent\@\@AEBULocalPlayerLastPosComponent\@\@AEBV?$Optional\@UPlayerActionComponent\@\@\@\@AEAUAttributesComponent\@\@AEAUPlayerInputRequestComponent\@\@AEAUVanillaClientGameplayComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UVehicleComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCanVehicleSprintFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USynchedActorDataComponent\@\@\@\@AEBUExternalDataInterface\@\@\@Z */ - MCAPI void doTick(class StrictEntityContext const &, class Optional const &, class Optional const> const &, class Optional const &, class Optional const> const &, struct AbilitiesComponent const &, struct MobEffectsComponent const &, struct MoveInputComponent const &, struct PlayerInputModeComponent const &, class Optional const &, struct AttributesComponent &, struct PlayerInputRequestComponent &, struct VanillaClientGameplayComponent &, class ViewT const &, class ViewT>> const &, class ViewT const &, struct ExternalDataInterface const &); + MCAPI void doTick(class StrictEntityContext const &, class Optional const &, class Optional const> const &, class Optional const &, class Optional const> const &, struct AbilitiesComponent const &, struct MobEffectsComponent const &, struct MoveInputComponent const &, struct PlayerInputModeComponent const &, struct StateVectorComponent const &, struct LocalPlayerLastPosComponent const &, class Optional const &, struct AttributesComponent &, struct PlayerInputRequestComponent &, struct VanillaClientGameplayComponent &, class ViewT const &, class ViewT>> const &, class ViewT const &, struct ExternalDataInterface const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SpyglassItem.hpp b/LiteLoader/include/llapi/mc/SpyglassItem.hpp index be49b0c7f7..bedd4660df 100644 --- a/LiteLoader/include/llapi/mc/SpyglassItem.hpp +++ b/LiteLoader/include/llapi/mc/SpyglassItem.hpp @@ -52,10 +52,10 @@ class SpyglassItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/Squid.hpp b/LiteLoader/include/llapi/mc/Squid.hpp index 2e6f652af5..70118c10f8 100644 --- a/LiteLoader/include/llapi/mc/Squid.hpp +++ b/LiteLoader/include/llapi/mc/Squid.hpp @@ -42,152 +42,152 @@ class Squid : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Squid\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Squid\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Squid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@Squid\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Squid\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 286 + * @vftbl 269 * @symbol ?checkSpawnObstruction\@Squid\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?_getInkSquirtSoundEvent\@Squid\@\@MEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent _getInkSquirtSoundEvent() const; diff --git a/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp b/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp index 615dbf498f..10d6bb16de 100644 --- a/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp @@ -31,10 +31,6 @@ class SquidPreAiStepSystem { * @symbol ?createSystem\@SquidPreAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tick\@SquidPreAiStepSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@USquidFlag\@\@\@\@\@\@ULocalMoveVelocityComponent\@\@\@\@\@Z - */ - MCAPI static void tick(class ViewT, class FlagComponent>, struct LocalMoveVelocityComponent>); //private: /** diff --git a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp index 7c06afdee2..4e5ebb7858 100644 --- a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp @@ -41,6 +41,10 @@ class StackResultStorageEntity { public: //protected: + /** + * @symbol ??0StackResultStorageEntity\@\@IEAA\@$$QEAV0\@\@Z + */ + MCAPI StackResultStorageEntity(class StackResultStorageEntity &&); /** * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVWeakStorageEntity\@\@\@Z */ @@ -49,10 +53,6 @@ class StackResultStorageEntity { * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z */ MCAPI StackResultStorageEntity(class OwnerStorageEntity const &); - /** - * @symbol ??0StackResultStorageEntity\@\@IEAA\@$$QEAV0\@\@Z - */ - MCAPI StackResultStorageEntity(class StackResultStorageEntity &&); /** * @symbol ?_getStackRef\@StackResultStorageEntity\@\@IEBAAEAVEntityContext\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp b/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp index 2ffe5a875f..70fd611759 100644 --- a/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp @@ -32,8 +32,8 @@ class StackableAndMobNearCollisionSystem { */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?tick\@StackableAndMobNearCollisionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@$$CBUDimensionTypeComponent\@\@$$CBUSynchedActorDataComponent\@\@UMoveRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$OptionalGlobalT\@ULocalSpatialEntityFetcherFactoryComponent\@\@VEntityRegistryBase\@\@\@\@\@Z + * @symbol ?tick\@StackableAndMobNearCollisionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUDimensionTypeComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@UMoveRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$OptionalGlobalT\@ULocalSpatialEntityFetcherFactoryComponent\@\@VEntityRegistryBase\@\@\@\@\@Z */ - MCAPI static void tick(class ViewT const>, struct AABBShapeComponent const, struct DimensionTypeComponent const, struct SynchedActorDataComponent const, struct MoveRequestComponent>, class ViewT, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, class OptionalGlobalT); + MCAPI static void tick(class ViewT const>, struct MoveRequestComponent>, class ViewT, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, class OptionalGlobalT); }; diff --git a/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystemImpl.hpp b/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystemImpl.hpp new file mode 100644 index 0000000000..b1453cd52f --- /dev/null +++ b/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file StackableAndMobNearCollisionSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace StackableAndMobNearCollisionSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tickSystem\@StackableAndMobNearCollisionSystemImpl\@\@YAXAEAVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@AEAUMoveRequestComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEAULocalSpatialEntityFetcherFactoryComponent\@\@AEAVLocalSpatialEntityFetcher\@\@\@Z + */ + MCAPI void tickSystem(class StrictEntityContext &, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, struct SynchedActorDataComponent const &, class Optional const>, struct MoveRequestComponent &, class ViewT, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, struct LocalSpatialEntityFetcherFactoryComponent &, class LocalSpatialEntityFetcher &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp index 6dedab5ee7..35a77cc761 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp @@ -36,25 +36,15 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@StainedGlassBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class StainedGlassBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class StainedGlassBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class StainedGlassBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,55 +121,65 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 65 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 68 * @symbol ?canBeUsedInCommands\@StainedGlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@StainedGlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@StainedGlassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,77 +191,82 @@ class StainedGlassBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @symbol ?buildDescriptionId\@StainedGlassBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StainedGlassBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@StainedGlassBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@StainedGlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StainedGlassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp index 985c2dfbdf..1ba25230d4 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp @@ -36,20 +36,10 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StainedGlassPaneBlock : public ThinFenceBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StainedGlassPaneBlock : public ThinFenceBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StainedGlassPaneBlock : public ThinFenceBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,67 +176,72 @@ class StainedGlassPaneBlock : public ThinFenceBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @symbol ?buildDescriptionId\@StainedGlassPaneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StainedGlassPaneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StairBlock.hpp b/LiteLoader/include/llapi/mc/StairBlock.hpp index 08152252fe..e094a777f1 100644 --- a/LiteLoader/include/llapi/mc/StairBlock.hpp +++ b/LiteLoader/include/llapi/mc/StairBlock.hpp @@ -36,17 +36,22 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@StairBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?clip\@StairBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@StairBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 13 + * @vftbl 9 + * @symbol ?addAABBs\@StairBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + */ + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; + /** + * @vftbl 10 * @symbol ?getOutline\@StairBlock\@\@UEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ virtual class AABB const & getOutline(class BlockSource &, class BlockPos const &, class AABB &) const; @@ -56,35 +61,25 @@ class StairBlock : public BlockLegacy { */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 17 + * @vftbl 20 * @symbol ?liquidCanFlowIntoFromDirection\@StairBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@StairBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@StairBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -96,10 +91,10 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -110,11 +105,6 @@ class StairBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -135,6 +125,11 @@ class StairBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -145,11 +140,6 @@ class StairBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -166,85 +156,90 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 79 + * @vftbl 82 * @symbol ?getRedstoneProperty\@StairBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 88 + * @vftbl 91 * @symbol ?mayPick\@StairBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 89 + * @vftbl 92 * @symbol ?mayPick\@StairBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@StairBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@StairBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 96 + * @vftbl 99 * @symbol ?destroy\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@StairBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@StairBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; - /** - * @vftbl 109 - * @symbol ?handleEntityInside\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z - */ - virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -256,100 +251,100 @@ class StairBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@StairBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 162 + * @vftbl 160 * @symbol ?onExploded\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 163 + * @vftbl 161 * @symbol ?onStandOn\@StairBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 - */ - virtual void __unk_vfn_173(); - /** - * @vftbl 174 - * @symbol ?clip\@StairBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@StairBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STAIRBLOCK /** * @symbol ?canBeSilkTouched\@StairBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp b/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp index b5cf70aea9..b103ac2989 100644 --- a/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp @@ -35,6 +35,10 @@ class StandingVehiclePostPositionPassengerSystem { * @symbol ?_tick\@StandingVehiclePostPositionPassengerSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@$$CBUPassengerComponent\@\@UActorSetPositionRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@$$CBURenderRotationComponent\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURenderPositionComponent\@\@\@\@\@Z */ MCAPI static void _tick(class ViewT, struct PassengerComponent const, struct ActorSetPositionRequestComponent>, class ViewT>, struct StandAnimationComponent const, struct RenderRotationComponent const, struct Include, struct RenderPositionComponent const>); + /** + * @symbol ?_tickSingleEntity\@StandingVehiclePostPositionPassengerSystem\@\@SAXAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@$$CBUPassengerComponent\@\@UActorSetPositionRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@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 */ diff --git a/LiteLoader/include/llapi/mc/StartGamePacket.hpp b/LiteLoader/include/llapi/mc/StartGamePacket.hpp index a4ea9e8958..4ce5c1f708 100644 --- a/LiteLoader/include/llapi/mc/StartGamePacket.hpp +++ b/LiteLoader/include/llapi/mc/StartGamePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class StartGamePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StartGamePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StartGamePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STARTGAMEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp b/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp index e7058a90fa..374d685265 100644 --- a/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp @@ -46,9 +46,9 @@ struct StartGlidingSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol ?tick\@StartGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPlayerInputRequestComponent\@\@V?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@UPassengerComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@UVanillaClientGameplayComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@USynchedActorDataComponent\@\@UPlayerActionComponent\@\@UOffsetsComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol ?tick\@StartGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPlayerInputRequestComponent\@\@V?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@UPassengerComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UMoveInputComponent\@\@UVanillaClientGameplayComponent\@\@\@\@U?$Write\@USynchedActorDataComponent\@\@UPlayerActionComponent\@\@\@\@U?$AddRemove\@UShouldUpdateBoundingBoxRequestComponent\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, struct PlayerInputRequestComponent, class FlagComponent, struct PassengerComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, struct PlayerInputRequestComponent, class FlagComponent, struct PassengerComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createSystem\@StartGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp index 28a109deb9..228645cbb4 100644 --- a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp @@ -75,7 +75,9 @@ LIAPI extern class Block const* mBirchWallSign; LIAPI extern class Block const* mBlackCandle; LIAPI extern class Block const* mBlackCandleCake; LIAPI extern class Block const* mBlackCarpet; +LIAPI extern class Block const* mBlackConcrete; LIAPI extern class Block const* mBlackGlazedTerracotta; +LIAPI extern class Block const* mBlackShulkerBox; LIAPI extern class Block const* mBlackWool; LIAPI extern class Block const* mBlackstone; LIAPI extern class Block const* mBlackstoneDoubleSlab; @@ -86,8 +88,10 @@ LIAPI extern class Block const* mBlastFurnace; LIAPI extern class Block const* mBlueCandle; LIAPI extern class Block const* mBlueCandleCake; LIAPI extern class Block const* mBlueCarpet; +LIAPI extern class Block const* mBlueConcrete; LIAPI extern class Block const* mBlueGlazedTerracotta; LIAPI extern class Block const* mBlueIce; +LIAPI extern class Block const* mBlueShulkerBox; LIAPI extern class Block const* mBlueWool; LIAPI extern class Block const* mBoneBlock; LIAPI extern class Block const* mBookshelf; @@ -99,9 +103,11 @@ LIAPI extern class Block const* mBrickStairs; LIAPI extern class Block const* mBrownCandle; LIAPI extern class Block const* mBrownCandleCake; LIAPI extern class Block const* mBrownCarpet; +LIAPI extern class Block const* mBrownConcrete; LIAPI extern class Block const* mBrownGlazedTerracotta; LIAPI extern class Block const* mBrownMushroom; LIAPI extern class Block const* mBrownMushroomBlock; +LIAPI extern class Block const* mBrownShulkerBox; LIAPI extern class Block const* mBrownWool; LIAPI extern class Block const* mBubbleColumn; LIAPI extern class Block const* mBubbleCoral; @@ -166,7 +172,6 @@ LIAPI extern class Block const* mColoredTorchBp; LIAPI extern class Block const* mColoredTorchRg; LIAPI extern class Block const* mCommandBlock; LIAPI extern class Block const* mComposter; -LIAPI extern class Block const* mConcrete; LIAPI extern class Block const* mConcretePowder; LIAPI extern class Block const* mConduit; LIAPI extern class Block const* mCopperBlock; @@ -207,7 +212,9 @@ LIAPI extern class Block const* mCutCopperStairs; LIAPI extern class Block const* mCyanCandle; LIAPI extern class Block const* mCyanCandleCake; LIAPI extern class Block const* mCyanCarpet; +LIAPI extern class Block const* mCyanConcrete; LIAPI extern class Block const* mCyanGlazedTerracotta; +LIAPI extern class Block const* mCyanShulkerBox; LIAPI extern class Block const* mCyanWool; LIAPI extern class Block const* mDarkOakButton; LIAPI extern class Block const* mDarkOakDoor; @@ -313,12 +320,16 @@ LIAPI extern class Block const* mGravel; LIAPI extern class Block const* mGrayCandle; LIAPI extern class Block const* mGrayCandleCake; LIAPI extern class Block const* mGrayCarpet; +LIAPI extern class Block const* mGrayConcrete; LIAPI extern class Block const* mGrayGlazedTerracotta; +LIAPI extern class Block const* mGrayShulkerBox; LIAPI extern class Block const* mGrayWool; LIAPI extern class Block const* mGreenCandle; LIAPI extern class Block const* mGreenCandleCake; LIAPI extern class Block const* mGreenCarpet; +LIAPI extern class Block const* mGreenConcrete; LIAPI extern class Block const* mGreenGlazedTerracotta; +LIAPI extern class Block const* mGreenShulkerBox; LIAPI extern class Block const* mGreenWool; LIAPI extern class Block const* mGrindstone; LIAPI extern class Block const* mHangingRoots; @@ -372,18 +383,24 @@ LIAPI extern class Block const* mLightBlock; LIAPI extern class Block const* mLightBlueCandle; LIAPI extern class Block const* mLightBlueCandleCake; LIAPI extern class Block const* mLightBlueCarpet; +LIAPI extern class Block const* mLightBlueConcrete; LIAPI extern class Block const* mLightBlueGlazedTerracotta; +LIAPI extern class Block const* mLightBlueShulkerBox; LIAPI extern class Block const* mLightBlueWool; LIAPI extern class Block const* mLightGrayCandle; LIAPI extern class Block const* mLightGrayCandleCake; LIAPI extern class Block const* mLightGrayCarpet; +LIAPI extern class Block const* mLightGrayConcrete; +LIAPI extern class Block const* mLightGrayShulkerBox; LIAPI extern class Block const* mLightGrayWool; LIAPI extern class Block const* mLightWeightedPressurePlate; LIAPI extern class Block const* mLightningRod; LIAPI extern class Block const* mLimeCandle; LIAPI extern class Block const* mLimeCandleCake; LIAPI extern class Block const* mLimeCarpet; +LIAPI extern class Block const* mLimeConcrete; LIAPI extern class Block const* mLimeGlazedTerracotta; +LIAPI extern class Block const* mLimeShulkerBox; LIAPI extern class Block const* mLimeWool; LIAPI extern class Block const* mLitBlastFurnace; LIAPI extern class Block const* mLitDeepslateRedstoneOre; @@ -397,7 +414,9 @@ LIAPI extern class Block const* mLoom; LIAPI extern class Block const* mMagentaCandle; LIAPI extern class Block const* mMagentaCandleCake; LIAPI extern class Block const* mMagentaCarpet; +LIAPI extern class Block const* mMagentaConcrete; LIAPI extern class Block const* mMagentaGlazedTerracotta; +LIAPI extern class Block const* mMagentaShulkerBox; LIAPI extern class Block const* mMagentaWool; LIAPI extern class Block const* mMagma; LIAPI extern class Block const* mMangroveButton; @@ -461,7 +480,9 @@ LIAPI extern class Block const* mOchreFroglight; LIAPI extern class Block const* mOrangeCandle; LIAPI extern class Block const* mOrangeCandleCake; LIAPI extern class Block const* mOrangeCarpet; +LIAPI extern class Block const* mOrangeConcrete; LIAPI extern class Block const* mOrangeGlazedTerracotta; +LIAPI extern class Block const* mOrangeShulkerBox; LIAPI extern class Block const* mOrangeWool; LIAPI extern class Block const* mOxidizedCopper; LIAPI extern class Block const* mOxidizedCutCopper; @@ -474,8 +495,10 @@ LIAPI extern class Block const* mPearlescentFroglight; LIAPI extern class Block const* mPinkCandle; LIAPI extern class Block const* mPinkCandleCake; LIAPI extern class Block const* mPinkCarpet; +LIAPI extern class Block const* mPinkConcrete; LIAPI extern class Block const* mPinkGlazedTerracotta; LIAPI extern class Block const* mPinkPetals; +LIAPI extern class Block const* mPinkShulkerBox; LIAPI extern class Block const* mPinkWool; LIAPI extern class Block const* mPiston; LIAPI extern class Block const* mPistonArmCollision; @@ -518,7 +541,9 @@ LIAPI extern class Block const* mPumpkinStem; LIAPI extern class Block const* mPurpleCandle; LIAPI extern class Block const* mPurpleCandleCake; LIAPI extern class Block const* mPurpleCarpet; +LIAPI extern class Block const* mPurpleConcrete; LIAPI extern class Block const* mPurpleGlazedTerracotta; +LIAPI extern class Block const* mPurpleShulkerBox; LIAPI extern class Block const* mPurpleWool; LIAPI extern class Block const* mPurpurBlock; LIAPI extern class Block const* mPurpurStairs; @@ -533,6 +558,7 @@ LIAPI extern class Block const* mRawIronBlock; LIAPI extern class Block const* mRedCandle; LIAPI extern class Block const* mRedCandleCake; LIAPI extern class Block const* mRedCarpet; +LIAPI extern class Block const* mRedConcrete; LIAPI extern class Block const* mRedFlower; LIAPI extern class Block const* mRedGlazedTerracotta; LIAPI extern class Block const* mRedMushroom; @@ -541,6 +567,7 @@ LIAPI extern class Block const* mRedNetherBrick; LIAPI extern class Block const* mRedNetherBrickStairs; LIAPI extern class Block const* mRedSandstone; LIAPI extern class Block const* mRedSandstoneStairs; +LIAPI extern class Block const* mRedShulkerBox; LIAPI extern class Block const* mRedWool; LIAPI extern class Block const* mRedstoneBlock; LIAPI extern class Block const* mRedstoneLamp; @@ -566,7 +593,6 @@ LIAPI extern class Block const* mSeaLantern; LIAPI extern class Block const* mSeaPickle; LIAPI extern class Block const* mSeagrass; LIAPI extern class Block const* mShroomlight; -LIAPI extern class Block const* mShulkerBox; LIAPI extern class Block const* mSilverGlazedTerracotta; LIAPI extern class Block const* mSkull; LIAPI extern class Block const* mSlimeBlock; @@ -716,7 +742,9 @@ LIAPI extern class Block const* mWheat; LIAPI extern class Block const* mWhiteCandle; LIAPI extern class Block const* mWhiteCandleCake; LIAPI extern class Block const* mWhiteCarpet; +LIAPI extern class Block const* mWhiteConcrete; LIAPI extern class Block const* mWhiteGlazedTerracotta; +LIAPI extern class Block const* mWhiteShulkerBox; LIAPI extern class Block const* mWhiteWool; LIAPI extern class Block const* mWitherRose; LIAPI extern class Block const* mWood; @@ -727,7 +755,9 @@ LIAPI extern class Block const* mWoodenSlab; LIAPI extern class Block const* mYellowCandle; LIAPI extern class Block const* mYellowCandleCake; LIAPI extern class Block const* mYellowCarpet; +LIAPI extern class Block const* mYellowConcrete; LIAPI extern class Block const* mYellowFlower; LIAPI extern class Block const* mYellowGlazedTerracotta; +LIAPI extern class Block const* mYellowShulkerBox; LIAPI extern class Block const* mYellowWool; }; // namespace StaticVanillaBlocks diff --git a/LiteLoader/include/llapi/mc/StemBlock.hpp b/LiteLoader/include/llapi/mc/StemBlock.hpp index 1c75cb80ac..1ad39c0299 100644 --- a/LiteLoader/include/llapi/mc/StemBlock.hpp +++ b/LiteLoader/include/llapi/mc/StemBlock.hpp @@ -36,20 +36,15 @@ class StemBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@StemBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +56,10 @@ class StemBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +70,6 @@ class StemBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +90,11 @@ class StemBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +105,6 @@ class StemBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,70 +121,80 @@ class StemBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@StemBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@StemBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,87 +206,87 @@ class StemBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 134 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 135 * @symbol ?getColor\@StemBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColorAtPos\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 142 - * @symbol ?getVisualShape\@StemBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_162(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 */ virtual void __unk_vfn_164(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 - */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_167(); /** * @vftbl 169 - * @symbol __unk_vfn_169 - */ - virtual void __unk_vfn_169(); - /** - * @vftbl 171 * @symbol ?randomTick\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@StemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@StemBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/StoneBlock.hpp b/LiteLoader/include/llapi/mc/StoneBlock.hpp index 8ee8aa8847..369a8dd186 100644 --- a/LiteLoader/include/llapi/mc/StoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBlock.hpp @@ -36,20 +36,10 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StoneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StoneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StoneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -130,51 +115,61 @@ class StoneBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); /** * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 54 * @symbol ?canBeOriginalSurface\@StoneBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@StoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,82 +181,87 @@ class StoneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @symbol ?buildDescriptionId\@StoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?tryGetInfested\@StoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@StoneBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@StoneBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@StoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/StoneBricksBlock.hpp b/LiteLoader/include/llapi/mc/StoneBricksBlock.hpp index bf679b90ae..a3790b172e 100644 --- a/LiteLoader/include/llapi/mc/StoneBricksBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBricksBlock.hpp @@ -31,20 +31,10 @@ class StoneBricksBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class StoneBricksBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class StoneBricksBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class StoneBricksBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class StoneBricksBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,45 +111,55 @@ class StoneBricksBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@StoneBricksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 105 + * @symbol ?asItemInstance\@StoneBricksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,77 +171,82 @@ class StoneBricksBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StoneBricksBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 158 + * @vftbl 156 * @symbol ?tryGetInfested\@StoneBricksBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@StoneBricksBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StoneBricksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp index 5ad6ab6552..b16d331ba1 100644 --- a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp @@ -36,20 +36,10 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StoneButtonBlock : public ButtonBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StoneButtonBlock : public ButtonBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StoneButtonBlock : public ButtonBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class StoneButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0StoneButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp index e7d2ec06da..5b2115fd6c 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp @@ -36,20 +36,10 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StoneSlabBlock : public SlabBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StoneSlabBlock : public SlabBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StoneSlabBlock : public SlabBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@StoneSlabBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,82 +181,87 @@ class StoneSlabBlock : public SlabBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@StoneSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@StoneSlabBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp index 58e5003aa7..e136f71c0f 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp @@ -36,20 +36,10 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StoneSlabBlock2 : public SlabBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StoneSlabBlock2 : public SlabBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StoneSlabBlock2 : public SlabBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@StoneSlabBlock2\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,82 +181,87 @@ class StoneSlabBlock2 : public SlabBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock2\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@StoneSlabBlock2\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@StoneSlabBlock2\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp index 324a3c1071..c336b50196 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp @@ -36,20 +36,10 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StoneSlabBlock3 : public SlabBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StoneSlabBlock3 : public SlabBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StoneSlabBlock3 : public SlabBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@StoneSlabBlock3\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,82 +181,87 @@ class StoneSlabBlock3 : public SlabBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock3\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@StoneSlabBlock3\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@StoneSlabBlock3\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp index fc08807a2f..71ba81c542 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp @@ -36,20 +36,10 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StoneSlabBlock4 : public SlabBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StoneSlabBlock4 : public SlabBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StoneSlabBlock4 : public SlabBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@StoneSlabBlock4\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,82 +181,87 @@ class StoneSlabBlock4 : public SlabBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock4\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@StoneSlabBlock4\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@StoneSlabBlock4\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp index 15b63926f1..fa32a7489d 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp @@ -52,10 +52,10 @@ class StoneSlabBlockItem : public DeprecatedSlabBlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@StoneSlabBlockItem\@\@UEBAHH\@Z diff --git a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp index f802b0af3c..ebf032c86a 100644 --- a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp +++ b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp @@ -36,30 +36,25 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@StonecutterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z - */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); + virtual void __unk_vfn_22(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 25 + * @symbol ?canProvideSupport\@StonecutterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual void __unk_vfn_29(); + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +66,10 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +80,6 @@ class StonecutterBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class StonecutterBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class StonecutterBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,55 +131,65 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@StonecutterBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@StonecutterBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,72 +201,72 @@ class StonecutterBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@StonecutterBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StonecutterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StopCommand.hpp b/LiteLoader/include/llapi/mc/StopCommand.hpp index e685e2dfab..4dffbff29e 100644 --- a/LiteLoader/include/llapi/mc/StopCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopCommand.hpp @@ -36,7 +36,7 @@ class StopCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@StopCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/StopSoundCommand.hpp b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp index 0fd5633be2..0719c25148 100644 --- a/LiteLoader/include/llapi/mc/StopSoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp @@ -36,7 +36,7 @@ class StopSoundCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@StopSoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp index 0479e7180f..e7edca0f6a 100644 --- a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class StopSoundPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StopSoundPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StopSoundPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STOPSOUNDPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp index 72990747bd..8d4cca0f11 100644 --- a/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp +++ b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp @@ -11,30 +11,14 @@ #undef BEFORE_EXTRA -class StoreLocalMovementVelocitySystem { +namespace StoreLocalMovementVelocitySystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STORELOCALMOVEMENTVELOCITYSYSTEM -public: - class StoreLocalMovementVelocitySystem& operator=(class StoreLocalMovementVelocitySystem const &) = delete; - StoreLocalMovementVelocitySystem(class StoreLocalMovementVelocitySystem const &) = delete; - StoreLocalMovementVelocitySystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@StoreLocalMovementVelocitySystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - /** - * @symbol ?tickEntity\@StoreLocalMovementVelocitySystem\@\@SAXAEAVStrictEntityContext\@\@AEBUMobTravelComponent\@\@AEAUCurrentLocalMoveVelocityComponent\@\@\@Z - */ - MCAPI static void tickEntity(class StrictEntityContext &, struct MobTravelComponent const &, struct CurrentLocalMoveVelocityComponent &); /** - * @symbol ?tickStoreLocalMovementVelocitySystem\@StoreLocalMovementVelocitySystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@$$CBUMobTravelComponent\@\@UCurrentLocalMoveVelocityComponent\@\@\@\@\@Z + * @symbol ?createSystem\@StoreLocalMovementVelocitySystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static void tickStoreLocalMovementVelocitySystem(class ViewT>, struct MobTravelComponent const, struct CurrentLocalMoveVelocityComponent>); + MCAPI struct TickingSystemWithInfo createSystem(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystemUtils.hpp b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystemUtils.hpp new file mode 100644 index 0000000000..a060050af3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystemUtils.hpp @@ -0,0 +1,24 @@ +/** + * @file StoreLocalMovementVelocitySystemUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace StoreLocalMovementVelocitySystemUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?storeLocalMovementVelocity\@StoreLocalMovementVelocitySystemUtils\@\@YAXAEBUMobTravelComponent\@\@AEAUCurrentLocalMoveVelocityComponent\@\@\@Z + */ + MCAPI void storeLocalMovementVelocity(struct MobTravelComponent const &, struct CurrentLocalMoveVelocityComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp b/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp index 1b59ce1ad1..3c0feec342 100644 --- a/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp +++ b/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp @@ -31,5 +31,9 @@ class StoreWasAutoJumpingClientSystem { * @symbol ?createStoreWasAutoJumpingClientSystem\@StoreWasAutoJumpingClientSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createStoreWasAutoJumpingClientSystem(); + /** + * @symbol ?tickStoreWasAutoJumpingClientSystem\@StoreWasAutoJumpingClientSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UAutoJumpingFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasAutoJumpingFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tickStoreWasAutoJumpingClientSystem(class ViewT>, class Optional const>>, class EntityModifierT>); }; diff --git a/LiteLoader/include/llapi/mc/StrictEntityContext.hpp b/LiteLoader/include/llapi/mc/StrictEntityContext.hpp index 82a178bd7c..c02002e95b 100644 --- a/LiteLoader/include/llapi/mc/StrictEntityContext.hpp +++ b/LiteLoader/include/llapi/mc/StrictEntityContext.hpp @@ -27,10 +27,6 @@ class StrictEntityContext { #endif public: - /** - * @symbol ??0StrictEntityContext\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI StrictEntityContext(class StrictEntityContext &&); /** * @symbol ??0StrictEntityContext\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z */ @@ -39,6 +35,10 @@ class StrictEntityContext { * @symbol ??0StrictEntityContext\@\@QEAA\@AEBVEntityContextBase\@\@\@Z */ MCAPI StrictEntityContext(class EntityContextBase const &); + /** + * @symbol ??0StrictEntityContext\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI StrictEntityContext(class StrictEntityContext &&); /** * @symbol ?isNull\@StrictEntityContext\@\@QEBA_NXZ */ diff --git a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp deleted file mode 100644 index c1ed998a1b..0000000000 --- a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @file StrictEntityContextOwner.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class StrictEntityContextOwner. - * - */ -class StrictEntityContextOwner { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STRICTENTITYCONTEXTOWNER -public: - class StrictEntityContextOwner& operator=(class StrictEntityContextOwner const &) = delete; - StrictEntityContextOwner(class StrictEntityContextOwner const &) = delete; - StrictEntityContextOwner() = delete; -#endif - -public: - /** - * @symbol ??0StrictEntityContextOwner\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z - */ - MCAPI StrictEntityContextOwner(class EntityRegistryBase &, class EntityId); - /** - * @symbol ??0StrictEntityContextOwner\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI StrictEntityContextOwner(class StrictEntityContextOwner &&); - /** - * @symbol ?getStrictContext\@StrictEntityContextOwner\@\@QEBA?AVStrictEntityContext\@\@XZ - */ - MCAPI class StrictEntityContext getStrictContext() const; - /** - * @symbol ??4StrictEntityContextOwner\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class StrictEntityContextOwner & operator=(class StrictEntityContextOwner &&); - /** - * @symbol ??1StrictEntityContextOwner\@\@QEAA\@XZ - */ - MCAPI ~StrictEntityContextOwner(); - -}; diff --git a/LiteLoader/include/llapi/mc/Strider.hpp b/LiteLoader/include/llapi/mc/Strider.hpp index 9ad5fa07b0..c87af1f3ee 100644 --- a/LiteLoader/include/llapi/mc/Strider.hpp +++ b/LiteLoader/include/llapi/mc/Strider.hpp @@ -37,145 +37,145 @@ class Strider : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Strider\@\@MEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 241 + * @vftbl 228 * @symbol ?getNextStep\@Strider\@\@MEAAMM\@Z */ virtual float getNextStep(float); /** - * @vftbl 251 + * @vftbl 238 * @symbol ?shouldTryMakeStepSound\@Strider\@\@MEAA_NXZ */ virtual bool shouldTryMakeStepSound(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 258 + * @vftbl 245 * @symbol ?_playStepSound\@Strider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Strider\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Strider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StringTag.hpp b/LiteLoader/include/llapi/mc/StringTag.hpp index a70aa22b12..b20dbda142 100644 --- a/LiteLoader/include/llapi/mc/StringTag.hpp +++ b/LiteLoader/include/llapi/mc/StringTag.hpp @@ -45,9 +45,9 @@ string val; virtual void __unk_vfn_0(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2(); + virtual void write(class IDataOutput &) const; /** * @vftbl 3 * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z @@ -79,10 +79,6 @@ string val; */ virtual unsigned __int64 hash() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRINGTAG - /** - * @symbol ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z - */ - MCVAPI void write(class IDataOutput &) const; /** * @symbol __unk_destructor_-1 */ diff --git a/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp index 0285c69ac7..89f1c80a55 100644 --- a/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp @@ -36,20 +36,10 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StrippedLogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StrippedLogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StrippedLogBlock : public RotatedPillarBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,67 +171,72 @@ class StrippedLogBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 145 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 143 * @symbol ?getVariant\@StrippedLogBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@StrippedLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@StrippedLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/StructureBlock.hpp b/LiteLoader/include/llapi/mc/StructureBlock.hpp index 2598df982b..6488c207a5 100644 --- a/LiteLoader/include/llapi/mc/StructureBlock.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlock.hpp @@ -36,20 +36,10 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class StructureBlock : public ActorBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class StructureBlock : public ActorBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class StructureBlock : public ActorBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,55 +116,65 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@StructureBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 - */ - virtual void __unk_vfn_81(); - /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,67 +186,72 @@ class StructureBlock : public ActorBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@StructureBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@StructureBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/StructureBlockActor.hpp b/LiteLoader/include/llapi/mc/StructureBlockActor.hpp index 90a252266f..8cf070404a 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockActor.hpp @@ -60,6 +60,11 @@ class StructureBlockActor : public BlockActor { * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); + /** + * @vftbl 30 + * @symbol __unk_vfn_30 + */ + virtual void __unk_vfn_30(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -86,17 +91,22 @@ class StructureBlockActor : public BlockActor { */ virtual void __unk_vfn_35(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 36 + * @symbol __unk_vfn_36 */ - virtual void __unk_vfn_38(); + virtual void __unk_vfn_36(); /** * @vftbl 39 + * @symbol __unk_vfn_39 + */ + virtual void __unk_vfn_39(); + /** + * @vftbl 40 * @symbol ?_getUpdatePacket\@StructureBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 40 + * @vftbl 41 * @symbol ?_onUpdatePacket\@StructureBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp index 7223385dce..f124ff3c03 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -50,9 +51,9 @@ class StructureBlockUpdatePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StructureCommand.hpp b/LiteLoader/include/llapi/mc/StructureCommand.hpp index a4ab4673ab..623399ca64 100644 --- a/LiteLoader/include/llapi/mc/StructureCommand.hpp +++ b/LiteLoader/include/llapi/mc/StructureCommand.hpp @@ -36,7 +36,7 @@ class StructureCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@StructureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/StructureManager.hpp b/LiteLoader/include/llapi/mc/StructureManager.hpp index 51d9ded98a..0395b5c6e2 100644 --- a/LiteLoader/include/llapi/mc/StructureManager.hpp +++ b/LiteLoader/include/llapi/mc/StructureManager.hpp @@ -121,14 +121,14 @@ class StructureManager { * @symbol ?_createLevelStorageId\@StructureManager\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z */ MCAPI std::string _createLevelStorageId(std::string const &, std::string const &); - /** - * @symbol ?_findResource\@StructureManager\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@1AEBVPackInstance\@\@AEAV23\@\@Z - */ - MCAPI bool _findResource(std::string const &, class Core::PathBuffer> const &, class Core::PathBuffer> const &, class PackInstance const &, std::string &); /** * @symbol ?_findResource\@StructureManager\@\@AEAA_NAEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@AEBVPackInstance\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _findResource(class Core::PathBuffer> const &, class PackInstance const &, std::string &); + /** + * @symbol ?_findResource\@StructureManager\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@1AEBVPackInstance\@\@AEAV23\@\@Z + */ + MCAPI bool _findResource(std::string const &, class Core::PathBuffer> const &, class Core::PathBuffer> const &, class PackInstance const &, std::string &); /** * @symbol ?_placeSegment\@StructureManager\@\@AEAA_NAEAVStructureAnimationData\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructureSettings.hpp b/LiteLoader/include/llapi/mc/StructureSettings.hpp index c8b83c765b..c98a6df77f 100644 --- a/LiteLoader/include/llapi/mc/StructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/StructureSettings.hpp @@ -106,14 +106,14 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB * @symbol ?isAnimated\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool isAnimated() const; - /** - * @symbol ??4StructureSettings\@\@QEAAAEAV0\@AEBV0\@\@Z - */ - MCAPI class StructureSettings & operator=(class StructureSettings const &); /** * @symbol ??4StructureSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class StructureSettings & operator=(class StructureSettings &&); + /** + * @symbol ??4StructureSettings\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class StructureSettings & operator=(class StructureSettings const &); /** * @symbol ?setAllowNonTickingPlayerAndTickingAreaChunks\@StructureSettings\@\@QEAAX_N\@Z */ diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp index 406244374c..6f6599cdbf 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class StructureTemplateDataRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StructureTemplateDataRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StructureTemplateDataRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0StructureTemplateDataRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp index 6fe474eecf..67d25e05c6 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class StructureTemplateDataResponsePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@StructureTemplateDataResponsePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@StructureTemplateDataResponsePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURETEMPLATEDATARESPONSEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/StructureVoidBlock.hpp b/LiteLoader/include/llapi/mc/StructureVoidBlock.hpp index 04a89fb028..967e39307d 100644 --- a/LiteLoader/include/llapi/mc/StructureVoidBlock.hpp +++ b/LiteLoader/include/llapi/mc/StructureVoidBlock.hpp @@ -31,40 +31,30 @@ class StructureVoidBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@StructureVoidBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 6 - * @symbol ?isObstructingChests\@StructureVoidBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 10 - * @symbol ?getAABB\@StructureVoidBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; - /** - * @vftbl 11 + * @vftbl 7 * @symbol ?addCollisionShapes\@StructureVoidBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 8 + * @symbol ?getAABB\@StructureVoidBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 15 + * @symbol ?isObstructingChests\@StructureVoidBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +66,10 @@ class StructureVoidBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +80,6 @@ class StructureVoidBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +100,11 @@ class StructureVoidBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +115,6 @@ class StructureVoidBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,45 +131,55 @@ class StructureVoidBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 68 - * @symbol ?checkIsPathable\@StructureVoidBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 71 + * @symbol ?checkIsPathable\@StructureVoidBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ - virtual void __unk_vfn_74(); + virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,55 +191,60 @@ class StructureVoidBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREVOIDBLOCK /** * @symbol ?canBeSilkTouched\@StructureVoidBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp b/LiteLoader/include/llapi/mc/SubBBsComponent.hpp deleted file mode 100644 index e9a15e32e5..0000000000 --- a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SubBBsComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SubBBsComponent. - * - */ -struct SubBBsComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUBBBSCOMPONENT -public: - struct SubBBsComponent& operator=(struct SubBBsComponent const &) = delete; - SubBBsComponent(struct SubBBsComponent const &) = delete; - SubBBsComponent() = delete; -#endif - -public: - /** - * @symbol ??1SubBBsComponent\@\@QEAA\@XZ - */ - MCAPI ~SubBBsComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SubChunk.hpp b/LiteLoader/include/llapi/mc/SubChunk.hpp index 61b05f12d5..2694ea454f 100644 --- a/LiteLoader/include/llapi/mc/SubChunk.hpp +++ b/LiteLoader/include/llapi/mc/SubChunk.hpp @@ -10,6 +10,15 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +class SubChunkBrightnessStorage { +public: + struct LightPair { + unsigned char blockLight : 4; + unsigned char skyLight : 4; + }; + std::array mLightValues; +}; + #undef BEFORE_EXTRA /** @@ -20,7 +29,18 @@ struct SubChunk { #define AFTER_EXTRA // Add Member There - enum class SubChunkState; +public: + enum class SubChunkState : int { + Invalid =-1, + Normal = 0, + IsLightingSystemSubChunk = 1, + NeedsRequest = 2, + ReceivedResponseFromServer = 3, + ProcessingSubChunk = 4, + WaitingForCacheResponse = 5, + ProcessedSubChunk = 6, + RequestFinished = 7, + }; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUBCHUNK public: @@ -29,14 +49,14 @@ struct SubChunk { #endif public: - /** - * @symbol ??0SubChunk\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI SubChunk(struct SubChunk &&); /** * @symbol ??0SubChunk\@\@QEAA\@PEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z */ MCAPI SubChunk(class Block const *, bool, bool, class SpinLock &, signed char); + /** + * @symbol ??0SubChunk\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI SubChunk(struct SubChunk &&); /** * @symbol ??0SubChunk\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp index 8f0eb6d44e..0b68d43e96 100644 --- a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -53,9 +54,9 @@ class SubChunkPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SubChunkPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SubChunkPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUBCHUNKPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp index c63331d165..35fc79e334 100644 --- a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp @@ -37,14 +37,14 @@ class SubChunkRelighter { * @symbol ?_getAbsorption\@SubChunkRelighter\@\@QEBAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAE\@Z */ MCAPI struct SubChunk * _getAbsorption(struct SubChunkLightIndex, unsigned char &) const; - /** - * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z - */ - MCAPI void _propagateBlockLight(struct SubChunkLightIndex, unsigned char); /** * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXXZ */ MCAPI void _propagateBlockLight(); + /** + * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + */ + MCAPI void _propagateBlockLight(struct SubChunkLightIndex, unsigned char); /** * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXXZ */ @@ -61,14 +61,14 @@ class SubChunkRelighter { * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXXZ */ MCAPI void _propagateSubtractiveBlockLight(); - /** - * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXXZ - */ - MCAPI void _propagateSubtractiveSkyLight(); /** * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ MCAPI void _propagateSubtractiveSkyLight(struct SubChunkLightIndex, unsigned char); + /** + * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXXZ + */ + MCAPI void _propagateSubtractiveSkyLight(); /** * @symbol ?_setLightHelper\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@UBrightness\@\@111II\@Z */ diff --git a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp index af26fba2dc..8e5a5ad69e 100644 --- a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class SubChunkRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@SubChunkRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SubChunkRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SubChunkRequestPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp index e2488a1d9e..498b66265d 100644 --- a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -56,9 +57,9 @@ class SubClientLoginPacket : public Packet { virtual bool disallowBatching() const; /** * @vftbl 7 - * @symbol ?_read\@SubClientLoginPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SubClientLoginPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); /** * @symbol ??0SubClientLoginPacket\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp b/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp index 660cd179f5..149728cc07 100644 --- a/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp +++ b/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp @@ -37,5 +37,9 @@ class SubscribedObjectives { * @symbol ?removeObjective\@SubscribedObjectives\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void removeObjective(std::string const &); + /** + * @symbol ?sendEvent\@SubscribedObjectives\@\@QEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI void sendEvent(std::string const &, int) const; }; diff --git a/LiteLoader/include/llapi/mc/SugarCaneBlock.hpp b/LiteLoader/include/llapi/mc/SugarCaneBlock.hpp index dc35843c5f..50d0bd880a 100644 --- a/LiteLoader/include/llapi/mc/SugarCaneBlock.hpp +++ b/LiteLoader/include/llapi/mc/SugarCaneBlock.hpp @@ -31,25 +31,15 @@ class SugarCaneBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SugarCaneBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class SugarCaneBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class SugarCaneBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class SugarCaneBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class SugarCaneBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,70 +116,80 @@ class SugarCaneBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@SugarCaneBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@SugarCaneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SugarCaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,92 +201,97 @@ class SugarCaneBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@SugarCaneBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@SugarCaneBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColorAtPos\@SugarCaneBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 139 + * @vftbl 140 * @symbol ?onGraphicsModeChanged\@SugarCaneBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@SugarCaneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@SugarCaneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SugarCaneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@SugarCaneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/SummonCommand.hpp b/LiteLoader/include/llapi/mc/SummonCommand.hpp index d5d4a02b87..045b63c58d 100644 --- a/LiteLoader/include/llapi/mc/SummonCommand.hpp +++ b/LiteLoader/include/llapi/mc/SummonCommand.hpp @@ -37,7 +37,7 @@ class SummonCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@SummonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp index 45afe4d520..884cacaadc 100644 --- a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp +++ b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp @@ -52,10 +52,10 @@ class SuspiciousStewItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp index ffa5c41b47..3618b5bc24 100644 --- a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp +++ b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp @@ -41,25 +41,20 @@ class SweetBerryBushBlock : public BushBlock { */ virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +66,10 @@ class SweetBerryBushBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +80,6 @@ class SweetBerryBushBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +100,11 @@ class SweetBerryBushBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +115,6 @@ class SweetBerryBushBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,95 +131,100 @@ class SweetBerryBushBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 61 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@SweetBerryBushBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@SweetBerryBushBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@SweetBerryBushBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 108 + * @vftbl 111 * @symbol ?attack\@SweetBerryBushBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 112 - * @symbol ?entityInside\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 117 + * @vftbl 118 * @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 &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -241,100 +236,105 @@ class SweetBerryBushBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@SweetBerryBushBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 157 + * @vftbl 155 * @symbol ?dealsContactDamage\@SweetBerryBushBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@SweetBerryBushBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@SweetBerryBushBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; + /** + * @vftbl 188 + * @symbol ?entityInside\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SWEETBERRYBUSHBLOCK /** * @symbol ?canBeSilkTouched\@SweetBerryBushBlock\@\@MEBA_NXZ @@ -356,13 +356,13 @@ class SweetBerryBushBlock : public BushBlock { //private: /** - * @symbol ?_growBush\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_growBush\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_NPEAVActor\@\@\@Z */ - MCAPI bool _growBush(class BlockSource &, class BlockPos const &) const; + MCAPI bool _growBush(class BlockSource &, class BlockPos const &, bool, class Actor *) const; /** - * @symbol ?_pickBerries\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?_pickBerries\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVActor\@\@\@Z */ - MCAPI bool _pickBerries(class BlockSource &, class BlockPos const &, class Block const &) const; + MCAPI bool _pickBerries(class BlockSource &, class BlockPos const &, class Block const &, class Actor &) const; /** * @symbol ?_popBerries\@SweetBerryBushBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBH\@Z */ diff --git a/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp index 5dda10beb7..780a04c2c7 100644 --- a/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp @@ -49,16 +49,16 @@ class SwimTriggerSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol ?tick\@SwimTriggerSystem\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol ?tick\@SwimTriggerSystem\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, struct AbilitiesComponent, class FlagComponent, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?create\@SwimTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?tickSwimTriggerSystem\@SwimTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUActorRotationComponent\@\@AEBUMoveInputComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickSwimTriggerSystem\@SwimTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUActorRotationComponent\@\@AEBUMoveInputComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UActorGameTypeComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@UPlayerInputRequestComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UExternalDataComponent\@\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void tickSwimTriggerSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct ActorRotationComponent const &, struct MoveInputComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class Optional, struct PlayerInputRequestComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); + MCAPI static void tickSwimTriggerSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct ActorRotationComponent const &, struct MoveInputComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class Optional, struct PlayerInputRequestComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional, struct AABBShapeComponent, struct AbilitiesComponent, class FlagComponent, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct StateVectorComponent, struct SynchedActorDataComponent, class FlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); }; diff --git a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp index f189b4b464..a0c4da017c 100644 --- a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,29 +50,24 @@ class SyncActorPropertyPacket : public Packet { * @symbol ?write\@SyncActorPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; - /** - * @vftbl 4 - * @symbol ?read\@SyncActorPropertyPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z - */ - virtual struct ExtendedStreamReadResult read(class ReadOnlyBinaryStream &); /** * @vftbl 7 - * @symbol ?_read\@SyncActorPropertyPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@SyncActorPropertyPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SYNCACTORPROPERTYPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~SyncActorPropertyPacket(); #endif - /** - * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@AEBVHashedString\@\@AEBVPropertyGroupManager\@\@\@Z - */ - MCAPI SyncActorPropertyPacket(class HashedString const &, class PropertyGroupManager const &); /** * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@XZ */ MCAPI SyncActorPropertyPacket(); + /** + * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@AEBVHashedString\@\@AEBVPropertyGroupManager\@\@\@Z + */ + MCAPI SyncActorPropertyPacket(class HashedString const &, class PropertyGroupManager const &); }; diff --git a/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp b/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp index 8edbc4612a..10f00bdd82 100644 --- a/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp +++ b/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp @@ -10,19 +10,16 @@ #undef BEFORE_EXTRA -/** - * @brief MC class SyncedPlayerMovementSettings. - * - */ -class SyncedPlayerMovementSettings { + +struct SyncedPlayerMovementSettings { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SYNCEDPLAYERMOVEMENTSETTINGS public: - class SyncedPlayerMovementSettings& operator=(class SyncedPlayerMovementSettings const &) = delete; - SyncedPlayerMovementSettings(class SyncedPlayerMovementSettings const &) = delete; + struct SyncedPlayerMovementSettings& operator=(struct SyncedPlayerMovementSettings const &) = delete; + SyncedPlayerMovementSettings(struct SyncedPlayerMovementSettings const &) = delete; #endif public: @@ -35,4 +32,4 @@ class SyncedPlayerMovementSettings { */ MCAPI SyncedPlayerMovementSettings(); -}; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SynchedActorData.hpp b/LiteLoader/include/llapi/mc/SynchedActorData.hpp index e0a0f8bdf8..13dc97a0f3 100644 --- a/LiteLoader/include/llapi/mc/SynchedActorData.hpp +++ b/LiteLoader/include/llapi/mc/SynchedActorData.hpp @@ -165,14 +165,14 @@ class SynchedActorData { #endif public: - /** - * @symbol ??0SynchedActorData\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI SynchedActorData(class SynchedActorData &&); /** * @symbol ??0SynchedActorData\@\@QEAA\@XZ */ MCAPI SynchedActorData(); + /** + * @symbol ??0SynchedActorData\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI SynchedActorData(class SynchedActorData &&); /** * @symbol ?_clone\@SynchedActorData\@\@QEBA?AV1\@XZ */ @@ -213,10 +213,6 @@ class SynchedActorData { * @symbol ?getVec3\@SynchedActorData\@\@QEBA?AVVec3\@\@G\@Z */ MCAPI class Vec3 getVec3(unsigned short) const; - /** - * @symbol ?markDirty\@SynchedActorData\@\@QEAAXAEAVDataItem\@\@\@Z - */ - MCAPI void markDirty(class DataItem &); /** * @symbol ?markDirty\@SynchedActorData\@\@QEAAXG\@Z */ @@ -245,10 +241,6 @@ class SynchedActorData { * @symbol ?DIFF_ITEM_NULL\@SynchedActorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_ITEM_NULL; - /** - * @symbol ?getDiff\@SynchedActorData\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z - */ - MCAPI static class std::optional getDiff(class SynchedActorData const &, class SynchedActorData const &); //private: /** diff --git a/LiteLoader/include/llapi/mc/SystemInfo.hpp b/LiteLoader/include/llapi/mc/SystemInfo.hpp index 138152dd8c..e5f5484ad0 100644 --- a/LiteLoader/include/llapi/mc/SystemInfo.hpp +++ b/LiteLoader/include/llapi/mc/SystemInfo.hpp @@ -20,14 +20,14 @@ struct SystemInfo { #undef AFTER_EXTRA public: - /** - * @symbol ??0SystemInfo\@\@QEAA\@XZ - */ - MCAPI SystemInfo(); /** * @symbol ??0SystemInfo\@\@QEAA\@AEBU0\@\@Z */ MCAPI SystemInfo(struct SystemInfo const &); + /** + * @symbol ??0SystemInfo\@\@QEAA\@XZ + */ + MCAPI SystemInfo(); /** * @symbol ??4SystemInfo\@\@QEAAAEAU0\@AEBU0\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Tadpole.hpp b/LiteLoader/include/llapi/mc/Tadpole.hpp index 4cd4d0bbc2..58435b7bd2 100644 --- a/LiteLoader/include/llapi/mc/Tadpole.hpp +++ b/LiteLoader/include/llapi/mc/Tadpole.hpp @@ -40,127 +40,127 @@ class Tadpole : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?getFlopVerticalVelocityFactor\@Tadpole\@\@UEBAMXZ */ virtual float getFlopVerticalVelocityFactor() const; /** - * @vftbl 346 + * @vftbl 326 * @symbol ?getFlopHorizontalVelocityFactor\@Tadpole\@\@UEBAMXZ */ virtual float getFlopHorizontalVelocityFactor() const; diff --git a/LiteLoader/include/llapi/mc/Tag.hpp b/LiteLoader/include/llapi/mc/Tag.hpp index c77ea8de2f..c478ad3000 100644 --- a/LiteLoader/include/llapi/mc/Tag.hpp +++ b/LiteLoader/include/llapi/mc/Tag.hpp @@ -124,22 +124,22 @@ class Tag { virtual void deleteChildren(); /** * @vftbl 2 - * @symbol __unk_vfn_2 + * @symbol ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ - virtual void __unk_vfn_2() = 0; + virtual void write(class IDataOutput &) const = 0; /** * @vftbl 3 - * @symbol ?load\@DoubleTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &) = 0; /** * @vftbl 4 - * @symbol ?toString\@DoubleTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@StringTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const = 0; /** * @vftbl 5 - * @symbol ?getId\@DoubleTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @symbol ?getId\@StringTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const = 0; /** @@ -159,12 +159,12 @@ class Tag { virtual void print(std::string const &, class PrintStream &) const; /** * @vftbl 9 - * @symbol ?copy\@DoubleTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?copy\@StringTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const = 0; /** * @vftbl 10 - * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ + * @symbol ?hash\@StringTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TAG diff --git a/LiteLoader/include/llapi/mc/TagCommand.hpp b/LiteLoader/include/llapi/mc/TagCommand.hpp index cabd09c13a..bb857a4373 100644 --- a/LiteLoader/include/llapi/mc/TagCommand.hpp +++ b/LiteLoader/include/llapi/mc/TagCommand.hpp @@ -36,7 +36,7 @@ class TagCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TagCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp index 65e71f9ea2..f4186b8ac0 100644 --- a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class TakeItemActorPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TakeItemActorPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TakeItemActorPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TAKEITEMACTORPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/TakePictureCommand.hpp b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp index 73e7def5cf..54dd09f25c 100644 --- a/LiteLoader/include/llapi/mc/TakePictureCommand.hpp +++ b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp @@ -36,7 +36,7 @@ class TakePictureCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TakePictureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TallGrassBlock.hpp b/LiteLoader/include/llapi/mc/TallGrassBlock.hpp index e683ff9c09..a80219c33d 100644 --- a/LiteLoader/include/llapi/mc/TallGrassBlock.hpp +++ b/LiteLoader/include/llapi/mc/TallGrassBlock.hpp @@ -32,29 +32,19 @@ class TallGrassBlock : public BushBlock { virtual void __unk_vfn_0(); /** * @vftbl 8 - * @symbol ?randomlyModifyPosition\@TallGrassBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 * @symbol ?getAABB\@TallGrassBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 17 + * @symbol ?randomlyModifyPosition\@TallGrassBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_28(); + virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class TallGrassBlock : public BushBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class TallGrassBlock : public BushBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class TallGrassBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class TallGrassBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +121,80 @@ class TallGrassBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@TallGrassBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 86 + * @vftbl 89 * @symbol ?mayConsumeFertilizer\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@TallGrassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,107 +206,112 @@ class TallGrassBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@TallGrassBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?getColor\@TallGrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@TallGrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@TallGrassBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@TallGrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 + * @vftbl 176 * @symbol ?getRenderLayer\@TallGrassBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@TallGrassBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@TallGrassBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@TallGrassBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@TallGrassBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/TargetBlock.hpp b/LiteLoader/include/llapi/mc/TargetBlock.hpp index bf4b3e13d4..58cb31e1d4 100644 --- a/LiteLoader/include/llapi/mc/TargetBlock.hpp +++ b/LiteLoader/include/llapi/mc/TargetBlock.hpp @@ -36,25 +36,15 @@ class TargetBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 15 + * @vftbl 18 * @symbol ?onProjectileHit\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class TargetBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class TargetBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class TargetBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class TargetBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -135,56 +120,66 @@ class TargetBlock : public BlockLegacy { * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); + /** + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); /** * @vftbl 50 - * @symbol ?isSignalSource\@TargetBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_50 */ - virtual bool isSignalSource() const; + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); /** * @vftbl 53 - * @symbol __unk_vfn_53 + * @symbol ?isSignalSource\@TargetBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_53(); + virtual bool isSignalSource() const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@TargetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 - */ - virtual void __unk_vfn_81(); - /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,94 +191,70 @@ class TargetBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 167 + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); + /** + * @vftbl 165 * @symbol ?onPlace\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 - */ - virtual void __unk_vfn_173(); - /** - * @vftbl 177 - * @symbol __unk_vfn_177 - */ - virtual void __unk_vfn_177(); - /** - * @vftbl 186 - * @symbol __unk_vfn_186 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 194 - * @symbol __unk_vfn_194 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_197(); + virtual void __unk_vfn_171(); /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_198(); + virtual void __unk_vfn_174(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 183 + * @symbol __unk_vfn_183 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_183(); /** * @symbol ??0TargetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/TargetBlockHitEvent.hpp b/LiteLoader/include/llapi/mc/TargetBlockHitEvent.hpp new file mode 100644 index 0000000000..532a04ab61 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TargetBlockHitEvent.hpp @@ -0,0 +1,35 @@ +/** + * @file TargetBlockHitEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct TargetBlockHitEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TARGETBLOCKHITEVENT +public: + struct TargetBlockHitEvent& operator=(struct TargetBlockHitEvent const &) = delete; + TargetBlockHitEvent() = delete; +#endif + +public: + /** + * @symbol ??0TargetBlockHitEvent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI TargetBlockHitEvent(struct TargetBlockHitEvent const &); + /** + * @symbol ??1TargetBlockHitEvent\@\@QEAA\@XZ + */ + MCAPI ~TargetBlockHitEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TargetGoal.hpp b/LiteLoader/include/llapi/mc/TargetGoal.hpp index 3e9b29675d..919319ca43 100644 --- a/LiteLoader/include/llapi/mc/TargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetGoal.hpp @@ -90,14 +90,14 @@ class TargetGoal { */ MCVAPI ~TargetGoal(); #endif - /** - * @symbol ??0TargetGoal\@\@QEAA\@AEAVMob\@\@_NH1M1H\@Z - */ - MCAPI TargetGoal(class Mob &, bool, int, bool, float, bool, int); /** * @symbol ??0TargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@_NH2M2H\@Z */ MCAPI TargetGoal(class Mob &, std::vector const &, bool, int, bool, float, bool, int); + /** + * @symbol ??0TargetGoal\@\@QEAA\@AEAVMob\@\@_NH1M1H\@Z + */ + MCAPI TargetGoal(class Mob &, bool, int, bool, float, bool, int); //protected: /** diff --git a/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp b/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp index 9e02811daf..46d9546e2f 100644 --- a/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp +++ b/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp @@ -81,14 +81,14 @@ class TaskQueueImpl { * @symbol ?RundownObject\@TaskQueueImpl\@\@MEAAXXZ */ virtual void RundownObject(); - /** - * @symbol ?Initialize\@TaskQueueImpl\@\@QEAAJW4XTaskQueueDispatchMode\@\@0_N1\@Z - */ - MCAPI long Initialize(enum class XTaskQueueDispatchMode, enum class XTaskQueueDispatchMode, bool, bool); /** * @symbol ?Initialize\@TaskQueueImpl\@\@QEAAJPEAUXTaskQueuePortObject\@\@0\@Z */ MCAPI long Initialize(struct XTaskQueuePortObject *, struct XTaskQueuePortObject *); + /** + * @symbol ?Initialize\@TaskQueueImpl\@\@QEAAJW4XTaskQueueDispatchMode\@\@0_N1\@Z + */ + MCAPI long Initialize(enum class XTaskQueueDispatchMode, enum class XTaskQueueDispatchMode, bool, bool); /** * @symbol ??0TaskQueueImpl\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TeleportCommand.hpp b/LiteLoader/include/llapi/mc/TeleportCommand.hpp index 1fc1116e9a..f73442338d 100644 --- a/LiteLoader/include/llapi/mc/TeleportCommand.hpp +++ b/LiteLoader/include/llapi/mc/TeleportCommand.hpp @@ -40,7 +40,7 @@ enum class TeleportAnalysis; */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TeleportCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TellCommand.hpp b/LiteLoader/include/llapi/mc/TellCommand.hpp index 8efed02b0f..a0b6a23727 100644 --- a/LiteLoader/include/llapi/mc/TellCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellCommand.hpp @@ -36,7 +36,7 @@ class TellCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TellCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TellRawCommand.hpp b/LiteLoader/include/llapi/mc/TellRawCommand.hpp index d20b94c6c1..e5bbcf841b 100644 --- a/LiteLoader/include/llapi/mc/TellRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellRawCommand.hpp @@ -36,7 +36,7 @@ class TellRawCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TellRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp index fdc92d92e2..1f0ec611ee 100644 --- a/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp @@ -36,7 +36,7 @@ class TestForBlockCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TestForBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp index 0ede7eaaa7..2633b72a59 100644 --- a/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp @@ -36,7 +36,7 @@ class TestForBlocksCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TestForBlocksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TestForCommand.hpp b/LiteLoader/include/llapi/mc/TestForCommand.hpp index 90fae26782..e961b4d176 100644 --- a/LiteLoader/include/llapi/mc/TestForCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForCommand.hpp @@ -36,7 +36,7 @@ class TestForCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TestForCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TextPacket.hpp b/LiteLoader/include/llapi/mc/TextPacket.hpp index 741369e575..9a71ac293a 100644 --- a/LiteLoader/include/llapi/mc/TextPacket.hpp +++ b/LiteLoader/include/llapi/mc/TextPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "PlayerCapabilities.hpp" #include "Packet.hpp" @@ -53,9 +54,9 @@ class TextPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TextPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TextPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEXTPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp index bd68fe5f16..eff3c6581f 100644 --- a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp @@ -36,50 +36,45 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@ThinFenceBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?addCollisionShapes\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ - virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; + virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + /** + * @vftbl 9 + * @symbol ?addAABBs\@ThinFenceBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + */ + virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** * @vftbl 11 - * @symbol ?addCollisionShapes\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?getVisualShapeInWorld\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** * @vftbl 14 * @symbol ?getLiquidClipVolume\@ThinFenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -91,10 +86,10 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -105,11 +100,6 @@ class ThinFenceBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -130,6 +120,11 @@ class ThinFenceBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -140,11 +135,6 @@ class ThinFenceBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -161,55 +151,65 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@ThinFenceBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 65 + * @vftbl 68 * @symbol ?canBeUsedInCommands\@ThinFenceBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,62 +221,62 @@ class ThinFenceBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@ThinFenceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp index 93bd38658c..f5bf8343b7 100644 --- a/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp +++ b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp @@ -25,14 +25,14 @@ class ThirdPartyInfo { #endif public: - /** - * @symbol ??0ThirdPartyInfo\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ThirdPartyInfo(class ThirdPartyInfo const &); /** * @symbol ??0ThirdPartyInfo\@\@QEAA\@XZ */ MCAPI ThirdPartyInfo(); + /** + * @symbol ??0ThirdPartyInfo\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ThirdPartyInfo(class ThirdPartyInfo const &); /** * @symbol ??1ThirdPartyInfo\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/Throwable.hpp b/LiteLoader/include/llapi/mc/Throwable.hpp index 5ff95aa08f..dd9dd150a0 100644 --- a/LiteLoader/include/llapi/mc/Throwable.hpp +++ b/LiteLoader/include/llapi/mc/Throwable.hpp @@ -42,152 +42,152 @@ class Throwable : public PredictableProjectile { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 46 + * @vftbl 41 * @symbol ?lerpMotion\@Throwable\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@Throwable\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 167 + * @vftbl 155 * @symbol ?getSourceUniqueID\@Throwable\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Throwable\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Throwable\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?getThrowPower\@Throwable\@\@UEAAMXZ */ virtual float getThrowPower(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?getThrowUpAngleOffset\@Throwable\@\@MEAAMXZ */ virtual float getThrowUpAngleOffset(); /** - * @vftbl 271 + * @vftbl 257 * @symbol ?getGravity\@Throwable\@\@MEAAMXZ */ virtual float getGravity(); /** - * @vftbl 272 + * @vftbl 258 * @symbol ?getParticleType\@Throwable\@\@MEAA?AW4ParticleType\@\@XZ */ virtual enum class ParticleType getParticleType(); diff --git a/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp b/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp index 3b5a54161c..82351c1450 100644 --- a/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp @@ -59,6 +59,15 @@ class ThrowableItemComponent { * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VThrowableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); + /** + * @vftbl 6 + * @symbol ?handleVersionBasedInitialization\@ThrowableItemComponent\@\@UEAAXAEBVSemVersion\@\@\@Z + */ + virtual void handleVersionBasedInitialization(class SemVersion const &); + /** + * @symbol ??0ThrowableItemComponent\@\@QEAA\@PEAVComponentItem\@\@_N\@Z + */ + MCAPI ThrowableItemComponent(class ComponentItem *, bool); /** * @symbol ?releaseUsing\@ThrowableItemComponent\@\@QEBA_NAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ @@ -77,6 +86,10 @@ class ThrowableItemComponent { MCAPI static class HashedString const & getIdentifier(); //private: + /** + * @symbol ?_doThrow\@ThrowableItemComponent\@\@AEBAXAEAVItemStack\@\@AEAVPlayer\@\@AEBVProjectileItemComponent\@\@M\@Z + */ + MCAPI void _doThrow(class ItemStack &, class Player &, class ProjectileItemComponent const &, float) const; /** * @symbol ?_getLaunchPower\@ThrowableItemComponent\@\@AEBAMHHH\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownEgg.hpp b/LiteLoader/include/llapi/mc/ThrownEgg.hpp index dc8a301d63..084a8d43b1 100644 --- a/LiteLoader/include/llapi/mc/ThrownEgg.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEgg.hpp @@ -42,110 +42,110 @@ class ThrownEgg : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** * @symbol ??0ThrownEgg\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp index bf1bc61c45..96407af5be 100644 --- a/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp @@ -42,110 +42,110 @@ class ThrownEnderpearl : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** * @symbol ??0ThrownEnderpearl\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp index b56dd03ba8..ecdda37ccd 100644 --- a/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp +++ b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp @@ -42,110 +42,110 @@ class ThrownIceBomb : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** * @symbol ??0ThrownIceBomb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownPotion.hpp b/LiteLoader/include/llapi/mc/ThrownPotion.hpp index e9686900db..9eda53c1d2 100644 --- a/LiteLoader/include/llapi/mc/ThrownPotion.hpp +++ b/LiteLoader/include/llapi/mc/ThrownPotion.hpp @@ -42,130 +42,130 @@ class ThrownPotion : public Throwable { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 166 + * @vftbl 154 * @symbol ?queryEntityRenderer\@ThrownPotion\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & queryEntityRenderer() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 224 + * @vftbl 211 * @symbol ?setAuxValue\@ThrownPotion\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@ThrownPotion\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@ThrownPotion\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); /** * @symbol ??0ThrownPotion\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/ThrownTrident.hpp b/LiteLoader/include/llapi/mc/ThrownTrident.hpp index b161bc838a..3b4ea6f81d 100644 --- a/LiteLoader/include/llapi/mc/ThrownTrident.hpp +++ b/LiteLoader/include/llapi/mc/ThrownTrident.hpp @@ -47,142 +47,142 @@ class ThrownTrident : public AbstractArrow { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 87 + * @vftbl 78 * @symbol ?playerTouch\@ThrownTrident\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 127 + * @vftbl 116 * @symbol ?isEnchanted\@ThrownTrident\@\@UEBA_NXZ */ virtual bool isEnchanted() const; /** - * @vftbl 145 + * @vftbl 133 * @symbol ?despawn\@ThrownTrident\@\@UEAAXXZ */ virtual void despawn(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@ThrownTrident\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@ThrownTrident\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@ThrownTrident\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?shoot\@ThrownTrident\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 270 + * @vftbl 256 * @symbol ?_getPickupItem\@ThrownTrident\@\@MEBA?AVItemStack\@\@XZ */ virtual class ItemStack _getPickupItem() const; diff --git a/LiteLoader/include/llapi/mc/TickSyncPacket.hpp b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp index 4be18a6e88..b224df1910 100644 --- a/LiteLoader/include/llapi/mc/TickSyncPacket.hpp +++ b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class TickSyncPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TickSyncPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TickSyncPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKSYNCPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/TickWorldComponent.hpp b/LiteLoader/include/llapi/mc/TickWorldComponent.hpp index a766c89df9..d86d8c1190 100644 --- a/LiteLoader/include/llapi/mc/TickWorldComponent.hpp +++ b/LiteLoader/include/llapi/mc/TickWorldComponent.hpp @@ -28,14 +28,14 @@ class TickWorldComponent { #endif public: - /** - * @symbol ??0TickWorldComponent\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI TickWorldComponent(class TickWorldComponent &&); /** * @symbol ??0TickWorldComponent\@\@QEAA\@XZ */ MCAPI TickWorldComponent(); + /** + * @symbol ??0TickWorldComponent\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI TickWorldComponent(class TickWorldComponent &&); /** * @symbol ?getChunkRadius\@TickWorldComponent\@\@QEBAIXZ */ diff --git a/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp index 15867dc8e1..75161af6b3 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp @@ -36,7 +36,7 @@ class TickingAreaCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TickingAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp index 81d0c25a65..f55f4a9d60 100644 --- a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class TickingAreasLoadStatusPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TickingAreasLoadStatusPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TickingAreasLoadStatusPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKINGAREASLOADSTATUSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/TickingAreasManager.hpp b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp index f1f8576ffb..430575a076 100644 --- a/LiteLoader/include/llapi/mc/TickingAreasManager.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp @@ -84,6 +84,10 @@ class TickingAreasManager { * @symbol ?loadArea\@TickingAreasManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCompoundTag\@\@\@Z */ MCAPI void loadArea(std::string const &, class CompoundTag const *); + /** + * @symbol ?loadAreasFromSaveData\@TickingAreasManager\@\@QEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void loadAreasFromSaveData(class LevelStorage &); /** * @symbol ?onTickingEntityAdded\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEAVActor\@\@AEAVLevelStorage\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TimeCommand.hpp b/LiteLoader/include/llapi/mc/TimeCommand.hpp index 11cfe5b46d..7ff75936e8 100644 --- a/LiteLoader/include/llapi/mc/TimeCommand.hpp +++ b/LiteLoader/include/llapi/mc/TimeCommand.hpp @@ -36,7 +36,7 @@ class TimeCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TimeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TintMapColor.hpp b/LiteLoader/include/llapi/mc/TintMapColor.hpp new file mode 100644 index 0000000000..542c95be23 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TintMapColor.hpp @@ -0,0 +1,31 @@ +/** + * @file TintMapColor.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TintMapColor { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TINTMAPCOLOR +public: + class TintMapColor& operator=(class TintMapColor const &) = delete; + TintMapColor(class TintMapColor const &) = delete; +#endif + +public: + /** + * @symbol ??0TintMapColor\@\@QEAA\@XZ + */ + MCAPI TintMapColor(); + +}; diff --git a/LiteLoader/include/llapi/mc/TitleCommand.hpp b/LiteLoader/include/llapi/mc/TitleCommand.hpp index add5c078a4..f716c7b443 100644 --- a/LiteLoader/include/llapi/mc/TitleCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleCommand.hpp @@ -36,7 +36,7 @@ class TitleCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TitleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TitleRawCommand.hpp b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp index a00636d0c6..fa2c24da34 100644 --- a/LiteLoader/include/llapi/mc/TitleRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp @@ -37,7 +37,7 @@ class TitleRawCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@TitleRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TntBlock.hpp b/LiteLoader/include/llapi/mc/TntBlock.hpp index 5793025122..fa31fb1751 100644 --- a/LiteLoader/include/llapi/mc/TntBlock.hpp +++ b/LiteLoader/include/llapi/mc/TntBlock.hpp @@ -36,20 +36,10 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class TntBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class TntBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class TntBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,70 +116,80 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 69 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 72 * @symbol ?shouldDispense\@TntBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z */ virtual bool shouldDispense(class BlockSource &, class Container &) const; /** - * @vftbl 70 + * @vftbl 73 * @symbol ?dispense\@TntBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 96 + * @vftbl 99 * @symbol ?destroy\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 103 + * @vftbl 106 * @symbol ?trySpawnResourcesOnExplosion\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@M\@Z */ virtual void trySpawnResourcesOnExplosion(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, float) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,87 +201,92 @@ class TntBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@TntBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@TntBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?onExploded\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@TntBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@TntBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp b/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp index 0de2fafcc0..06a622232e 100644 --- a/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class ToastRequestPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@ToastRequestPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ToastRequestPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TOASTREQUESTPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~ToastRequestPacket(); #endif - /** - * @symbol ??0ToastRequestPacket\@\@QEAA\@XZ - */ - MCAPI ToastRequestPacket(); /** * @symbol ??0ToastRequestPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI ToastRequestPacket(std::string const &, std::string const &); + /** + * @symbol ??0ToastRequestPacket\@\@QEAA\@XZ + */ + MCAPI ToastRequestPacket(); }; diff --git a/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp index 011b5daa76..e03c387a9e 100644 --- a/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp +++ b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp @@ -36,7 +36,7 @@ class ToggleDownfallCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@ToggleDownfallCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp index 9d02d52a5c..5d830b464d 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp @@ -36,30 +36,25 @@ class TopSnowBlock : public FallingBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 5 + * @vftbl 6 * @symbol ?getCollisionShape\@TopSnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -70,16 +65,11 @@ class TopSnowBlock : public FallingBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@TopSnowBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -92,9 +82,9 @@ class TopSnowBlock : public FallingBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@TopSnowBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class TopSnowBlock : public FallingBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class TopSnowBlock : public FallingBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,100 +136,110 @@ class TopSnowBlock : public FallingBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@TopSnowBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@TopSnowBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 83 + * @vftbl 86 * @symbol ?isPreservingMediumWhenPlaced\@TopSnowBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 + * @vftbl 96 * @symbol ?tryToPlace\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z */ virtual bool tryToPlace(class BlockSource &, class BlockPos const &, class Block const &, struct ActorBlockSyncMessage const *) const; /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@TopSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@TopSnowBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@TopSnowBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 113 + * @vftbl 114 * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** - * @vftbl 114 + * @vftbl 115 * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 121 + * @vftbl 122 * @symbol ?shouldStopFalling\@TopSnowBlock\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool shouldStopFalling(class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -251,117 +251,117 @@ class TopSnowBlock : public FallingBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 162 + * @vftbl 160 * @symbol ?onExploded\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@TopSnowBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@TopSnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@TopSnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 + * @vftbl 192 * @symbol ?getDustColor\@TopSnowBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 195 + * @vftbl 193 * @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; /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_196(); + virtual void __unk_vfn_194(); /** - * @vftbl 198 + * @vftbl 196 * @symbol ?isFreeToFall\@TopSnowBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 + * @vftbl 197 * @symbol ?startFalling\@TopSnowBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; diff --git a/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp index de073deca4..c81b6ab2be 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp @@ -52,10 +52,10 @@ class TopSnowBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@TopSnowBlockItem\@\@UEBAHH\@Z @@ -117,7 +117,7 @@ class TopSnowBlockItem : public BlockItem { */ virtual void __unk_vfn_116(); /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@TopSnowBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/TorchBlock.hpp b/LiteLoader/include/llapi/mc/TorchBlock.hpp index 0d48246c70..c1d1943e10 100644 --- a/LiteLoader/include/llapi/mc/TorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchBlock.hpp @@ -36,25 +36,20 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class TorchBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class TorchBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class TorchBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +126,70 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@TorchBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@TorchBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,95 +201,95 @@ class TorchBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** * @vftbl 131 - * @symbol ?getIconYOffset\@TorchBlock\@\@UEBAHXZ + * @symbol __unk_vfn_131 */ - virtual int getIconYOffset() const; + virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 132 + * @symbol ?getIconYOffset\@TorchBlock\@\@UEBAHXZ */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual int getIconYOffset() const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 160 + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@TorchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 + * @vftbl 177 * @symbol ?getRenderLayer\@TorchBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TORCHBLOCK /** * @symbol ?canBeSilkTouched\@TorchBlock\@\@MEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/TorchflowerBlock.hpp b/LiteLoader/include/llapi/mc/TorchflowerBlock.hpp index 253000f4a1..d050b20cab 100644 --- a/LiteLoader/include/llapi/mc/TorchflowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchflowerBlock.hpp @@ -31,20 +31,10 @@ class TorchflowerBlock : public FlowerBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class TorchflowerBlock : public FlowerBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class TorchflowerBlock : public FlowerBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class TorchflowerBlock : public FlowerBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class TorchflowerBlock : public FlowerBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,50 +111,60 @@ class TorchflowerBlock : public FlowerBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@TorchflowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@TorchflowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,55 +176,60 @@ class TorchflowerBlock : public FlowerBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0TorchflowerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp index a5c5b50ab6..c3306f5733 100644 --- a/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp @@ -31,25 +31,15 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@TorchflowerCropBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class TorchflowerCropBlock : public CropBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class TorchflowerCropBlock : public CropBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class TorchflowerCropBlock : public CropBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 85 - * @symbol ?onFertilized\@TorchflowerCropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 88 + * @symbol ?onFertilized\@TorchflowerCropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,77 +176,82 @@ class TorchflowerCropBlock : public CropBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@TorchflowerCropBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 195 + * @vftbl 193 * @symbol ?setGrowth\@TorchflowerCropBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@GH\@Z */ virtual class Block const & setGrowth(class BlockSource &, class BlockPos const &, class Block const &, unsigned short, int) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getBaseSeed\@TorchflowerCropBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getBaseCrop\@TorchflowerCropBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 198 + * @vftbl 196 * @symbol ?getSeedNum\@TorchflowerCropBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getSeedNum(class Randomize &, int, int) const; diff --git a/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp index 7ea16042ae..9ef164b060 100644 --- a/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp +++ b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp @@ -70,12 +70,4 @@ class TradeInterestGoal { */ virtual void appendDebugInfo(std::string &) const; -//private: - /** - * @symbol ?_isLookingAtMe\@TradeInterestGoal\@\@AEBA_NAEBVPlayer\@\@\@Z - */ - MCAPI bool _isLookingAtMe(class Player const &) const; - -private: - }; diff --git a/LiteLoader/include/llapi/mc/TransferPacket.hpp b/LiteLoader/include/llapi/mc/TransferPacket.hpp index 34b1d87be7..6c3e7e114a 100644 --- a/LiteLoader/include/llapi/mc/TransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/TransferPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class TransferPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TransferPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TransferPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRANSFERPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp index 72d8527884..6a9b127b59 100644 --- a/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp @@ -36,35 +36,30 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** * @vftbl 22 - * @symbol ?canProvideSupport\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @symbol __unk_vfn_22 */ - virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; + virtual void __unk_vfn_22(); /** * @vftbl 25 - * @symbol ?canConnect\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @symbol ?canProvideSupport\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ - virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; + virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @symbol ?canConnect\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ - virtual void __unk_vfn_29(); + virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -76,10 +71,10 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -90,11 +85,6 @@ class TrapDoorBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -115,6 +105,11 @@ class TrapDoorBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -125,11 +120,6 @@ class TrapDoorBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -146,70 +136,80 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@TrapDoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 72 + * @vftbl 75 * @symbol ?onRedstoneUpdate\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@TrapDoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@TrapDoorBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,70 +221,70 @@ class TrapDoorBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@TrapDoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRAPDOORBLOCK /** * @symbol ?canBeSilkTouched\@TrapDoorBlock\@\@MEBA_NXZ @@ -301,6 +301,10 @@ class TrapDoorBlock : public BlockLegacy { MCAPI TrapDoorBlock(std::string const &, int, class Material const &); //private: + /** + * @symbol ?_getShape\@TrapDoorBlock\@\@AEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + MCAPI class AABB const & _getShape(class Block const &, class AABB &, bool) const; /** * @symbol ?_toggleOpen\@TrapDoorBlock\@\@AEBAXAEAVBlockSource\@\@PEAVActor\@\@AEBVBlockPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TravelTypeSensingSystem.hpp b/LiteLoader/include/llapi/mc/TravelTypeSensingSystem.hpp index a5743f4123..16e03458a5 100644 --- a/LiteLoader/include/llapi/mc/TravelTypeSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/TravelTypeSensingSystem.hpp @@ -24,10 +24,6 @@ class TravelTypeSensingSystem { #endif public: - /** - * @symbol ?createTravelTypeSensingSideBySideSystem\@TravelTypeSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createTravelTypeSensingSideBySideSystem(); /** * @symbol ?createTravelTypeSensingSystem\@TravelTypeSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TreeHelper.hpp b/LiteLoader/include/llapi/mc/TreeHelper.hpp index 1fdbe5e779..bf601dc8ac 100644 --- a/LiteLoader/include/llapi/mc/TreeHelper.hpp +++ b/LiteLoader/include/llapi/mc/TreeHelper.hpp @@ -26,14 +26,14 @@ struct TreeParams { }; #undef AFTER_EXTRA - /** - * @symbol ?isValidTreePosition\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI bool isValidTreePosition(class IBlockWorldGenAPI const &, class BlockPos const &); /** * @symbol ?isValidTreePosition\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBUTreeParams\@1\@\@Z */ MCAPI bool isValidTreePosition(class IBlockWorldGenAPI const &, class BlockPos const &, struct TreeHelper::TreeParams const &); + /** + * @symbol ?isValidTreePosition\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI bool isValidTreePosition(class IBlockWorldGenAPI const &, class BlockPos const &); /** * @symbol ?placeBaseBlock\@TreeHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@3\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TridentItem.hpp b/LiteLoader/include/llapi/mc/TridentItem.hpp index 4f5b1654ed..ec1ffcab57 100644 --- a/LiteLoader/include/llapi/mc/TridentItem.hpp +++ b/LiteLoader/include/llapi/mc/TridentItem.hpp @@ -52,10 +52,10 @@ class TridentItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 23 * @symbol ?isThrowable\@TridentItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/TriggerJumpSystem.hpp b/LiteLoader/include/llapi/mc/TriggerJumpSystem.hpp index ff98770133..34c8ddcb0d 100644 --- a/LiteLoader/include/llapi/mc/TriggerJumpSystem.hpp +++ b/LiteLoader/include/llapi/mc/TriggerJumpSystem.hpp @@ -28,10 +28,6 @@ class TriggerJumpSystem { * @symbol ?createCleanupSystem\@TriggerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createCleanupSystem(); - /** - * @symbol ?createTriggerJumpSideBySideSystem\@TriggerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createTriggerJumpSideBySideSystem(); /** * @symbol ?createTriggerJumpSystem\@TriggerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TrimDataPacket.hpp b/LiteLoader/include/llapi/mc/TrimDataPacket.hpp index 851d4e0328..d55b02ed10 100644 --- a/LiteLoader/include/llapi/mc/TrimDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/TrimDataPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -46,9 +47,9 @@ class TrimDataPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@TrimDataPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@TrimDataPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRIMDATAPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/TrimMaterial.hpp b/LiteLoader/include/llapi/mc/TrimMaterial.hpp index defc4c700c..7701ae1442 100644 --- a/LiteLoader/include/llapi/mc/TrimMaterial.hpp +++ b/LiteLoader/include/llapi/mc/TrimMaterial.hpp @@ -24,6 +24,10 @@ struct TrimMaterial { #endif public: + /** + * @symbol ??0TrimMaterial\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI TrimMaterial(struct TrimMaterial &&); /** * @symbol ??1TrimMaterial\@\@QEAA\@XZ */ diff --git a/LiteLoader/include/llapi/mc/TripWireBlock.hpp b/LiteLoader/include/llapi/mc/TripWireBlock.hpp index 356fe470a7..0e3e39b196 100644 --- a/LiteLoader/include/llapi/mc/TripWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireBlock.hpp @@ -36,25 +36,20 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class TripWireBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class TripWireBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class TripWireBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,60 +126,65 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@TripWireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 111 + * @vftbl 113 * @symbol ?shouldTriggerEntityInside\@TripWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 112 - * @symbol ?entityInside\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,85 +196,90 @@ class TripWireBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 188 + * @symbol ?entityInside\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** * @symbol ??0TripWireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp index c941bf6636..8d9d9bfbbc 100644 --- a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp @@ -36,25 +36,20 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 12 + * @symbol ?getVisualShape\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShape(class Block const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class TripWireHookBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class TripWireHookBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class TripWireHookBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +126,80 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_50(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_51(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 66 * @symbol ?shouldConnectToRedstone\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@TripWireHookBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,85 +211,85 @@ class TripWireHookBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 142 - * @symbol ?getVisualShape\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; + virtual void __unk_vfn_131(); /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@TripWireHookBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0TripWireHookBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/TripWireTripEvent.hpp b/LiteLoader/include/llapi/mc/TripWireTripEvent.hpp new file mode 100644 index 0000000000..1aea6b24b6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TripWireTripEvent.hpp @@ -0,0 +1,35 @@ +/** + * @file TripWireTripEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct TripWireTripEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIPWIRETRIPEVENT +public: + struct TripWireTripEvent& operator=(struct TripWireTripEvent const &) = delete; + TripWireTripEvent() = delete; +#endif + +public: + /** + * @symbol ??0TripWireTripEvent\@\@QEAA\@AEBU0\@\@Z + */ + MCAPI TripWireTripEvent(struct TripWireTripEvent const &); + /** + * @symbol ??1TripWireTripEvent\@\@QEAA\@XZ + */ + MCAPI ~TripWireTripEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TripodCamera.hpp b/LiteLoader/include/llapi/mc/TripodCamera.hpp index 7cc143add6..3db5d9c244 100644 --- a/LiteLoader/include/llapi/mc/TripodCamera.hpp +++ b/LiteLoader/include/llapi/mc/TripodCamera.hpp @@ -47,150 +47,150 @@ class TripodCamera : public Mob { */ virtual void remove(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 77 + * @vftbl 68 * @symbol ?getShadowHeightOffs\@TripodCamera\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@TripodCamera\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@TripodCamera\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@TripodCamera\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@TripodCamera\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 330 + * @vftbl 313 * @symbol ?canExistWhenDisallowMob\@TripodCamera\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRIPODCAMERA /** * @symbol ?breaksFallingBlocks\@TripodCamera\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/TropicalFish.hpp b/LiteLoader/include/llapi/mc/TropicalFish.hpp index 04ac982c3b..70a8203f44 100644 --- a/LiteLoader/include/llapi/mc/TropicalFish.hpp +++ b/LiteLoader/include/llapi/mc/TropicalFish.hpp @@ -42,140 +42,140 @@ class TropicalFish : public WaterAnimal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 52 + * @vftbl 47 * @symbol ?startRiding\@TropicalFish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@TropicalFish\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@TropicalFish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 323 + * @vftbl 306 * @symbol ?createAIGoals\@TropicalFish\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0TropicalFish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Turtle.hpp b/LiteLoader/include/llapi/mc/Turtle.hpp index a256f4a00d..5220872522 100644 --- a/LiteLoader/include/llapi/mc/Turtle.hpp +++ b/LiteLoader/include/llapi/mc/Turtle.hpp @@ -37,135 +37,135 @@ class Turtle : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 78 + * @vftbl 69 * @symbol ?getShadowRadius\@Turtle\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@Turtle\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@Turtle\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Turtle\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp index 3505642e08..b1fd766b61 100644 --- a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp @@ -36,25 +36,15 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@TurtleEggBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class TurtleEggBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class TurtleEggBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class TurtleEggBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,70 +121,75 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@TurtleEggBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 68 + * @vftbl 71 * @symbol ?checkIsPathable\@TurtleEggBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 71 + * @vftbl 74 * @symbol ?transformOnFall\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ virtual void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 90 + * @vftbl 93 * @symbol ?mayPlace\@TurtleEggBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z - */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -211,90 +201,100 @@ class TurtleEggBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@TurtleEggBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 188 + * @symbol ?entityInside\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TURTLEEGGBLOCK /** * @symbol ?waterSpreadCausesSpawn\@TurtleEggBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp index bebb5fea9e..73aaeb8f59 100644 --- a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp @@ -36,25 +36,15 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@TwistingVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class TwistingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class TwistingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class TwistingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,65 +121,75 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@TwistingVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,77 +201,82 @@ class TwistingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@TwistingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/Types.hpp b/LiteLoader/include/llapi/mc/Types.hpp index c4086d5df1..0289143f4e 100644 --- a/LiteLoader/include/llapi/mc/Types.hpp +++ b/LiteLoader/include/llapi/mc/Types.hpp @@ -55,6 +55,10 @@ namespace reflection { struct Schema {}; } // namespace reflection +namespace cereal { +struct Schema {}; +} + template class AutomaticID { T id; diff --git a/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp b/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp index 032992cfb4..6c7232505a 100644 --- a/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp @@ -46,9 +46,14 @@ struct UnderWaterSensingSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @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\@\@UUpdateWaterStateRequestComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@$$V\@\@U?$AddRemove\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @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\@\@UUpdateWaterStateRequestComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@\@\@U?$Write\@$$V\@\@U?$AddRemove\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, class Optional>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + /** + * @vftbl 5 + * @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\@\@UUpdateWaterStateRequestComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@V?$Optional\@UVanillaOffsetComponent\@\@\@\@V?$Optional\@UPassengerRenderingRidingOffsetComponent\@\@\@\@\@\@U?$Write\@$$V\@\@U?$AddRemove\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@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, class Optional>, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class StrictEntityContext &); /** * @symbol ?createSystem\@UnderWaterSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp index b42c2047b3..e58c66c179 100644 --- a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp @@ -36,20 +36,10 @@ class UnderwaterTorchBlock : public TorchBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -60,16 +50,11 @@ class UnderwaterTorchBlock : public TorchBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@UnderwaterTorchBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -82,9 +67,9 @@ class UnderwaterTorchBlock : public TorchBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@UnderwaterTorchBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class UnderwaterTorchBlock : public TorchBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class UnderwaterTorchBlock : public TorchBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,55 +121,65 @@ class UnderwaterTorchBlock : public TorchBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@UnderwaterTorchBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 65 + * @vftbl 68 * @symbol ?canBeUsedInCommands\@UnderwaterTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@UnderwaterTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,60 +191,65 @@ class UnderwaterTorchBlock : public TorchBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 150 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 148 * @symbol ?animateTick\@UnderwaterTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0UnderwaterTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp index 77bd6051f7..c45f2db40f 100644 --- a/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp @@ -36,30 +36,20 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@UndyedShulkerBoxBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@UndyedShulkerBoxBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class UndyedShulkerBoxBlock : public ChestBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class UndyedShulkerBoxBlock : public ChestBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class UndyedShulkerBoxBlock : public ChestBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,75 +126,85 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 70 + * @vftbl 73 * @symbol ?dispense\@UndyedShulkerBoxBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 78 + * @vftbl 81 * @symbol ?setupRedstoneComponent\@UndyedShulkerBoxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@UndyedShulkerBoxBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 100 + * @vftbl 103 * @symbol ?playerWillDestroy\@UndyedShulkerBoxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 101 + * @vftbl 104 * @symbol ?spawnResources\@UndyedShulkerBoxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@UndyedShulkerBoxBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@UndyedShulkerBoxBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -221,62 +216,67 @@ class UndyedShulkerBoxBlock : public ChestBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 134 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 135 * @symbol ?getColor\@UndyedShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@UndyedShulkerBoxBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/UnknownBlock.hpp b/LiteLoader/include/llapi/mc/UnknownBlock.hpp index ffc671de0d..fbc13e7256 100644 --- a/LiteLoader/include/llapi/mc/UnknownBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnknownBlock.hpp @@ -36,20 +36,10 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class UnknownBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class UnknownBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class UnknownBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class UnknownBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0UnknownBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/UnlockRecipeCommand.hpp b/LiteLoader/include/llapi/mc/UnlockRecipeCommand.hpp new file mode 100644 index 0000000000..eee0915ee9 --- /dev/null +++ b/LiteLoader/include/llapi/mc/UnlockRecipeCommand.hpp @@ -0,0 +1,43 @@ +/** + * @file UnlockRecipeCommand.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Command.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class UnlockRecipeCommand : public Command { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_UNLOCKRECIPECOMMAND +public: + class UnlockRecipeCommand& operator=(class UnlockRecipeCommand const &) = delete; + UnlockRecipeCommand(class UnlockRecipeCommand const &) = delete; + UnlockRecipeCommand() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?execute\@UnlockRecipeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ + virtual void execute(class CommandOrigin const &, class CommandOutput &) const; + /** + * @symbol ?setup\@UnlockRecipeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + */ + MCAPI static void setup(class CommandRegistry &); + +}; diff --git a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp index 67cb6e7a15..39bd4725ea 100644 --- a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -46,9 +47,9 @@ class UnlockedRecipesPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UnlockedRecipesPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UnlockedRecipesPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UNLOCKEDRECIPESPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp index 34c420d795..d2b40869cc 100644 --- a/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp +++ b/LiteLoader/include/llapi/mc/UnlockedRecipesServerComponent.hpp @@ -20,7 +20,6 @@ class UnlockedRecipesServerComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_UNLOCKEDRECIPESSERVERCOMPONENT public: class UnlockedRecipesServerComponent& operator=(class UnlockedRecipesServerComponent const &) = delete; - UnlockedRecipesServerComponent(class UnlockedRecipesServerComponent const &) = delete; #endif public: @@ -28,6 +27,10 @@ class UnlockedRecipesServerComponent { * @symbol ??0UnlockedRecipesServerComponent\@\@QEAA\@XZ */ MCAPI UnlockedRecipesServerComponent(); + /** + * @symbol ??0UnlockedRecipesServerComponent\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI UnlockedRecipesServerComponent(class UnlockedRecipesServerComponent const &); /** * @symbol ??0UnlockedRecipesServerComponent\@\@QEAA\@$$QEAV0\@\@Z */ @@ -36,14 +39,30 @@ class UnlockedRecipesServerComponent { * @symbol ?addAdditionalSaveData\@UnlockedRecipesServerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; + /** + * @symbol ?addChangedInventorySlot\@UnlockedRecipesServerComponent\@\@QEAAXH\@Z + */ + MCAPI void addChangedInventorySlot(int); /** * @symbol ?addUnlockedRecipe\@UnlockedRecipesServerComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addUnlockedRecipe(std::string const &); + /** + * @symbol ?addUnlockingInstruction\@UnlockedRecipesServerComponent\@\@QEAAXUUnlockingInstruction\@1\@\@Z + */ + MCAPI void addUnlockingInstruction(struct UnlockedRecipesServerComponent::UnlockingInstruction); + /** + * @symbol ?clearChangedInventorySlots\@UnlockedRecipesServerComponent\@\@QEAAXXZ + */ + MCAPI void clearChangedInventorySlots(); /** * @symbol ?clearUnlockingInstructions\@UnlockedRecipesServerComponent\@\@QEAAXXZ */ MCAPI void clearUnlockingInstructions(); + /** + * @symbol ?getChangedInventorySlots\@UnlockedRecipesServerComponent\@\@QEBAAEBV?$unordered_set\@HU?$hash\@H\@std\@\@U?$equal_to\@H\@2\@V?$allocator\@H\@2\@\@std\@\@XZ + */ + MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & getChangedInventorySlots() const; /** * @symbol ?getUnlockedRecipes\@UnlockedRecipesServerComponent\@\@QEBAAEBV?$unordered_set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@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\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ */ @@ -104,10 +123,6 @@ class UnlockedRecipesServerComponent { * @symbol ?resetUsedContexts\@UnlockedRecipesServerComponent\@\@QEAAXXZ */ MCAPI void resetUsedContexts(); - /** - * @symbol ?setInventoryChangedStatus\@UnlockedRecipesServerComponent\@\@QEAAX_N\@Z - */ - MCAPI void setInventoryChangedStatus(bool); /** * @symbol ?COMPONENT_TAG\@UnlockedRecipesServerComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/UpdateAISystem.hpp b/LiteLoader/include/llapi/mc/UpdateAISystem.hpp index 274086a306..2616cd5832 100644 --- a/LiteLoader/include/llapi/mc/UpdateAISystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAISystem.hpp @@ -29,12 +29,4 @@ class UpdateAISystem { */ MCAPI static struct TickingSystemWithInfo createSystem(); -//private: - /** - * @symbol ?_tick\@UpdateAISystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tick(class ViewT, class FlagComponent>, class ActorOwnerComponent>); - -private: - }; diff --git a/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp index 7729d1ea93..41efbd5b23 100644 --- a/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class UpdateAbilitiesPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateAbilitiesPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateAbilitiesPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEABILITIESPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp index c39183c9c0..b9898f84ba 100644 --- a/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class UpdateAdventureSettingsPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateAdventureSettingsPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateAdventureSettingsPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEADVENTURESETTINGSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp index a4455ccb5f..e58110e078 100644 --- a/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class UpdateAttributesPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateAttributesPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateAttributesPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEATTRIBUTESPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp index c998641d43..891de55346 100644 --- a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -52,9 +53,9 @@ class UpdateBlockPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateBlockPacket\@\@MEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateBlockPacket\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEBLOCKPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp index e48f0461a2..848f6db26b 100644 --- a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class UpdateBlockSyncedPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEBLOCKSYNCEDPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp index bd1dc12ab9..c6de29adf2 100644 --- a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -49,9 +50,9 @@ class UpdateClientInputLocksPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATECLIENTINPUTLOCKSPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnActorProxy.hpp b/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnActorProxy.hpp deleted file mode 100644 index 5544e963ee..0000000000 --- a/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnActorProxy.hpp +++ /dev/null @@ -1,65 +0,0 @@ -/** - * @file UpdateEntityAfterFallOnActorProxy.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class UpdateEntityAfterFallOnActorProxy. - * - */ -class UpdateEntityAfterFallOnActorProxy { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_UPDATEENTITYAFTERFALLONACTORPROXY -public: - class UpdateEntityAfterFallOnActorProxy& operator=(class UpdateEntityAfterFallOnActorProxy const &) = delete; - UpdateEntityAfterFallOnActorProxy(class UpdateEntityAfterFallOnActorProxy const &) = delete; - UpdateEntityAfterFallOnActorProxy() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_vfn_0 - */ - virtual void __unk_vfn_0(); - /** - * @vftbl 1 - * @symbol ?getPosDeltaNonConst\@UpdateEntityAfterFallOnActorProxy\@\@UEAAAEAVVec3\@\@XZ - */ - virtual class Vec3 & getPosDeltaNonConst(); - /** - * @vftbl 2 - * @symbol ?isSneaking\@UpdateEntityAfterFallOnActorProxy\@\@UEBA_NXZ - */ - virtual bool isSneaking() const; - /** - * @vftbl 3 - * @symbol ?onBounceStarted\@UpdateEntityAfterFallOnActorProxy\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual void onBounceStarted(class BlockPos const &, class Block const &); - /** - * @vftbl 4 - * @symbol ?getPosition\@UpdateEntityAfterFallOnActorProxy\@\@UEBA?AVVec3\@\@XZ - */ - virtual class Vec3 getPosition() const; - /** - * @vftbl 5 - * @symbol ?getDimensionBlockSource\@UpdateEntityAfterFallOnActorProxy\@\@UEBAAEBVIConstBlockSource\@\@XZ - */ - virtual class IConstBlockSource const & getDimensionBlockSource() const; - /** - * @symbol ??0UpdateEntityAfterFallOnActorProxy\@\@QEAA\@AEAUIActorMovementProxy\@\@\@Z - */ - MCAPI UpdateEntityAfterFallOnActorProxy(struct IActorMovementProxy &); - -}; diff --git a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp index 497f0c082a..24a26e9b86 100644 --- a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class UpdateEquipPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateEquipPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateEquipPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEEQUIPPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp index 082a64d6a4..6feed87a99 100644 --- a/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,22 +52,22 @@ class UpdatePlayerGameTypePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdatePlayerGameTypePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdatePlayerGameTypePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEPLAYERGAMETYPEPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~UpdatePlayerGameTypePacket(); #endif - /** - * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@W4GameType\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI UpdatePlayerGameTypePacket(enum class GameType, struct ActorUniqueID const &); /** * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@XZ */ MCAPI UpdatePlayerGameTypePacket(); + /** + * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@W4GameType\@\@AEBUActorUniqueID\@\@\@Z + */ + MCAPI UpdatePlayerGameTypePacket(enum class GameType, struct ActorUniqueID const &); }; diff --git a/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp b/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp index f8d9307b8e..6e2d8e6b45 100644 --- a/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp @@ -37,10 +37,6 @@ class UpdateRenderPosSystem { * @symbol ?_doUpdateRenderPosSystem\@UpdateRenderPosSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAURenderPositionComponent\@\@\@Z */ MCAPI static void _doUpdateRenderPosSystem(class StrictEntityContext const &, struct StateVectorComponent const &, struct RenderPositionComponent &); - /** - * @symbol ?_tickUpdateRenderPosSystem\@UpdateRenderPosSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@URenderPositionComponent\@\@\@\@\@Z - */ - MCAPI static void _tickUpdateRenderPosSystem(class ViewT>, struct StateVectorComponent const, struct RenderPositionComponent>); private: diff --git a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp index 4273b9ed5f..a1916b0d3e 100644 --- a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -57,9 +58,9 @@ class UpdateSoftEnumPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateSoftEnumPacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateSoftEnumPacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATESOFTENUMPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp index 59642f9e60..baf7de165b 100644 --- a/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,23 +52,23 @@ class UpdateSubChunkBlocksPacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateSubChunkBlocksPacket\@\@MEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateSubChunkBlocksPacket\@\@MEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATESUBCHUNKBLOCKSPACKET /** * @symbol __unk_destructor_-1 */ MCVAPI ~UpdateSubChunkBlocksPacket(); #endif - /** - * @symbol ??0UpdateSubChunkBlocksPacket\@\@QEAA\@AEBV?$vector\@UNetworkBlockInfo\@UpdateSubChunkBlocksPacket\@\@V?$allocator\@UNetworkBlockInfo\@UpdateSubChunkBlocksPacket\@\@\@std\@\@\@std\@\@0\@Z - */ - MCAPI UpdateSubChunkBlocksPacket(std::vector const &, std::vector const &); /** * @symbol ??0UpdateSubChunkBlocksPacket\@\@QEAA\@XZ */ MCAPI UpdateSubChunkBlocksPacket(); + /** + * @symbol ??0UpdateSubChunkBlocksPacket\@\@QEAA\@AEBV?$vector\@UNetworkBlockInfo\@UpdateSubChunkBlocksPacket\@\@V?$allocator\@UNetworkBlockInfo\@UpdateSubChunkBlocksPacket\@\@\@std\@\@\@std\@\@0\@Z + */ + MCAPI UpdateSubChunkBlocksPacket(std::vector const &, std::vector const &); /** * @symbol ?setSubChunkPosition\@UpdateSubChunkBlocksPacket\@\@QEAAXAEBVSubChunkPos\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp index 5f24ccc545..9f57c72fa2 100644 --- a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Packet.hpp" #define BEFORE_EXTRA @@ -51,9 +52,9 @@ class UpdateTradePacket : public Packet { virtual void write(class BinaryStream &) const; /** * @vftbl 7 - * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ - virtual struct ExtendedStreamReadResult _read(class ReadOnlyBinaryStream &); + virtual class Bedrock::Result _read(class ReadOnlyBinaryStream &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATETRADEPACKET /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/UserStorageChecker.hpp b/LiteLoader/include/llapi/mc/UserStorageChecker.hpp new file mode 100644 index 0000000000..af09918630 --- /dev/null +++ b/LiteLoader/include/llapi/mc/UserStorageChecker.hpp @@ -0,0 +1,49 @@ +/** + * @file UserStorageChecker.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Core.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class UserStorageChecker { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_USERSTORAGECHECKER +public: + class UserStorageChecker& operator=(class UserStorageChecker const &) = delete; + UserStorageChecker(class UserStorageChecker const &) = delete; + UserStorageChecker() = delete; +#endif + +public: + /** + * @symbol ??0UserStorageChecker\@\@QEAA\@V?$unique_ptr\@VTaskGroup\@\@U?$default_delete\@VTaskGroup\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VIFileStorageAreaFetcher\@Core\@\@U?$default_delete\@VIFileStorageAreaFetcher\@Core\@\@\@std\@\@\@2\@\@Z + */ + MCAPI UserStorageChecker(std::unique_ptr, std::unique_ptr); + /** + * @symbol ?queueCheckUserStorage\@UserStorageChecker\@\@QEAAXAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + */ + MCAPI void queueCheckUserStorage(class Core::PathBuffer const &); + /** + * @symbol ??1UserStorageChecker\@\@QEAA\@XZ + */ + MCAPI ~UserStorageChecker(); + +//private: + /** + * @symbol ?_checkUserStoragePath\@UserStorageChecker\@\@AEBA?AVTaskResult\@\@AEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + */ + MCAPI class TaskResult _checkUserStoragePath(class Core::PathBuffer const &) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/Util.hpp b/LiteLoader/include/llapi/mc/Util.hpp index a443413480..4f26557ba3 100644 --- a/LiteLoader/include/llapi/mc/Util.hpp +++ b/LiteLoader/include/llapi/mc/Util.hpp @@ -118,6 +118,10 @@ struct FormattedString { * @symbol ?cp437ToUTF8\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string cp437ToUTF8(std::string const &); + /** + * @symbol ?crashOnPurpose\@Util\@\@YAXXZ + */ + MCAPI void crashOnPurpose(); /** * @symbol ?decompressRaw\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ @@ -278,18 +282,22 @@ struct FormattedString { * @symbol ?stringReplace\@Util\@\@YAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@AEBV23\@1H\@Z */ MCAPI std::string & stringReplace(std::string &, std::string const &, std::string const &, int); - /** - * @symbol ?stringTrim\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z - */ - MCAPI std::string stringTrim(std::string const &, std::string const &); /** * @symbol ?stringTrim\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string stringTrim(std::string const &); + /** + * @symbol ?stringTrim\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z + */ + MCAPI std::string stringTrim(std::string const &, std::string const &); /** * @symbol ?stripBOM\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void stripBOM(std::string &); + /** + * @symbol ?timeoutForDuration\@Util\@\@YAXV?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@\@Z + */ + MCAPI void timeoutForDuration(class std::chrono::duration<__int64, struct std::ratio<1, 1>>); /** * @symbol ?toBool\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_N\@Z */ @@ -306,30 +314,34 @@ struct FormattedString { * @symbol ?toIntWithMinMax\@Util\@\@YA?AW4NumberConversionResult\@1\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAHHH\@Z */ MCAPI enum class Util::NumberConversionResult toIntWithMinMax(class std::basic_string_view>, int &, int, int); - /** - * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z - */ - MCAPI std::string toLower(class std::basic_string_view> const &); /** * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z */ MCAPI std::string toLower(char const *); + /** + * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z + */ + MCAPI std::string toLower(class std::basic_string_view> const &); /** * @symbol ?toLowerInPlace\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void toLowerInPlace(std::string &); /** - * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@3\@\@Z + * @symbol ?toPascalCase\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@D\@Z */ - MCAPI std::string toString(class std::basic_string, class std::allocator> const &); + MCAPI std::string toPascalCase(std::string const &, char); /** - * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@3\@\@Z */ - MCAPI std::string toString(std::string const &); + MCAPI std::string toString(class std::basic_string, class std::allocator> const &); /** * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MH\@Z */ MCAPI std::string toString(float, int); + /** + * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + */ + MCAPI std::string toString(std::string const &); /** * @symbol ?toStringWithPaddedZeroes\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IE\@Z */ diff --git a/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp b/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp index cadccc2a38..e2a9ec0b1e 100644 --- a/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp @@ -36,10 +36,6 @@ class VRFlyTravelSystem { * @symbol ?_tickPostPlayerTravelSystem\@VRFlyTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBULocalPlayerPrePlayerTravelComponent\@\@UAbilitiesComponent\@\@\@\@\@Z */ MCAPI static void _tickPostPlayerTravelSystem(class ViewT); - /** - * @symbol ?_tickPrePlayerTravelSystem\@VRFlyTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@$$CBUPlayerInputModeComponent\@\@UMobTravelComponent\@\@UAbilitiesComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@ULocalPlayerPrePlayerTravelComponent\@\@\@\@\@Z - */ - MCAPI static void _tickPrePlayerTravelSystem(class ViewT>, struct PlayerInputModeComponent const, struct MobTravelComponent, struct AbilitiesComponent>, class EntityModifierT); /** * @symbol ?createPostPlayerTravelSystem\@VRFlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ @@ -48,9 +44,5 @@ class VRFlyTravelSystem { * @symbol ?createPrePlayerTravelSystem\@VRFlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPrePlayerTravelSystem(); - /** - * @symbol ?createSideBySideCatchupSystem\@VRFlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySideCatchupSystem(); }; diff --git a/LiteLoader/include/llapi/mc/VRFlyTravelSystemInternal.hpp b/LiteLoader/include/llapi/mc/VRFlyTravelSystemInternal.hpp deleted file mode 100644 index f760bdfe9f..0000000000 --- a/LiteLoader/include/llapi/mc/VRFlyTravelSystemInternal.hpp +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file VRFlyTravelSystemInternal.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -namespace VRFlyTravelSystemInternal { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?_sideBySideCatchupSystem\@VRFlyTravelSystemInternal\@\@YAXAEBUPlayerInputModeComponent\@\@AEAUMobTravelComponent\@\@AEAUAbilitiesComponent\@\@\@Z - */ - MCAPI void _sideBySideCatchupSystem(struct PlayerInputModeComponent const &, struct MobTravelComponent &, struct AbilitiesComponent &); - /** - * @symbol ?_tickSideBySideCatchupSystem\@VRFlyTravelSystemInternal\@\@YAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@$$CBUPlayerInputModeComponent\@\@UMobTravelComponent\@\@UAbilitiesComponent\@\@\@\@\@Z - */ - MCAPI void _tickSideBySideCatchupSystem(class ViewT>, struct PlayerInputModeComponent const, struct MobTravelComponent, struct AbilitiesComponent>); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp index a53237595a..2891e65a5d 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypeGroups.hpp @@ -20,6 +20,10 @@ namespace VanillaBlockTypeGroups { * @symbol ?CarpetBlockIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI extern std::vector> const CarpetBlockIds; + /** + * @symbol ?ConcreteBlockIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const ConcreteBlockIds; /** * @symbol ?CoralIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B */ @@ -32,6 +36,14 @@ namespace VanillaBlockTypeGroups { * @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 ?RemovedBlockIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const RemovedBlockIds; + /** + * @symbol ?ShulkerBoxIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B + */ + MCAPI extern std::vector> const ShulkerBoxIds; /** * @symbol ?WoodFenceBlockIds\@VanillaBlockTypeGroups\@\@3V?$vector\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@\@2\@\@std\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp index bd3baab1e2..3b4c2d2586 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp @@ -283,10 +283,18 @@ namespace VanillaBlockTypeIds { * @symbol ?BlackCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackCarpet; + /** + * @symbol ?BlackConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlackConcrete; /** * @symbol ?BlackGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackGlazedTerracotta; + /** + * @symbol ?BlackShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlackShulkerBox; /** * @symbol ?BlackWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -327,6 +335,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BlueCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueCarpet; + /** + * @symbol ?BlueConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlueConcrete; /** * @symbol ?BlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -335,6 +347,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BlueIce\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueIce; + /** + * @symbol ?BlueShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlueShulkerBox; /** * @symbol ?BlueWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -379,6 +395,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BrownCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownCarpet; + /** + * @symbol ?BrownConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BrownConcrete; /** * @symbol ?BrownGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -391,6 +411,10 @@ namespace VanillaBlockTypeIds { * @symbol ?BrownMushroomBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownMushroomBlock; + /** + * @symbol ?BrownShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BrownShulkerBox; /** * @symbol ?BrownWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -647,10 +671,6 @@ namespace VanillaBlockTypeIds { * @symbol ?Composter\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Composter; - /** - * @symbol ?Concrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Concrete; /** * @symbol ?ConcretePowder\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -811,10 +831,18 @@ namespace VanillaBlockTypeIds { * @symbol ?CyanCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanCarpet; + /** + * @symbol ?CyanConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CyanConcrete; /** * @symbol ?CyanGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanGlazedTerracotta; + /** + * @symbol ?CyanShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CyanShulkerBox; /** * @symbol ?CyanWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1239,10 +1267,18 @@ namespace VanillaBlockTypeIds { * @symbol ?GrayCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrayCarpet; + /** + * @symbol ?GrayConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GrayConcrete; /** * @symbol ?GrayGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrayGlazedTerracotta; + /** + * @symbol ?GrayShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GrayShulkerBox; /** * @symbol ?GrayWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1259,10 +1295,18 @@ namespace VanillaBlockTypeIds { * @symbol ?GreenCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GreenCarpet; + /** + * @symbol ?GreenConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GreenConcrete; /** * @symbol ?GreenGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GreenGlazedTerracotta; + /** + * @symbol ?GreenShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GreenShulkerBox; /** * @symbol ?GreenWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1475,10 +1519,18 @@ namespace VanillaBlockTypeIds { * @symbol ?LightBlueCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlueCarpet; + /** + * @symbol ?LightBlueConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightBlueConcrete; /** * @symbol ?LightBlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlueGlazedTerracotta; + /** + * @symbol ?LightBlueShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightBlueShulkerBox; /** * @symbol ?LightBlueWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1495,6 +1547,14 @@ namespace VanillaBlockTypeIds { * @symbol ?LightGrayCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightGrayCarpet; + /** + * @symbol ?LightGrayConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightGrayConcrete; + /** + * @symbol ?LightGrayShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightGrayShulkerBox; /** * @symbol ?LightGrayWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1519,10 +1579,18 @@ namespace VanillaBlockTypeIds { * @symbol ?LimeCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LimeCarpet; + /** + * @symbol ?LimeConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LimeConcrete; /** * @symbol ?LimeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LimeGlazedTerracotta; + /** + * @symbol ?LimeShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LimeShulkerBox; /** * @symbol ?LimeWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1575,10 +1643,18 @@ namespace VanillaBlockTypeIds { * @symbol ?MagentaCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagentaCarpet; + /** + * @symbol ?MagentaConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MagentaConcrete; /** * @symbol ?MagentaGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagentaGlazedTerracotta; + /** + * @symbol ?MagentaShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MagentaShulkerBox; /** * @symbol ?MagentaWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1831,10 +1907,18 @@ namespace VanillaBlockTypeIds { * @symbol ?OrangeCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OrangeCarpet; + /** + * @symbol ?OrangeConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const OrangeConcrete; /** * @symbol ?OrangeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OrangeGlazedTerracotta; + /** + * @symbol ?OrangeShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const OrangeShulkerBox; /** * @symbol ?OrangeWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1883,6 +1967,10 @@ namespace VanillaBlockTypeIds { * @symbol ?PinkCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkCarpet; + /** + * @symbol ?PinkConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PinkConcrete; /** * @symbol ?PinkGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -1891,6 +1979,10 @@ namespace VanillaBlockTypeIds { * @symbol ?PinkPetals\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkPetals; + /** + * @symbol ?PinkShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PinkShulkerBox; /** * @symbol ?PinkWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2059,10 +2151,18 @@ namespace VanillaBlockTypeIds { * @symbol ?PurpleCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpleCarpet; + /** + * @symbol ?PurpleConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PurpleConcrete; /** * @symbol ?PurpleGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpleGlazedTerracotta; + /** + * @symbol ?PurpleShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PurpleShulkerBox; /** * @symbol ?PurpleWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2119,6 +2219,10 @@ namespace VanillaBlockTypeIds { * @symbol ?RedCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedCarpet; + /** + * @symbol ?RedConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const RedConcrete; /** * @symbol ?RedFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2151,6 +2255,10 @@ namespace VanillaBlockTypeIds { * @symbol ?RedSandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedSandstoneStairs; + /** + * @symbol ?RedShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const RedShulkerBox; /** * @symbol ?RedWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2251,10 +2359,6 @@ namespace VanillaBlockTypeIds { * @symbol ?Shroomlight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Shroomlight; - /** - * @symbol ?ShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const ShulkerBox; /** * @symbol ?SilverGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2851,10 +2955,18 @@ namespace VanillaBlockTypeIds { * @symbol ?WhiteCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteCarpet; + /** + * @symbol ?WhiteConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const WhiteConcrete; /** * @symbol ?WhiteGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteGlazedTerracotta; + /** + * @symbol ?WhiteShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const WhiteShulkerBox; /** * @symbol ?WhiteWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2895,6 +3007,10 @@ namespace VanillaBlockTypeIds { * @symbol ?YellowCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowCarpet; + /** + * @symbol ?YellowConcrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const YellowConcrete; /** * @symbol ?YellowFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ @@ -2903,6 +3019,10 @@ namespace VanillaBlockTypeIds { * @symbol ?YellowGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowGlazedTerracotta; + /** + * @symbol ?YellowShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const YellowShulkerBox; /** * @symbol ?YellowWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp index 9e4374ad78..0a3d92ecc6 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp @@ -95,6 +95,10 @@ class VanillaBlockUpdater { * @symbol ?addUpdaters_1_20_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_20_0(class CompoundTagUpdaterContext &); + /** + * @symbol ?addUpdaters_1_20_10\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + */ + MCAPI static void addUpdaters_1_20_10(class CompoundTagUpdaterContext &); private: /** diff --git a/LiteLoader/include/llapi/mc/VanillaDimensions.hpp b/LiteLoader/include/llapi/mc/VanillaDimensions.hpp index 67fc3424a6..7cb5d3cbc6 100644 --- a/LiteLoader/include/llapi/mc/VanillaDimensions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaDimensions.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -57,6 +58,10 @@ class VanillaDimensions { * @symbol ?fromSerializedInt\@VanillaDimensions\@\@SA?AV?$AutomaticID\@VDimension\@\@H\@\@H\@Z */ MCAPI static class AutomaticID fromSerializedInt(int); + /** + * @symbol ?fromSerializedInt\@VanillaDimensions\@\@SA?AV?$Result\@V?$AutomaticID\@VDimension\@\@H\@\@Verror_code\@std\@\@\@Bedrock\@\@$$QEAV?$Result\@HVerror_code\@std\@\@\@3\@\@Z + */ + MCAPI static class Bedrock::Result, class std::error_code> fromSerializedInt(class Bedrock::Result &&); /** * @symbol ?fromString\@VanillaDimensions\@\@SA?AV?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp index 1f86286560..d9b8c99cc7 100644 --- a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp +++ b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp @@ -32,12 +32,8 @@ class VanillaEntityInitializerCommon { */ MCAPI static void initActorComponents(enum class EntityHost, std::unique_ptr, class EntityContext &, class EntityContext const &); /** - * @symbol ?initExperimentalMovement\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z + * @symbol ?initLevelEntityDependentComponents\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z */ - MCAPI static void initExperimentalMovement(class EntityContext &, class EntityContext const &); - /** - * @symbol ?initVanilla\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z - */ - MCAPI static void initVanilla(class EntityContext &, class EntityContext const &); + MCAPI static void initLevelEntityDependentComponents(class EntityContext &, class EntityContext const &); }; diff --git a/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp b/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp deleted file mode 100644 index f1f1e8aed9..0000000000 --- a/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file VanillaEntityInitializerServer.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class VanillaEntityInitializerServer. - * - */ -class VanillaEntityInitializerServer { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VANILLAENTITYINITIALIZERSERVER -public: - class VanillaEntityInitializerServer& operator=(class VanillaEntityInitializerServer const &) = delete; - VanillaEntityInitializerServer(class VanillaEntityInitializerServer const &) = delete; - VanillaEntityInitializerServer() = delete; -#endif - -public: - /** - * @symbol ?initECSMovement\@VanillaEntityInitializerServer\@\@SAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV4\@\@Z - */ - MCAPI static void initECSMovement(std::unique_ptr, class EntityContext &, class EntityContext const &); - /** - * @symbol ?initSideBySideComparison\@VanillaEntityInitializerServer\@\@SAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV4\@\@Z - */ - MCAPI static void initSideBySideComparison(std::unique_ptr, class EntityContext &, class EntityContext const &); - -}; diff --git a/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp index dd259132c0..28f3818f97 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp @@ -100,9 +100,9 @@ class VanillaGameModuleServer { */ MCAPI void _configureWorldGen(class IWorldRegistriesProvider &, struct SpawnSettings const &, class Experiments const &, class ResourcePackManager &, class BaseGameVersion const &); /** - * @symbol ?_registerListeners\@VanillaGameModuleServer\@\@AEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?_registerListeners\@VanillaGameModuleServer\@\@AEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z */ - MCAPI void _registerListeners(class gsl::not_null> const &); + MCAPI void _registerListeners(class gsl::not_null> const &, bool); private: diff --git a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp index c941536774..2e41f5927b 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp @@ -57,6 +57,10 @@ namespace VanillaGameVersions { * @symbol ?NetherUpdate_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const NetherUpdate_U3; + /** + * @symbol ?RecipeUnlockingVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + */ + MCAPI extern class BaseGameVersion const RecipeUnlockingVersion; /** * @symbol ?SneakingHeightChangeVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ @@ -65,6 +69,10 @@ namespace VanillaGameVersions { * @symbol ?TrailsAndTalesVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const TrailsAndTalesVersion; + /** + * @symbol ?TrailsAndTalesVersion_U1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + */ + MCAPI extern class BaseGameVersion const TrailsAndTalesVersion_U1; /** * @symbol ?WildUpdateVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ diff --git a/LiteLoader/include/llapi/mc/VanillaOffsetSystem.hpp b/LiteLoader/include/llapi/mc/VanillaOffsetSystem.hpp index f9e55ad965..0ba0edb628 100644 --- a/LiteLoader/include/llapi/mc/VanillaOffsetSystem.hpp +++ b/LiteLoader/include/llapi/mc/VanillaOffsetSystem.hpp @@ -46,12 +46,20 @@ struct VanillaOffsetSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol ?tick\@VanillaOffsetSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@U2\@V?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@U?$Write\@UVanillaOffsetComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol ?tick\@VanillaOffsetSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@U2\@V?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@UIsHorizontalPoseFlagComponent\@\@\@\@U?$Write\@UVanillaOffsetComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@UBaseGameVersionComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext>, struct Read>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext>, struct Read, struct IsHorizontalPoseFlagComponent>, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** * @symbol ?createSystem\@VanillaOffsetSystem\@\@SA?AUTickingSystemWithInfo\@\@_N0\@Z */ MCAPI static struct TickingSystemWithInfo createSystem(bool, bool); + /** + * @symbol ?getCameraPosition\@VanillaOffsetSystem\@\@SA?AVVec3\@\@AEBV2\@PEBUPassengerRenderingRidingOffsetComponent\@\@PEBUVanillaOffsetComponent\@\@M\@Z + */ + MCAPI static class Vec3 getCameraPosition(class Vec3 const &, struct PassengerRenderingRidingOffsetComponent const *, struct VanillaOffsetComponent const *, float); + /** + * @symbol ?getCameraPosition\@VanillaOffsetSystem\@\@SA?AVVec3\@\@AEBVActor\@\@M\@Z + */ + MCAPI static class Vec3 getCameraPosition(class Actor const &, float); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaOffsetSystemUtil.hpp b/LiteLoader/include/llapi/mc/VanillaOffsetSystemUtil.hpp index 84fcb0c336..d30201857d 100644 --- a/LiteLoader/include/llapi/mc/VanillaOffsetSystemUtil.hpp +++ b/LiteLoader/include/llapi/mc/VanillaOffsetSystemUtil.hpp @@ -17,16 +17,20 @@ namespace VanillaOffsetSystemUtil { #undef AFTER_EXTRA /** - * @symbol ?_clientTick\@VanillaOffsetSystemUtil\@\@YAXAEAVStrictEntityContext\@\@AEAUVanillaOffsetComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@M\@Z + * @symbol ?_clientTick\@VanillaOffsetSystemUtil\@\@YAXAEAVStrictEntityContext\@\@AEAUVanillaOffsetComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@V?$Optional\@$$CBUIsHorizontalPoseFlagComponent\@\@\@\@MV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UIsHorizontalPoseFlagComponent\@\@\@\@\@Z */ - MCAPI void _clientTick(class StrictEntityContext &, struct VanillaOffsetComponent &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class Optional const>, float); + MCAPI void _clientTick(class StrictEntityContext &, struct VanillaOffsetComponent &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional, float, class EntityModifierT); /** - * @symbol ?_serverTick\@VanillaOffsetSystemUtil\@\@YAXAEAVStrictEntityContext\@\@AEAUVanillaOffsetComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@M\@Z + * @symbol ?_serverTick\@VanillaOffsetSystemUtil\@\@YAXAEAVStrictEntityContext\@\@AEAUVanillaOffsetComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@V?$Optional\@$$CBUIsHorizontalPoseFlagComponent\@\@\@\@MV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UIsHorizontalPoseFlagComponent\@\@\@\@\@Z */ - MCAPI void _serverTick(class StrictEntityContext &, struct VanillaOffsetComponent &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class Optional const>, float); + MCAPI void _serverTick(class StrictEntityContext &, struct VanillaOffsetComponent &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional, float, class EntityModifierT); /** - * @symbol ?getCameraOffset\@VanillaOffsetSystemUtil\@\@YAMAEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@M\@Z + * @symbol ?_updateHorizontalFlagComponent\@VanillaOffsetSystemUtil\@\@YAXAEAVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UIsHorizontalPoseFlagComponent\@\@\@\@\@Z */ - MCAPI float getCameraOffset(struct SynchedActorDataComponent const &, class Optional const>, float); + MCAPI void _updateHorizontalFlagComponent(class StrictEntityContext &, struct SynchedActorDataComponent const &, class EntityModifierT); + /** + * @symbol ?getCameraOffset\@VanillaOffsetSystemUtil\@\@YAMAEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerIsSleepingFlag\@\@\@\@\@\@V?$Optional\@$$CBUIsHorizontalPoseFlagComponent\@\@\@\@M\@Z + */ + MCAPI float getCameraOffset(struct SynchedActorDataComponent const &, class Optional const>, class Optional, float); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaStates.hpp b/LiteLoader/include/llapi/mc/VanillaStates.hpp index ca36e7e3fd..a9ed302d7f 100644 --- a/LiteLoader/include/llapi/mc/VanillaStates.hpp +++ b/LiteLoader/include/llapi/mc/VanillaStates.hpp @@ -7,7 +7,12 @@ #include "llapi/Global.h" #define BEFORE_EXTRA +#include "BlockState.hpp" // Include Headers or Declare Types Here +template +class BlockStateVariant : BlockState { + +}; #undef BEFORE_EXTRA @@ -19,11 +24,13 @@ namespace VanillaStates { #define AFTER_EXTRA // Add Member There -struct CachedItemStateMapPtr { - CachedItemStateMapPtr() = delete; - CachedItemStateMapPtr(CachedItemStateMapPtr const&) = delete; - CachedItemStateMapPtr(CachedItemStateMapPtr const&&) = delete; -}; + struct CachedBlockStateMapPtr { + const BlockState* ptr; + int mapVersion; + CachedBlockStateMapPtr() = delete; + CachedBlockStateMapPtr(CachedBlockStateMapPtr const&) = delete; + CachedBlockStateMapPtr(CachedBlockStateMapPtr const&&) = delete; + }; #undef AFTER_EXTRA /** diff --git a/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp index 84004cd544..2351785b65 100644 --- a/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp +++ b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp @@ -23,41 +23,33 @@ namespace VanillaSystemsRegistration { #undef AFTER_EXTRA /** - * @symbol ?_registerSideBySideCompare\@VanillaSystemsRegistration\@\@YAXAEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@AEAVEntitySystems\@\@W4SideBySideExtractionId\@\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerActorAiStepSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ - MCAPI void _registerSideBySideCompare(std::vector const &, class EntitySystems &, enum class SideBySideExtractionId, struct VanillaSystemsRegistration::RegistrationOptions const &); + MCAPI void registerActorAiStepSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerActorAiStepSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z + * @symbol ?registerActorMoveSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ - MCAPI void registerActorAiStepSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::shared_future &); + MCAPI void registerActorMoveSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerActorMoveSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@W4MoveSystemsRegistrationMode\@1\@\@Z + * @symbol ?registerActorMovementTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ - MCAPI void registerActorMoveSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &, enum class VanillaSystemsRegistration::MoveSystemsRegistrationMode); + MCAPI void registerActorMovementTickSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerActorMovementTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z + * @symbol ?registerActorNormalTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ - MCAPI void registerActorMovementTickSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::shared_future &); + MCAPI void registerActorNormalTickSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerActorNormalTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z + * @symbol ?registerActorPositionPassenger\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ - MCAPI void registerActorNormalTickSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::shared_future &); - /** - * @symbol ?registerActorPositionPassenger\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z - */ - MCAPI void registerActorPositionPassenger(class IEntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); + MCAPI void registerActorPositionPassenger(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** * @symbol ?registerActorPreTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerActorPreTravelSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerActorTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@\@Z - */ - MCAPI void registerActorTravelSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &); - /** - * @symbol ?registerExtractApplyBlock\@VanillaSystemsRegistration\@\@YAXAEAUDependencyInfo\@1\@W4ExtractApplyMode\@1\@W4SideBySideExtractionId\@\@AEAVEntitySystems\@\@AEBURegistrationOptions\@1\@AEBV?$function\@$$A6AXAEAVIEntitySystems\@\@\@Z\@std\@\@\@Z + * @symbol ?registerActorTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ - MCAPI void registerExtractApplyBlock(struct VanillaSystemsRegistration::DependencyInfo &, enum class VanillaSystemsRegistration::ExtractApplyMode, enum class SideBySideExtractionId, class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::function const &); + MCAPI void registerActorTravelSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** * @symbol ?registerPassengerTick\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ @@ -75,9 +67,9 @@ namespace VanillaSystemsRegistration { */ MCAPI void registerTickFilterSystems(class EntitySystems &); /** - * @symbol ?registerUpdateMobTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerUpdateMobTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@\@Z */ - MCAPI void registerUpdateMobTravelSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); + MCAPI void registerUpdateMobTravelSystems(class EntitySystems &); /** * @symbol ?registerVanillaServerTickingSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@AEBURegistrationOptions\@1\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Vec2Component.hpp b/LiteLoader/include/llapi/mc/Vec2Component.hpp deleted file mode 100644 index c9c3d7f70a..0000000000 --- a/LiteLoader/include/llapi/mc/Vec2Component.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file Vec2Component.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct Vec2Component { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VEC2COMPONENT -public: - struct Vec2Component& operator=(struct Vec2Component const &) = delete; - Vec2Component(struct Vec2Component const &) = delete; - Vec2Component() = delete; -#endif - -public: - /** - * @symbol ?getDiff\@Vec2Component\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z - */ - MCAPI static class std::optional getDiff(struct Vec2Component const &, struct Vec2Component const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Vec3Component.hpp b/LiteLoader/include/llapi/mc/Vec3Component.hpp deleted file mode 100644 index 6418c96385..0000000000 --- a/LiteLoader/include/llapi/mc/Vec3Component.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file Vec3Component.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - - -struct Vec3Component { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VEC3COMPONENT -public: - struct Vec3Component& operator=(struct Vec3Component const &) = delete; - Vec3Component(struct Vec3Component const &) = delete; - Vec3Component() = delete; -#endif - -public: - /** - * @symbol ?getDiff\@Vec3Component\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z - */ - MCAPI static class std::optional getDiff(struct Vec3Component const &, struct Vec3Component const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp b/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp index d780b8297a..f6d7dcb8a4 100644 --- a/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp @@ -27,10 +27,6 @@ class VehicleClientPositionPassengerSystem { #endif public: - /** - * @symbol ?_setRotationLockSystem\@VehicleClientPositionPassengerSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@$$CBUActorHeadRotationComponent\@\@UMobBodyRotationComponent\@\@UPassengerYRotLimitComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBURenderRotationComponent\@\@\@\@V?$OptionalGlobalT\@UPassengersToPositionComponent\@\@VEntityRegistryBase\@\@\@\@\@Z - */ - MCAPI static void _setRotationLockSystem(class ViewT>, struct SynchedActorDataComponent const, struct ActorHeadRotationComponent const, struct MobBodyRotationComponent, struct PassengerYRotLimitComponent>, class ViewT, class OptionalGlobalT); /** * @symbol ?createSetPositionRequestSystem\@VehicleClientPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/VehicleComponent.hpp b/LiteLoader/include/llapi/mc/VehicleComponent.hpp index 6f4cf3033f..fb23cb2f11 100644 --- a/LiteLoader/include/llapi/mc/VehicleComponent.hpp +++ b/LiteLoader/include/llapi/mc/VehicleComponent.hpp @@ -30,9 +30,5 @@ struct VehicleComponent { * @symbol ??0VehicleComponent\@\@QEAA\@AEBU0\@\@Z */ MCAPI VehicleComponent(struct VehicleComponent const &); - /** - * @symbol ??1VehicleComponent\@\@QEAA\@XZ - */ - MCAPI ~VehicleComponent(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp b/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp index 14c0ccbe7c..8d1092db4c 100644 --- a/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp @@ -35,6 +35,10 @@ class VehicleServerMolangSeatPositionSystem { * @symbol ?_tickVehicleServerMolangSeatPositionSystem\@VehicleServerMolangSeatPositionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@VActorOwnerComponent\@\@UPositionPassengerRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRideableComponent\@\@$$CBUVehicleComponent\@\@\@\@\@Z */ MCAPI static void _tickVehicleServerMolangSeatPositionSystem(class ViewT, class ViewT); + /** + * @symbol ?_tickVehicleServerMolangSeatPositionSystemSingleEntity\@VehicleServerMolangSeatPositionSystem\@\@SAXAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@VActorOwnerComponent\@\@UPositionPassengerRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRideableComponent\@\@$$CBUVehicleComponent\@\@\@\@\@Z + */ + MCAPI static void _tickVehicleServerMolangSeatPositionSystemSingleEntity(class StrictEntityContext const &, class ViewT, class ViewT); /** * @symbol ?createSystem\@VehicleServerMolangSeatPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp b/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp index 3f682eaef9..2c5830ae9c 100644 --- a/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp @@ -27,6 +27,10 @@ class VehicleServerPositionPassengerSystem { #endif public: + /** + * @symbol ?_vehicleServerPositionPassengerSystemSingleEntity\@VehicleServerPositionPassengerSystem\@\@SAXAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@UPositionPassengerRequestComponent\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUActorHeadRotationComponent\@\@$$CBUPositionPassengerRequestComponent\@\@$$CBUSynchedActorDataComponent\@\@UActorRotationComponent\@\@UMobBodyRotationComponent\@\@UPassengerYRotLimitComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorSetPositionRequestComponent\@\@\@\@V?$OptionalGlobalT\@UPassengersToPositionComponent\@\@VEntityRegistryBase\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBUActorRotationComponent\@\@$$CBUStateVectorComponent\@\@V?$Optional\@$$CBUActorSetPositionRequestComponent\@\@\@\@\@\@\@Z + */ + MCAPI static void _vehicleServerPositionPassengerSystemSingleEntity(class StrictEntityContext const &, class ViewT, struct SynchedActorDataComponent const>, class ViewT>, struct ActorHeadRotationComponent const, struct PositionPassengerRequestComponent const, struct SynchedActorDataComponent const, struct ActorRotationComponent, struct MobBodyRotationComponent, struct PassengerYRotLimitComponent, class Optional const>>, class EntityModifierT, class OptionalGlobalT, class ViewT, struct ActorRotationComponent const, struct StateVectorComponent const, class Optional>); /** * @symbol ?createSystem\@VehicleServerPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp b/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp index 0f64b0cca3..e5c5f602aa 100644 --- a/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp @@ -34,9 +34,9 @@ class VehicleServerSeatPositionSystem { //private: /** - * @symbol ?_getRidingHeight\@VehicleServerSeatPositionSystem\@\@CAMAEBVStrictEntityContext\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBURidingHeightComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAdultRidingHeightOffsetComponent\@\@\@\@\@Z + * @symbol ?_setSeatDescriptionToActorDataSystem\@VehicleServerSeatPositionSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@$$CBUPositionPassengerRequestComponent\@\@$$CBUOffsetsComponent\@\@USynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@$$CBVRideableComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBURidingHeightComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAdultRidingHeightOffsetComponent\@\@\@\@\@Z */ - MCAPI static float _getRidingHeight(class StrictEntityContext const &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class ViewT, class ViewT); + MCAPI static void _setSeatDescriptionToActorDataSystem(class ViewT, class ViewT, class ViewT, class ViewT); private: diff --git a/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp b/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp index bdb545effa..99ad6ab67e 100644 --- a/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp @@ -49,20 +49,21 @@ class VerticalCollisionSystem { virtual void __unk_vfn_3(); /** * @vftbl 4 - * @symbol ?tick\@VerticalCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @symbol ?tick\@VerticalCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?create\@VerticalCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @vftbl 5 + * @symbol ?singleTick\@VerticalCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEAVStrictEntityContext\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo create(); + virtual void singleTick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class StrictEntityContext &); /** - * @symbol ?createSideBySide\@VerticalCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@VerticalCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createSideBySide(); + MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?tickVerticalCollisionSystem\@VerticalCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAUWalkDistComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickVerticalCollisionSystem\@VerticalCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAUWalkDistComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@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 MoveRequestComponent const &, struct AABBShapeComponent const &, struct StateVectorComponent const &, struct WalkDistComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); + MCAPI static void tickVerticalCollisionSystem(class StrictEntityContext const &, struct MoveRequestComponent const &, struct AABBShapeComponent const &, struct StateVectorComponent const &, struct WalkDistComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); }; diff --git a/LiteLoader/include/llapi/mc/Vex.hpp b/LiteLoader/include/llapi/mc/Vex.hpp index abc18e4acb..c92171aa98 100644 --- a/LiteLoader/include/llapi/mc/Vex.hpp +++ b/LiteLoader/include/llapi/mc/Vex.hpp @@ -47,140 +47,135 @@ class Vex : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 58 + * @vftbl 52 * @symbol ?isInWall\@Vex\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@Vex\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@Vex\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 - */ - virtual void __unk_vfn_260(); - /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_247(); /** - * @vftbl 279 - * @symbol ?applyFinalFriction\@Vex\@\@UEAAXM_N\@Z + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void applyFinalFriction(float, bool); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Vex\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VillageManager.hpp b/LiteLoader/include/llapi/mc/VillageManager.hpp index 6b93b4947b..d339d70114 100644 --- a/LiteLoader/include/llapi/mc/VillageManager.hpp +++ b/LiteLoader/include/llapi/mc/VillageManager.hpp @@ -66,6 +66,10 @@ enum class BedAvailabilityState; * @symbol ?getPOIInitEventFromName\@VillageManager\@\@QEBA?AVHashedString\@\@AEBV2\@\@Z */ MCAPI class HashedString getPOIInitEventFromName(class HashedString const &) const; + /** + * @symbol ?initializeWithLevelStorageManager\@VillageManager\@\@QEAAXAEAVLevelStorageManager\@\@\@Z + */ + MCAPI void initializeWithLevelStorageManager(class LevelStorageManager &); /** * @symbol ?insertPOI\@VillageManager\@\@QEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ @@ -86,10 +90,6 @@ enum class BedAvailabilityState; * @symbol ?removePOI\@VillageManager\@\@QEAAXV?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI void removePOI(class std::weak_ptr); - /** - * @symbol ?saveAllVillages\@VillageManager\@\@QEAAXXZ - */ - MCAPI void saveAllVillages(); /** * @symbol ?submitFindPOIQuery\@VillageManager\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ @@ -140,6 +140,10 @@ enum class BedAvailabilityState; * @symbol ?_removeVillage\@VillageManager\@\@AEAAXAEAVVillage\@\@\@Z */ MCAPI void _removeVillage(class Village &); + /** + * @symbol ?_saveAllVillages\@VillageManager\@\@AEAAXAEAVLevelStorage\@\@\@Z + */ + MCAPI void _saveAllVillages(class LevelStorage &); /** * @symbol ?_tryAssignPOIOrCreateVillage\@VillageManager\@\@AEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/Villager.hpp b/LiteLoader/include/llapi/mc/Villager.hpp index e76999923f..76c3b43870 100644 --- a/LiteLoader/include/llapi/mc/Villager.hpp +++ b/LiteLoader/include/llapi/mc/Villager.hpp @@ -42,125 +42,125 @@ class Villager : public VillagerBase { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 197 + * @vftbl 184 * @symbol ?buildDebugInfo\@Villager\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Villager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VillagerBase.hpp b/LiteLoader/include/llapi/mc/VillagerBase.hpp index 5347b2cf5f..5555267d7b 100644 --- a/LiteLoader/include/llapi/mc/VillagerBase.hpp +++ b/LiteLoader/include/llapi/mc/VillagerBase.hpp @@ -43,150 +43,150 @@ class VillagerBase : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 136 + * @vftbl 124 * @symbol ?onLightningHit\@VillagerBase\@\@UEAAXXZ */ virtual void onLightningHit(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@VillagerBase\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@VillagerBase\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@VillagerBase\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@VillagerBase\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 339 + * @vftbl 319 * @symbol ?_serverAiMobStep\@VillagerBase\@\@MEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VILLAGERBASE /** * @symbol ?interactPreventDefault\@VillagerBase\@\@UEAA_NXZ diff --git a/LiteLoader/include/llapi/mc/VillagerV2.hpp b/LiteLoader/include/llapi/mc/VillagerV2.hpp index 33386cc57c..8462a6d358 100644 --- a/LiteLoader/include/llapi/mc/VillagerV2.hpp +++ b/LiteLoader/include/llapi/mc/VillagerV2.hpp @@ -52,150 +52,145 @@ class VillagerV2 : public VillagerBase { */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 197 + * @vftbl 184 * @symbol ?buildDebugInfo\@VillagerV2\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 222 + * @vftbl 209 * @symbol ?getInteraction\@VillagerV2\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@VillagerV2\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@VillagerV2\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 - */ - virtual void __unk_vfn_252(); - /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_239(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_247(); /** - * @vftbl 278 - * @symbol ?travel\@VillagerV2\@\@UEAAXMMM_N\@Z + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void travel(float, float, float, bool); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 338 + * @vftbl 318 * @symbol ?newServerAiStep\@VillagerV2\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0VillagerV2\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp b/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp index c956d80637..f33b1c3c04 100644 --- a/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp @@ -34,10 +34,6 @@ class VillagerV2PreTravelSystem { * @symbol ?_doVillagerV2PreTravel\@VillagerV2PreTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USkipMobTravelFlag\@\@\@\@\@\@\@Z */ MCAPI static void _doVillagerV2PreTravel(class StrictEntityContext const &, struct SynchedActorDataComponent const &, class EntityModifierT>); - /** - * @symbol ?_tick\@VillagerV2PreTravelSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UVillagerV2Flag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USkipMobTravelFlag\@\@\@\@\@\@\@Z - */ - MCAPI static void _tick(class ViewT, class FlagComponent>, struct SynchedActorDataComponent const>, class EntityModifierT>); private: diff --git a/LiteLoader/include/llapi/mc/VindicationIllager.hpp b/LiteLoader/include/llapi/mc/VindicationIllager.hpp index c2f567ae4b..2c39e57328 100644 --- a/LiteLoader/include/llapi/mc/VindicationIllager.hpp +++ b/LiteLoader/include/llapi/mc/VindicationIllager.hpp @@ -37,125 +37,125 @@ class VindicationIllager : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 329 + * @vftbl 312 * @symbol ?_getWalkTargetValue\@VindicationIllager\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VINDICATIONILLAGER /** * @symbol ?canExistInPeaceful\@VindicationIllager\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/VineBlock.hpp b/LiteLoader/include/llapi/mc/VineBlock.hpp index 7afcaf5606..aa274487ea 100644 --- a/LiteLoader/include/llapi/mc/VineBlock.hpp +++ b/LiteLoader/include/llapi/mc/VineBlock.hpp @@ -36,25 +36,20 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@VineBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 11 + * @symbol ?getVisualShapeInWorld\@VineBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ - virtual void __unk_vfn_19(); + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +61,10 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +75,6 @@ class VineBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +95,11 @@ class VineBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +110,6 @@ class VineBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,55 +126,65 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 90 + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 93 * @symbol ?mayPlace\@VineBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@VineBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,97 +196,97 @@ class VineBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 134 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 135 * @symbol ?getColor\@VineBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 135 + * @vftbl 136 * @symbol ?getColor\@VineBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@VineBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; + virtual void __unk_vfn_153(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_162(); + /** + * @vftbl 163 + * @symbol __unk_vfn_163 + */ + virtual void __unk_vfn_163(); /** * @vftbl 164 * @symbol __unk_vfn_164 */ virtual void __unk_vfn_164(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 - */ - virtual void __unk_vfn_165(); - /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 - */ - virtual void __unk_vfn_169(); - /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 171 + * @vftbl 169 * @symbol ?randomTick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@VineBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@VineBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@VineBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 + * @vftbl 186 * @symbol ?getResourceCount\@VineBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp b/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp index 0176e05ce0..d3e13c1d41 100644 --- a/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp +++ b/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp @@ -34,7 +34,7 @@ class VolumeAreaCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@VolumeAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp b/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp index 907111abf9..f4fab5da8a 100644 --- a/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp +++ b/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp @@ -53,14 +53,14 @@ class VolumeEntityManagerServer { * @symbol ?removeAllVolumes\@VolumeEntityManagerServer\@\@QEAA?AV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVPacketSender\@\@\@Z */ MCAPI std::vector> removeAllVolumes(class LevelStorage &, class AutomaticID, class PacketSender &); - /** - * @symbol ?removeVolumes\@VolumeEntityManagerServer\@\@QEAA?AV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVPacketSender\@\@\@Z - */ - MCAPI std::vector> removeVolumes(class LevelStorage &, class BlockPos const &, class AutomaticID, class PacketSender &); /** * @symbol ?removeVolumes\@VolumeEntityManagerServer\@\@QEAA?AV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVPacketSender\@\@\@Z */ MCAPI std::vector> removeVolumes(class LevelStorage &, std::string const &, class AutomaticID, class PacketSender &); + /** + * @symbol ?removeVolumes\@VolumeEntityManagerServer\@\@QEAA?AV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVPacketSender\@\@\@Z + */ + MCAPI std::vector> removeVolumes(class LevelStorage &, class BlockPos const &, class AutomaticID, class PacketSender &); /** * @symbol ?sendAllVolumesToClient\@VolumeEntityManagerServer\@\@QEBAXAEBVUserEntityIdentifierComponent\@\@AEBVNetworkIdentifier\@\@AEAVPacketSender\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WSServerCommand.hpp b/LiteLoader/include/llapi/mc/WSServerCommand.hpp index 5195dd4486..f3efa58a12 100644 --- a/LiteLoader/include/llapi/mc/WSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/WSServerCommand.hpp @@ -36,7 +36,7 @@ class WSServerCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@WSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/WallBlock.hpp b/LiteLoader/include/llapi/mc/WallBlock.hpp index d4d82a8042..c2ea1c7301 100644 --- a/LiteLoader/include/llapi/mc/WallBlock.hpp +++ b/LiteLoader/include/llapi/mc/WallBlock.hpp @@ -36,40 +36,40 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 5 + * @symbol ?clip\@WallBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + */ + virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + /** + * @vftbl 8 * @symbol ?getAABB\@WallBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + /** + * @vftbl 11 + * @symbol ?getVisualShapeInWorld\@WallBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z + */ + virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &) const; /** * @vftbl 14 * @symbol ?getLiquidClipVolume\@WallBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 22 + * @vftbl 25 * @symbol ?canProvideSupport\@WallBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 + * @vftbl 28 * @symbol ?canConnect\@WallBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -81,10 +81,10 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -95,11 +95,6 @@ class WallBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -120,6 +115,11 @@ class WallBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -130,11 +130,6 @@ class WallBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -151,75 +146,85 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 + * @vftbl 56 + * @symbol __unk_vfn_56 + */ + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); + /** + * @vftbl 63 + * @symbol __unk_vfn_63 + */ + virtual void __unk_vfn_63(); + /** + * @vftbl 64 * @symbol ?canContainLiquid\@WallBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 76 + * @vftbl 79 * @symbol ?onStructureBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 77 + * @vftbl 80 * @symbol ?onStructureNeighborBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureNeighborBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 95 + * @vftbl 98 * @symbol ?breaksFallingBlocks\@WallBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@WallBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_107(); /** - * @vftbl 105 + * @vftbl 108 * @symbol ?getPlacementBlock\@WallBlock\@\@UEBAAEBVBlock\@\@AEBVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor const &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -231,97 +236,92 @@ class WallBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@WallBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 141 - * @symbol ?getVisualShapeInWorld\@WallBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z - */ - virtual class AABB const & getVisualShapeInWorld(class Block const &, class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; - /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@WallBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** * @vftbl 174 - * @symbol ?clip\@WallBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @symbol __unk_vfn_174 */ - virtual class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool) const; + virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 - */ - virtual void __unk_vfn_177(); - /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@WallBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@WallBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/WanderingTrader.hpp b/LiteLoader/include/llapi/mc/WanderingTrader.hpp index baf164246d..f9d8e10267 100644 --- a/LiteLoader/include/llapi/mc/WanderingTrader.hpp +++ b/LiteLoader/include/llapi/mc/WanderingTrader.hpp @@ -37,130 +37,130 @@ class WanderingTrader : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 165 + * @vftbl 153 * @symbol ?getEntityTypeId\@WanderingTrader\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@WanderingTrader\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WANDERINGTRADER /** * @symbol ?interactPreventDefault\@WanderingTrader\@\@UEAA_NXZ diff --git a/LiteLoader/include/llapi/mc/Warden.hpp b/LiteLoader/include/llapi/mc/Warden.hpp index f95429c288..6971e2da01 100644 --- a/LiteLoader/include/llapi/mc/Warden.hpp +++ b/LiteLoader/include/llapi/mc/Warden.hpp @@ -35,170 +35,170 @@ class Warden : public Monster { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 42 + * @vftbl 37 * @symbol ?canDisableShield\@Warden\@\@UEAA_NXZ */ virtual bool canDisableShield(); /** - * @vftbl 48 + * @vftbl 43 * @symbol ?normalTick\@Warden\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 112 + * @vftbl 101 * @symbol ?setTarget\@Warden\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@Warden\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Warden\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 243 + * @vftbl 230 * @symbol ?onPush\@Warden\@\@UEAAXAEAVActor\@\@\@Z */ virtual void onPush(class Actor &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Warden\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Warden\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 286 + * @vftbl 269 * @symbol ?checkSpawnObstruction\@Warden\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 296 + * @vftbl 279 * @symbol ?doHurtTarget\@Warden\@\@MEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Warden\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp index a004a126c1..39e661c894 100644 --- a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp @@ -52,10 +52,10 @@ class WarpedFungusOnAStickItem : public ComponentItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 49 * @symbol ?isHandEquipped\@WarpedFungusOnAStickItem\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/WaterAnimal.hpp b/LiteLoader/include/llapi/mc/WaterAnimal.hpp index 86de1eb217..9f8eee0ef7 100644 --- a/LiteLoader/include/llapi/mc/WaterAnimal.hpp +++ b/LiteLoader/include/llapi/mc/WaterAnimal.hpp @@ -37,132 +37,132 @@ class WaterAnimal : public Mob { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@WaterAnimal\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** - * @vftbl 345 + * @vftbl 325 * @symbol ?getFlopVerticalVelocityFactor\@WaterAnimal\@\@UEBAMXZ */ virtual float getFlopVerticalVelocityFactor() const; /** - * @vftbl 346 + * @vftbl 326 * @symbol ?getFlopHorizontalVelocityFactor\@WaterAnimal\@\@UEBAMXZ */ virtual float getFlopHorizontalVelocityFactor() const; diff --git a/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp index 5798989a83..7108618569 100644 --- a/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp @@ -37,10 +37,6 @@ class WaterAnimalPreAIStepSystem { * @symbol ?_doWaterAnimalPreAIStepSystem\@WaterAnimalPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doWaterAnimalPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - /** - * @symbol ?_tickWaterAnimalPreAIStepSystem\@WaterAnimalPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UWaterAnimalFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickWaterAnimalPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp index 6d49d1051e..5d24e09d0c 100644 --- a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp @@ -52,10 +52,10 @@ class WaterLilyBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 @@ -122,7 +122,7 @@ class WaterLilyBlockItem : public BlockItem { */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 134 + * @vftbl 135 * @symbol ?_useOn\@WaterLilyBlockItem\@\@UEBA?AVInteractionResult\@\@AEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual class InteractionResult _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; diff --git a/LiteLoader/include/llapi/mc/WaterMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/WaterMoveFinalizeSystem.hpp index 0afe8ddea2..a5629e640e 100644 --- a/LiteLoader/include/llapi/mc/WaterMoveFinalizeSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterMoveFinalizeSystem.hpp @@ -24,10 +24,6 @@ class WaterMoveFinalizeSystem { #endif public: - /** - * @symbol ?createWaterMoveFinalizeSideBySideSystem\@WaterMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createWaterMoveFinalizeSideBySideSystem(); /** * @symbol ?createWaterMoveFinalizeSystem\@WaterMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ diff --git a/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp b/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp index cd56dc682a..e1570ab9b6 100644 --- a/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp @@ -40,10 +40,6 @@ class WaterMovementComponent { * @symbol ?initFromDefinition\@WaterMovementComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); - /** - * @symbol ??8WaterMovementComponent\@\@QEBA_NAEBV0\@\@Z - */ - MCAPI bool operator==(class WaterMovementComponent const &) const; /** * @symbol ?getDefaultDragFactor\@WaterMovementComponent\@\@SAMXZ */ diff --git a/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp b/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp index 90aeef672b..ac84de3b70 100644 --- a/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp @@ -35,9 +35,5 @@ class WaterSinkInputSystem { * @symbol ?doInWaterSinkInputSystem\@WaterSinkInputSystem\@\@SAXAEBUAbilitiesComponent\@\@AEBUMoveInputComponent\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void doInWaterSinkInputSystem(struct AbilitiesComponent const &, struct MoveInputComponent const &, struct StateVectorComponent &); - /** - * @symbol ?tickWaterSinkInputSystem\@WaterSinkInputSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@UPlayerInputRequestComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@$$CBUAbilitiesComponent\@\@$$CBUMoveInputComponent\@\@UStateVectorComponent\@\@\@\@\@Z - */ - MCAPI static void tickWaterSinkInputSystem(class ViewT, struct PlayerInputRequestComponent, class FlagComponent>, struct AbilitiesComponent const, struct MoveInputComponent const, struct StateVectorComponent>); }; diff --git a/LiteLoader/include/llapi/mc/WaterTravelSystem.hpp b/LiteLoader/include/llapi/mc/WaterTravelSystem.hpp index e995ec690c..59af42acfe 100644 --- a/LiteLoader/include/llapi/mc/WaterTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterTravelSystem.hpp @@ -28,9 +28,5 @@ class WaterTravelSystem { * @symbol ?createWaterTravelSystem\@WaterTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createWaterTravelSystem(); - /** - * @symbol ?tickWaterTravelSystem\@WaterTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@$$CBV?$FlagComponent\@UWaterTravelFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@$$CBUSwimSpeedMultiplierComponent\@\@$$CBUWaterWalkSpeedEnchantComponent\@\@UMobTravelComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UDolphinFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAttributesComponent\@\@$$CBUMovementSpeedComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z - */ - MCAPI static void tickWaterTravelSystem(class ViewT const, class FlagComponent const>, struct AttributesComponent const, struct SwimSpeedMultiplierComponent const, struct WaterWalkSpeedEnchantComponent const, struct MobTravelComponent, class Optional const>, class Optional const>>, class ViewT, class ViewT>>); }; diff --git a/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp index fd6711b622..a67cb45d20 100644 --- a/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp +++ b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp @@ -36,25 +36,15 @@ class WaterlilyBlock : public BushBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@WaterlilyBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -65,16 +55,11 @@ class WaterlilyBlock : public BushBlock { * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); /** * @vftbl 34 - * @symbol ?isWaterBlocking\@WaterlilyBlock\@\@UEBA_NXZ + * @symbol __unk_vfn_34 */ - virtual bool isWaterBlocking() const; + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -87,9 +72,9 @@ class WaterlilyBlock : public BushBlock { virtual void __unk_vfn_36(); /** * @vftbl 37 - * @symbol __unk_vfn_37 + * @symbol ?isWaterBlocking\@WaterlilyBlock\@\@UEBA_NXZ */ - virtual void __unk_vfn_37(); + virtual bool isWaterBlocking() const; /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class WaterlilyBlock : public BushBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class WaterlilyBlock : public BushBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,55 +126,60 @@ class WaterlilyBlock : public BushBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 61 - * @symbol ?canContainLiquid\@WaterlilyBlock\@\@UEBA_NXZ + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool canContainLiquid() const; + virtual void __unk_vfn_56(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_62(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_63(); /** - * @vftbl 92 - * @symbol ?mayPlaceOn\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 64 + * @symbol ?canContainLiquid\@WaterlilyBlock\@\@UEBA_NXZ */ - virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; + virtual bool canContainLiquid() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 112 - * @symbol ?entityInside\@WaterlilyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + virtual void __unk_vfn_84(); + /** + * @vftbl 95 + * @symbol ?mayPlaceOn\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -201,70 +191,75 @@ class WaterlilyBlock : public BushBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 134 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 135 * @symbol ?getColor\@WaterlilyBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 + * @vftbl 137 * @symbol ?getColorAtPos\@WaterlilyBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0WaterlilyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/WeaponItem.hpp b/LiteLoader/include/llapi/mc/WeaponItem.hpp index c0edff0552..3c6c361e6e 100644 --- a/LiteLoader/include/llapi/mc/WeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/WeaponItem.hpp @@ -52,10 +52,10 @@ class WeaponItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 44 * @symbol ?canDestroySpecial\@WeaponItem\@\@UEBA_NAEBVBlock\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/WeatherCommand.hpp b/LiteLoader/include/llapi/mc/WeatherCommand.hpp index 3aad26629d..e7488d0d05 100644 --- a/LiteLoader/include/llapi/mc/WeatherCommand.hpp +++ b/LiteLoader/include/llapi/mc/WeatherCommand.hpp @@ -36,7 +36,7 @@ class WeatherCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@WeatherCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/WebBlock.hpp b/LiteLoader/include/llapi/mc/WebBlock.hpp index 48ce9203fd..81ff3ffe48 100644 --- a/LiteLoader/include/llapi/mc/WebBlock.hpp +++ b/LiteLoader/include/llapi/mc/WebBlock.hpp @@ -36,25 +36,15 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@WebBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class WebBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class WebBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class WebBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,45 +121,50 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_63(); /** - * @vftbl 112 - * @symbol ?entityInside\@WebBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,67 +176,72 @@ class WebBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 160 + * @vftbl 153 + * @symbol __unk_vfn_153 + */ + virtual void __unk_vfn_153(); + /** + * @vftbl 158 * @symbol ?_addHardCodedBlockComponents\@WebBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 187 + * @vftbl 184 * @symbol ?playerDestroy\@WebBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@WebBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp b/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp index 69809aacad..6809d5b82a 100644 --- a/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp +++ b/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -28,5 +29,9 @@ struct WebSocketPacketData { * @symbol ??0WebSocketPacketData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI WebSocketPacketData(std::string const &); + /** + * @symbol ?read\@WebSocketPacketData\@\@QEAA?AV?$Result\@XVerror_code\@std\@\@\@Bedrock\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI class Bedrock::Result read(class ReadOnlyBinaryStream &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp index dd92756fdf..2e112ba95b 100644 --- a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp @@ -36,25 +36,15 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 10 + * @vftbl 8 * @symbol ?getAABB\@WeepingVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -66,10 +56,10 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -80,11 +70,6 @@ class WeepingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -105,6 +90,11 @@ class WeepingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -115,11 +105,6 @@ class WeepingVinesBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -136,65 +121,75 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 61 + * @vftbl 64 * @symbol ?canContainLiquid\@WeepingVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 85 + * @vftbl 88 * @symbol ?onFertilized\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 + * @vftbl 94 * @symbol ?mayPlace\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 98 + * @vftbl 101 * @symbol ?neighborChanged\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -206,77 +201,82 @@ class WeepingVinesBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 161 + * @vftbl 159 * @symbol ?onRemove\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 167 + * @vftbl 165 * @symbol ?onPlace\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 170 + * @vftbl 168 * @symbol ?tick\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 178 + * @vftbl 175 * @symbol ?canSurvive\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@WeepingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; diff --git a/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp index eefa3c4378..7254bd1193 100644 --- a/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp @@ -36,20 +36,10 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@WeightedPressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@WeightedPressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,72 +176,77 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_164(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_167(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_171(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_174(); /** - * @vftbl 194 + * @vftbl 183 + * @symbol __unk_vfn_183 + */ + virtual void __unk_vfn_183(); + /** + * @vftbl 192 * @symbol ?getTickDelay\@WeightedPressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 195 + * @vftbl 193 * @symbol ?getSignalStrength\@WeightedPressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 196 + * @vftbl 194 * @symbol ?getSignalForData\@WeightedPressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 197 + * @vftbl 195 * @symbol ?getRedstoneSignal\@WeightedPressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const; diff --git a/LiteLoader/include/llapi/mc/Witch.hpp b/LiteLoader/include/llapi/mc/Witch.hpp index bbfac4f566..c2baab1fb5 100644 --- a/LiteLoader/include/llapi/mc/Witch.hpp +++ b/LiteLoader/include/llapi/mc/Witch.hpp @@ -37,150 +37,150 @@ class Witch : public HumanoidMonster { */ virtual void __unk_vfn_16(); /** - * @vftbl 26 + * @vftbl 25 * @symbol ?getFiringPos\@Witch\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 111 + * @vftbl 100 * @symbol ?canAttack\@Witch\@\@UEBA_NPEAVActor\@\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Witch\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 250 + * @vftbl 237 * @symbol ?updateEntitySpecificMolangVariables\@Witch\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 266 + * @vftbl 252 * @symbol ?_onSizeUpdated\@Witch\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 320 + * @vftbl 303 * @symbol ?getDamageAfterEnchantReduction\@Witch\@\@MEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterEnchantReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Witch\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp index 8976842e15..1177fe66b2 100644 --- a/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp @@ -37,10 +37,6 @@ class WitchPreAIStepSystem { * @symbol ?_doWitchPreAIStepSystem\@WitchPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doWitchPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - /** - * @symbol ?_tickWitchPreAIStepSystem\@WitchPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UWitchFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z - */ - MCAPI static void _tickWitchPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: diff --git a/LiteLoader/include/llapi/mc/WitherBoss.hpp b/LiteLoader/include/llapi/mc/WitherBoss.hpp index f526fba07c..49f0374832 100644 --- a/LiteLoader/include/llapi/mc/WitherBoss.hpp +++ b/LiteLoader/include/llapi/mc/WitherBoss.hpp @@ -52,205 +52,200 @@ class WitherBoss : public Monster { */ virtual void remove(); /** - * @vftbl 26 + * @vftbl 25 * @symbol ?getFiringPos\@WitherBoss\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 52 + * @vftbl 47 * @symbol ?startRiding\@WitherBoss\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol ?setBlockMovementSlowdownMultiplier\@WitherBoss\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); + virtual void __unk_vfn_71(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_77(); + /** + * @vftbl 83 + * @symbol __unk_vfn_83 + */ + virtual void __unk_vfn_83(); /** * @vftbl 86 * @symbol __unk_vfn_86 */ virtual void __unk_vfn_86(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 - */ - virtual void __unk_vfn_94(); - /** - * @vftbl 97 - * @symbol __unk_vfn_97 - */ - virtual void __unk_vfn_97(); - /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 132 + * @vftbl 120 * @symbol ?isInvulnerableTo\@WitherBoss\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@WitherBoss\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 169 + * @vftbl 157 * @symbol ?canFreeze\@WitherBoss\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 180 + * @vftbl 168 * @symbol ?causeFallDamage\@WitherBoss\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 205 + * @vftbl 192 * @symbol ?canBeAffected\@WitherBoss\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 206 + * @vftbl 193 * @symbol ?canBeAffectedByArrow\@WitherBoss\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 237 + * @vftbl 224 * @symbol ?die\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@WitherBoss\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@WitherBoss\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@WitherBoss\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 275 + * @vftbl 261 * @symbol ?hurtEffects\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 280 + * @vftbl 264 * @symbol ?aiStep\@WitherBoss\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@WitherBoss\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 338 + * @vftbl 318 * @symbol ?newServerAiStep\@WitherBoss\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0WitherBoss\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp index 490ff8ccf8..9d6296fe28 100644 --- a/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp @@ -37,10 +37,6 @@ class WitherBossPreAIStepSystem { * @symbol ?_doWitherBossPreAIStepSystem\@WitherBossPreAIStepSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UWitherBossPreAIStepResultComponent\@\@\@\@\@Z */ MCAPI static void _doWitherBossPreAIStepSystem(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT); - /** - * @symbol ?_tickWitherBossPreAIStepSystem\@WitherBossPreAIStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UWitherBossFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UWitherBossPreAIStepResultComponent\@\@\@\@\@Z - */ - MCAPI static void _tickWitherBossPreAIStepSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>, class EntityModifierT); private: diff --git a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp index fa6d5c49a1..f1d54606e4 100644 --- a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp +++ b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp @@ -36,20 +36,10 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class WitherRoseBlock : public FlowerBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class WitherRoseBlock : public FlowerBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class WitherRoseBlock : public FlowerBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,60 +116,65 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 85 + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); + /** + * @vftbl 88 * @symbol ?onFertilized\@WitherRoseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @vftbl 87 + * @vftbl 90 * @symbol ?canBeFertilized\@WitherRoseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 + * @vftbl 95 * @symbol ?mayPlaceOn\@WitherRoseBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 112 - * @symbol ?entityInside\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; - /** - * @vftbl 122 - * @symbol __unk_vfn_122 - */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -196,80 +186,90 @@ class WitherRoseBlock : public FlowerBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 132 + * @vftbl 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@WitherRoseBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 + * @vftbl 144 * @symbol ?canSpawnOn\@WitherRoseBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 150 + * @vftbl 148 * @symbol ?animateTick\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@WitherRoseBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 188 + * @symbol ?entityInside\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + */ + virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** * @symbol ??0WitherRoseBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/WitherSkull.hpp b/LiteLoader/include/llapi/mc/WitherSkull.hpp index f07dc8bdfc..296a0b17eb 100644 --- a/LiteLoader/include/llapi/mc/WitherSkull.hpp +++ b/LiteLoader/include/llapi/mc/WitherSkull.hpp @@ -42,135 +42,135 @@ class WitherSkull : public Fireball { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 93 + * @vftbl 82 * @symbol ?isPickable\@WitherSkull\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 102 + * @vftbl 91 * @symbol ?isOnFire\@WitherSkull\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 223 + * @vftbl 210 * @symbol ?canDestroyBlock\@WitherSkull\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroyBlock(class Block const &) const; /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@WitherSkull\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 268 + * @vftbl 254 * @symbol ?getInertia\@WitherSkull\@\@MEAAMXZ */ virtual float getInertia(); /** - * @vftbl 269 - * @symbol __unk_vfn_269 + * @vftbl 255 + * @symbol __unk_vfn_255 */ - virtual void __unk_vfn_269(); + virtual void __unk_vfn_255(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WITHERSKULL /** * @symbol ?shouldBurn\@WitherSkull\@\@UEAA_NXZ diff --git a/LiteLoader/include/llapi/mc/Wolf.hpp b/LiteLoader/include/llapi/mc/Wolf.hpp index 267db08ec5..cd44b7950b 100644 --- a/LiteLoader/include/llapi/mc/Wolf.hpp +++ b/LiteLoader/include/llapi/mc/Wolf.hpp @@ -37,170 +37,170 @@ class Wolf : public Animal { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 53 + * @vftbl 48 * @symbol ?addPassenger\@Wolf\@\@UEAAXAEAVActor\@\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 118 + * @vftbl 107 * @symbol ?setSitting\@Wolf\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 131 + * @vftbl 119 * @symbol ?getAmbientSound\@Wolf\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@Wolf\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 163 + * @vftbl 151 * @symbol ?load\@Wolf\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 185 + * @vftbl 173 * @symbol ?onSynchedDataUpdate\@Wolf\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 253 + * @vftbl 240 * @symbol ?_hurt\@Wolf\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 295 + * @vftbl 278 * @symbol ?isAlliedTo\@Wolf\@\@UEAA_NPEAVMob\@\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 324 + * @vftbl 307 * @symbol ?onBorn\@Wolf\@\@UEAAXAEAVActor\@\@0\@Z */ virtual void onBorn(class Actor &, class Actor &); /** - * @vftbl 338 + * @vftbl 318 * @symbol ?newServerAiStep\@Wolf\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0Wolf\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/WoodBlock.hpp b/LiteLoader/include/llapi/mc/WoodBlock.hpp index 346a38441d..3de4606f34 100644 --- a/LiteLoader/include/llapi/mc/WoodBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodBlock.hpp @@ -36,30 +36,20 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_22(); /** - * @vftbl 20 + * @vftbl 23 * @symbol ?isStrippable\@WoodBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isStrippable(class Block const &) const; /** - * @vftbl 21 + * @vftbl 24 * @symbol ?getStrippedBlock\@WoodBlock\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getStrippedBlock(class Block const &) const; - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -71,10 +61,10 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -85,11 +75,6 @@ class WoodBlock : public RotatedPillarBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -110,6 +95,11 @@ class WoodBlock : public RotatedPillarBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -120,11 +110,6 @@ class WoodBlock : public RotatedPillarBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -141,45 +126,55 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_56(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_62(); /** - * @vftbl 102 - * @symbol ?asItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + virtual void __unk_vfn_63(); + /** + * @vftbl 77 + * @symbol __unk_vfn_77 + */ + virtual void __unk_vfn_77(); + /** + * @vftbl 84 + * @symbol __unk_vfn_84 + */ + virtual void __unk_vfn_84(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 105 + * @symbol ?asItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ - virtual void __unk_vfn_104(); + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -191,87 +186,92 @@ class WoodBlock : public RotatedPillarBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@WoodBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@WoodBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 176 + * @vftbl 173 * @symbol ?use\@WoodBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@WoodBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp index 39b3893f7e..540fdc519a 100644 --- a/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp @@ -36,20 +36,10 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class WoodButtonBlock : public ButtonBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class WoodButtonBlock : public ButtonBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class WoodButtonBlock : public ButtonBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,40 +116,50 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -176,55 +171,60 @@ class WoodButtonBlock : public ButtonBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** * @symbol ??0WoodButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ diff --git a/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp index da10f2d2e2..c0e2a22e7a 100644 --- a/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp @@ -36,20 +36,10 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class WoodSlabBlock : public SlabBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class WoodSlabBlock : public SlabBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class WoodSlabBlock : public SlabBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,50 +116,60 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_56(); /** - * @vftbl 54 + * @vftbl 57 * @symbol ?isValidAuxValue\@WoodSlabBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_62(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_63(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_77(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_84(); /** - * @vftbl 102 + * @vftbl 105 * @symbol ?asItemInstance\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 - */ - virtual void __unk_vfn_104(); - /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -186,82 +181,87 @@ class WoodSlabBlock : public SlabBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 + */ + virtual void __unk_vfn_125(); + /** + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_128(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_131(); /** - * @vftbl 132 + * @vftbl 133 * @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; /** - * @vftbl 133 + * @vftbl 134 * @symbol ?isAuxValueRelevantForPicking\@WoodSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 145 + * @vftbl 143 * @symbol ?getVariant\@WoodSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_153(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 185 + * @vftbl 182 * @symbol ?getMapColor\@WoodSlabBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); /** - * @vftbl 188 + * @vftbl 185 * @symbol ?getResourceItem\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 190 + * @vftbl 187 * @symbol ?getSilkTouchItemInstance\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; diff --git a/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp index c386bc5ba1..d9eb6dc657 100644 --- a/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp @@ -52,10 +52,10 @@ class WoodSlabBlockItem : public DeprecatedSlabBlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 45 * @symbol ?getLevelDataForAuxValue\@WoodSlabBlockItem\@\@UEBAHH\@Z diff --git a/LiteLoader/include/llapi/mc/WoolBlock.hpp b/LiteLoader/include/llapi/mc/WoolBlock.hpp index 175d9ea013..f2ea992bc5 100644 --- a/LiteLoader/include/llapi/mc/WoolBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoolBlock.hpp @@ -31,20 +31,10 @@ class WoolBlock : public BlockLegacy { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -56,10 +46,10 @@ class WoolBlock : public BlockLegacy { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -70,11 +60,6 @@ class WoolBlock : public BlockLegacy { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -95,6 +80,11 @@ class WoolBlock : public BlockLegacy { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -105,11 +95,6 @@ class WoolBlock : public BlockLegacy { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -126,40 +111,50 @@ class WoolBlock : public BlockLegacy { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 + */ + virtual void __unk_vfn_49(); + /** + * @vftbl 50 + * @symbol __unk_vfn_50 + */ + virtual void __unk_vfn_50(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_51(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_56(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_81(); + virtual void __unk_vfn_77(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_84(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 107 + * @symbol __unk_vfn_107 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -171,55 +166,60 @@ class WoolBlock : public BlockLegacy { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol __unk_vfn_162 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_162(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_163(); + /** + * @vftbl 164 + * @symbol __unk_vfn_164 + */ + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WOOLBLOCK /** * @symbol ?canDamperVibrations\@WoolBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/WoolBlockItem.hpp b/LiteLoader/include/llapi/mc/WoolBlockItem.hpp index 4637d77f57..2b1592bbd4 100644 --- a/LiteLoader/include/llapi/mc/WoolBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WoolBlockItem.hpp @@ -47,10 +47,10 @@ class WoolBlockItem : public BlockItem { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp index ee714715bd..c00e28a898 100644 --- a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp @@ -36,20 +36,10 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 22 + * @symbol __unk_vfn_22 */ - virtual void __unk_vfn_19(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); + virtual void __unk_vfn_22(); /** * @vftbl 31 * @symbol __unk_vfn_31 @@ -61,10 +51,10 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 34 + * @symbol __unk_vfn_34 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_34(); /** * @vftbl 35 * @symbol __unk_vfn_35 @@ -75,11 +65,6 @@ class WoolCarpetBlock : public CarpetBlock { * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __unk_vfn_37 - */ - virtual void __unk_vfn_37(); /** * @vftbl 38 * @symbol __unk_vfn_38 @@ -100,6 +85,11 @@ class WoolCarpetBlock : public CarpetBlock { * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); + /** + * @vftbl 42 + * @symbol __unk_vfn_42 + */ + virtual void __unk_vfn_42(); /** * @vftbl 43 * @symbol __unk_vfn_43 @@ -110,11 +100,6 @@ class WoolCarpetBlock : public CarpetBlock { * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @symbol __unk_vfn_45 - */ - virtual void __unk_vfn_45(); /** * @vftbl 46 * @symbol __unk_vfn_46 @@ -131,45 +116,55 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_48(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 49 + * @symbol __unk_vfn_49 */ - virtual void __unk_vfn_53(); + virtual void __unk_vfn_49(); /** - * @vftbl 59 - * @symbol __unk_vfn_59 + * @vftbl 50 + * @symbol __unk_vfn_50 */ - virtual void __unk_vfn_59(); + virtual void __unk_vfn_50(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 51 + * @symbol __unk_vfn_51 */ - virtual void __unk_vfn_60(); + virtual void __unk_vfn_51(); /** - * @vftbl 70 - * @symbol ?dispense\@WoolCarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 56 + * @symbol __unk_vfn_56 */ - virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; + virtual void __unk_vfn_56(); + /** + * @vftbl 62 + * @symbol __unk_vfn_62 + */ + virtual void __unk_vfn_62(); /** - * @vftbl 74 - * @symbol __unk_vfn_74 + * @vftbl 63 + * @symbol __unk_vfn_63 */ - virtual void __unk_vfn_74(); + virtual void __unk_vfn_63(); /** - * @vftbl 81 - * @symbol __unk_vfn_81 + * @vftbl 73 + * @symbol ?dispense\@WoolCarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ - virtual void __unk_vfn_81(); + virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_77(); /** - * @vftbl 122 - * @symbol __unk_vfn_122 + * @vftbl 84 + * @symbol __unk_vfn_84 */ - virtual void __unk_vfn_122(); + virtual void __unk_vfn_84(); + /** + * @vftbl 107 + * @symbol __unk_vfn_107 + */ + virtual void __unk_vfn_107(); /** * @vftbl 123 * @symbol __unk_vfn_123 @@ -181,55 +176,60 @@ class WoolCarpetBlock : public CarpetBlock { */ virtual void __unk_vfn_124(); /** - * @vftbl 127 - * @symbol __unk_vfn_127 + * @vftbl 125 + * @symbol __unk_vfn_125 */ - virtual void __unk_vfn_127(); + virtual void __unk_vfn_125(); /** - * @vftbl 130 - * @symbol __unk_vfn_130 + * @vftbl 128 + * @symbol __unk_vfn_128 */ - virtual void __unk_vfn_130(); + virtual void __unk_vfn_128(); /** - * @vftbl 155 - * @symbol __unk_vfn_155 + * @vftbl 131 + * @symbol __unk_vfn_131 */ - virtual void __unk_vfn_155(); + virtual void __unk_vfn_131(); /** - * @vftbl 164 - * @symbol __unk_vfn_164 + * @vftbl 153 + * @symbol __unk_vfn_153 */ - virtual void __unk_vfn_164(); + virtual void __unk_vfn_153(); + /** + * @vftbl 162 + * @symbol __unk_vfn_162 + */ + virtual void __unk_vfn_162(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 163 + * @symbol __unk_vfn_163 */ - virtual void __unk_vfn_165(); + virtual void __unk_vfn_163(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_166(); + virtual void __unk_vfn_164(); /** - * @vftbl 169 - * @symbol __unk_vfn_169 + * @vftbl 167 + * @symbol __unk_vfn_167 */ - virtual void __unk_vfn_169(); + virtual void __unk_vfn_167(); /** - * @vftbl 173 - * @symbol __unk_vfn_173 + * @vftbl 171 + * @symbol __unk_vfn_171 */ - virtual void __unk_vfn_173(); + virtual void __unk_vfn_171(); /** - * @vftbl 177 - * @symbol __unk_vfn_177 + * @vftbl 174 + * @symbol __unk_vfn_174 */ - virtual void __unk_vfn_177(); + virtual void __unk_vfn_174(); /** - * @vftbl 186 - * @symbol __unk_vfn_186 + * @vftbl 183 + * @symbol __unk_vfn_183 */ - virtual void __unk_vfn_186(); + virtual void __unk_vfn_183(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WOOLCARPETBLOCK /** * @symbol ?canDamperVibrations\@WoolCarpetBlock\@\@UEBA_NXZ diff --git a/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp index d02475d275..dfc6545897 100644 --- a/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp @@ -36,7 +36,7 @@ class WorldBuilderCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@WorldBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/WritableBookItem.hpp b/LiteLoader/include/llapi/mc/WritableBookItem.hpp index 385690733f..013832cf78 100644 --- a/LiteLoader/include/llapi/mc/WritableBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WritableBookItem.hpp @@ -52,10 +52,10 @@ class WritableBookItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 51 * @symbol __unk_vfn_51 diff --git a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp index c50763dcba..114e959167 100644 --- a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp @@ -52,10 +52,10 @@ class WrittenBookItem : public Item { */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 21 + * @symbol __unk_vfn_21 */ - virtual void __unk_vfn_19(); + virtual void __unk_vfn_21(); /** * @vftbl 50 * @symbol ?isGlint\@WrittenBookItem\@\@MEBA_NAEBVItemStackBase\@\@\@Z diff --git a/LiteLoader/include/llapi/mc/XPCommand.hpp b/LiteLoader/include/llapi/mc/XPCommand.hpp index 0bc508fcc7..b4992efbb4 100644 --- a/LiteLoader/include/llapi/mc/XPCommand.hpp +++ b/LiteLoader/include/llapi/mc/XPCommand.hpp @@ -36,7 +36,7 @@ class XPCommand : public Command { */ virtual void __unk_vfn_0(); /** - * @vftbl 2 + * @vftbl 1 * @symbol ?execute\@XPCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; diff --git a/LiteLoader/include/llapi/mc/Zombie.hpp b/LiteLoader/include/llapi/mc/Zombie.hpp index 3085a926a6..8f83b0a0a9 100644 --- a/LiteLoader/include/llapi/mc/Zombie.hpp +++ b/LiteLoader/include/llapi/mc/Zombie.hpp @@ -44,135 +44,135 @@ enum class ZombieType; */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 187 + * @vftbl 175 * @symbol ?canPickupItem\@Zombie\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canPickupItem(class ItemStack const &) const; /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 285 + * @vftbl 268 * @symbol ?checkSpawnRules\@Zombie\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 302 + * @vftbl 285 * @symbol ?getArmorValue\@Zombie\@\@MEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ZOMBIE /** * @symbol __unk_destructor_-1 diff --git a/LiteLoader/include/llapi/mc/ZombieVillager.hpp b/LiteLoader/include/llapi/mc/ZombieVillager.hpp index d0c636d9d3..fd893de501 100644 --- a/LiteLoader/include/llapi/mc/ZombieVillager.hpp +++ b/LiteLoader/include/llapi/mc/ZombieVillager.hpp @@ -42,135 +42,135 @@ class ZombieVillager : public Zombie { */ virtual void __unk_vfn_16(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 35 + * @symbol __unk_vfn_35 */ - virtual void __unk_vfn_40(); + virtual void __unk_vfn_35(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 55 + * @symbol __unk_vfn_55 */ - virtual void __unk_vfn_61(); + virtual void __unk_vfn_55(); /** - * @vftbl 68 - * @symbol __unk_vfn_68 + * @vftbl 62 + * @symbol __unk_vfn_62 */ - virtual void __unk_vfn_68(); + virtual void __unk_vfn_62(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 71 + * @symbol __unk_vfn_71 */ - virtual void __unk_vfn_80(); + virtual void __unk_vfn_71(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 77 + * @symbol __unk_vfn_77 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_77(); /** - * @vftbl 94 - * @symbol __unk_vfn_94 + * @vftbl 83 + * @symbol __unk_vfn_83 */ - virtual void __unk_vfn_94(); + virtual void __unk_vfn_83(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 86 + * @symbol __unk_vfn_86 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_86(); /** - * @vftbl 104 - * @symbol __unk_vfn_104 + * @vftbl 93 + * @symbol __unk_vfn_93 */ - virtual void __unk_vfn_104(); + virtual void __unk_vfn_93(); /** - * @vftbl 106 - * @symbol __unk_vfn_106 + * @vftbl 95 + * @symbol __unk_vfn_95 */ - virtual void __unk_vfn_106(); + virtual void __unk_vfn_95(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_96(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 98 + * @symbol __unk_vfn_98 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_98(); /** - * @vftbl 139 + * @vftbl 127 * @symbol ?handleEntityEvent\@ZombieVillager\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 176 - * @symbol __unk_vfn_176 + * @vftbl 164 + * @symbol __unk_vfn_164 */ - virtual void __unk_vfn_176(); + virtual void __unk_vfn_164(); /** - * @vftbl 190 - * @symbol __unk_vfn_190 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_190(); + virtual void __unk_vfn_178(); /** - * @vftbl 215 - * @symbol __unk_vfn_215 + * @vftbl 202 + * @symbol __unk_vfn_202 */ - virtual void __unk_vfn_215(); + virtual void __unk_vfn_202(); /** - * @vftbl 216 - * @symbol __unk_vfn_216 + * @vftbl 203 + * @symbol __unk_vfn_203 */ - virtual void __unk_vfn_216(); + virtual void __unk_vfn_203(); /** - * @vftbl 232 - * @symbol __unk_vfn_232 + * @vftbl 219 + * @symbol __unk_vfn_219 */ - virtual void __unk_vfn_232(); + virtual void __unk_vfn_219(); /** - * @vftbl 235 - * @symbol __unk_vfn_235 + * @vftbl 222 + * @symbol __unk_vfn_222 */ - virtual void __unk_vfn_235(); + virtual void __unk_vfn_222(); /** - * @vftbl 252 - * @symbol __unk_vfn_252 + * @vftbl 239 + * @symbol __unk_vfn_239 */ - virtual void __unk_vfn_252(); + virtual void __unk_vfn_239(); /** - * @vftbl 256 + * @vftbl 243 * @symbol ?readAdditionalSaveData\@ZombieVillager\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 257 + * @vftbl 244 * @symbol ?addAdditionalSaveData\@ZombieVillager\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 260 - * @symbol __unk_vfn_260 + * @vftbl 247 + * @symbol __unk_vfn_247 */ - virtual void __unk_vfn_260(); + virtual void __unk_vfn_247(); /** - * @vftbl 267 - * @symbol __unk_vfn_267 + * @vftbl 253 + * @symbol __unk_vfn_253 */ - virtual void __unk_vfn_267(); + virtual void __unk_vfn_253(); /** - * @vftbl 293 - * @symbol __unk_vfn_293 + * @vftbl 276 + * @symbol __unk_vfn_276 */ - virtual void __unk_vfn_293(); + virtual void __unk_vfn_276(); /** - * @vftbl 297 - * @symbol __unk_vfn_297 + * @vftbl 280 + * @symbol __unk_vfn_280 */ - virtual void __unk_vfn_297(); + virtual void __unk_vfn_280(); /** - * @vftbl 343 - * @symbol __unk_vfn_343 + * @vftbl 323 + * @symbol __unk_vfn_323 */ - virtual void __unk_vfn_343(); + virtual void __unk_vfn_323(); /** * @symbol ??0ZombieVillager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ diff --git a/LiteLoader/include/llapi/mc/inc/enums.inc b/LiteLoader/include/llapi/mc/inc/enums.inc index c5fb05dcf4..744b210177 100644 --- a/LiteLoader/include/llapi/mc/inc/enums.inc +++ b/LiteLoader/include/llapi/mc/inc/enums.inc @@ -1,6 +1,13 @@ // clang-format off #include +enum class BlockSlot : int +{ + None_86 = -1, + Container_0 = 0, + _count_28 = 1, +}; + enum class ContainerType : char { NONE = -9, INVENTORY = -1, @@ -1180,4 +1187,8 @@ public: std::underlying_type_t mResult; }; +namespace Connection{ + enum class DisconnectFailReason; +}; + // clang-format on \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/mce.hpp b/LiteLoader/include/llapi/mc/mce.hpp index 1d5335702e..6242527892 100644 --- a/LiteLoader/include/llapi/mc/mce.hpp +++ b/LiteLoader/include/llapi/mc/mce.hpp @@ -203,6 +203,55 @@ inline static const char getParticleColorType(ColorPalette const& p) { return particleColors.at(p).first; } +enum class ImageFormat : __int32 +{ + Unknown_17 = 0x0, + R8Unorm = 0x1, + RGB8Unorm = 0x2, + RGBA8Unorm = 0x3, +}; + +enum class ImageUsage : unsigned char { + Unknown = 0x0, + sRGB = 0x1, + Data = 0x2, +}; + + +struct Blob +{ + typedef std::size_t size_type; + typedef uint8_t value_type; + typedef void (*delete_function)(value_type *); + class Deleter + { + public: + delete_function m_func; + void operator()(value_type* ptr) const + { + if (m_func) + m_func(ptr); + else + delete[] ptr; + } + }; + typedef std::unique_ptr pointer_type; + pointer_type mBlob; + size_type mSize; +}; + + + +struct Image +{ + mce::ImageFormat imageFormat; + uint32_t mWidth; + uint32_t mHeight; + mce::ImageUsage mUsage; + mce::Blob mImageBytes; +}; + + }; // namespace mce namespace std { diff --git a/LiteLoader/include/llapi/mc/persona.hpp b/LiteLoader/include/llapi/mc/persona.hpp index 9f9964daad..6df43eb69d 100644 --- a/LiteLoader/include/llapi/mc/persona.hpp +++ b/LiteLoader/include/llapi/mc/persona.hpp @@ -19,6 +19,35 @@ namespace persona { #define AFTER_EXTRA // Add Member There + + struct SizeInfo { + std::string_view mSizeName; + std::string_view mSizeTexturePath; + }; + + enum class AnimationExpression : __int32 + { + Linear_0 = 0x0, + Blinking = 0x1, + }; + + +struct ArmSize { + enum class Type : int64_t { + Slim = 0, + Wide = 1, + Count_15 = 2, + Unknown_18 = 3, + }; + + struct Proxy { + using constIterator = std::unordered_map::const_iterator; + }; + + using SizeInfoList = std::unordered_map; + }; + + enum class AnimatedTextureType; enum class PieceType; diff --git a/LiteLoader/src/liteloader/BuiltinBugFix.cpp b/LiteLoader/src/liteloader/BuiltinBugFix.cpp index 5e5a532ea0..d05a89b218 100644 --- a/LiteLoader/src/liteloader/BuiltinBugFix.cpp +++ b/LiteLoader/src/liteloader/BuiltinBugFix.cpp @@ -412,7 +412,7 @@ TInstanceHook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@A ab.setBool(0); if (flying) ab.setBool(1); - UpdateAbilitiesPacket packet(sp->getUniqueID(), abilities); + UpdateAbilitiesPacket packet(sp->getOrCreateUniqueID(), abilities); auto pkt2 = UpdateAdventureSettingsPacket(AdventureSettings()); abilities.setAbility(AbilitiesIndex::Flying, flying); sp->sendNetworkPacket(pkt2); @@ -421,6 +421,8 @@ TInstanceHook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@A } } + + // Fix SimulatedPlayer Bugs namespace SimulatedPlayerClient { template @@ -444,8 +446,8 @@ TInstanceHook(void, "?tickWorld@Player@@UEAAXAEBUTick@@@Z", Player, struct Tick #include "llapi/mc/ChunkViewSource.hpp" // fix chunk load and tick - ChunkSource load mode -static_assert(sizeof(ChunkSource) == 0x50); // 88 -static_assert(sizeof(ChunkViewSource) == 0x1d8); // 472 +static_assert(sizeof(ChunkSource) == 0x60); // 96 +static_assert(sizeof(ChunkViewSource) == 0x1e8); // 472 TInstanceHook(std::shared_ptr, "?_createChunkSource@SimulatedPlayer@@MEAA?AV?$shared_ptr@VChunkViewSource@@@std@@AEAVChunkSource@@@Z", @@ -454,74 +456,6 @@ TInstanceHook(std::shared_ptr, return std::make_shared(result); } -/* -// Fix carried item display -// Fix armor display -#include "llapi/mc/WeakStorageEntity.hpp" -#include "llapi/mc/WeakEntityRef.hpp" - -// void sendEvent(class EventRef> const &); -TClasslessInstanceHook(void, "?sendEvent@ActorEventCoordinator@@QEAAXAEBV?$EventRef@U?$ActorGameplayEvent@X@@@@@Z", - void* a2) { - original(this, a2); - if (a2) { - auto type = dAccess(a2); - // sendActorCarriedItemChanged - if (type == 4) { - auto v56 = dAccess(a2); - WeakStorageEntity* weakStorageEntity; - if (v56) { - if (v56 != 1) { - return; - } - } - weakStorageEntity = (WeakStorageEntity*)a2; - if (weakStorageEntity) { - auto* actor = weakStorageEntity->tryUnwrap(); - if (actor->isSimulatedPlayer()) { - ItemInstance const& newItem = dAccess(weakStorageEntity); - int slot = dAccess(weakStorageEntity); - // Force to call the implementation of ServerPlayer - MobEquipmentPacket pkt(actor->getRuntimeID(), newItem, (int)slot, (int)slot, - ContainerID::Inventory); - SimulatedPlayerClient::send((SimulatedPlayer*)actor, pkt); - } - } - } - // sendActorEquippedArmor - else if (type == 8) { - auto v30 = dAccess(a2); - WeakStorageEntity* weakStorageEntity; - if (v30) { - if (v30 != 1) { - return; - } - } - weakStorageEntity = (WeakStorageEntity*)a2; - if (weakStorageEntity) { - auto* actor = weakStorageEntity->tryUnwrap(); - if (actor->isSimulatedPlayer()) { - int slot = dAccess(weakStorageEntity); - ItemInstance const& item = dAccess(weakStorageEntity); - // Force to call the implementation of ServerPlayer - MobEquipmentPacket pkt(actor->getRuntimeID(), item, (int)slot, (int)slot, ContainerID::Armor); - SimulatedPlayerClient::send((SimulatedPlayer*)actor, pkt); - } - } - } - } -} -*/ -// Fix horion client's crash module -#include "llapi/mc/PlayerListPacket.hpp" -#include "llapi/mc/ExtendedStreamReadResult.hpp" - -TInstanceHook(ExtendedStreamReadResult, - "?_read@PlayerListPacket@@EEAA?AUExtendedStreamReadResult@@AEAVReadOnlyBinaryStream@@@Z", - PlayerListPacket, ReadOnlyBinaryStream) { - return ExtendedStreamReadResult{StreamReadResult::Valid, ""}; -} - // Fix item disappear caused by players throwing items at unloaded chunks #include #include @@ -543,10 +477,19 @@ TInstanceHook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@A // fix BlockEventDispatcherToken unregister crash error when stop server #include TInstanceHook(void,"?unregister@BlockEventDispatcherToken@@QEAAXXZ",BlockEventDispatcherToken){ - if (this->mHandle != -1 && this->mDispatcher->listeners.size() <= 1 && ll::globalRuntimeConfig.serverStatus == ll::LLServerStatus::Stopping) + if (this->mHandle != -1) { - logger.debug("BlockEventDispatcherToken::unregister with no listeners"); + if(ll::globalRuntimeConfig.serverStatus == ll::LLServerStatus::Stopping){ + logger.debug("BlockEventDispatcherToken::unregister ignore unregister when server stopping"); + this->mHandle = -1; + return; + } + //logger.info("{} {}",this->mHandle,this->mDispatcher->listeners.size()); + auto it = this->mDispatcher->listeners.find(this->mHandle); + if (it != this->mDispatcher->listeners.end()) + this->mDispatcher->listeners.erase(it); + this->mHandle = -1; return; } - original(this); -} \ No newline at end of file + //original(this); +} diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp index b5f588fe19..b897f2946d 100644 --- a/LiteLoader/src/llapi/EventAPI.cpp +++ b/LiteLoader/src/llapi/EventAPI.cpp @@ -441,14 +441,19 @@ TClasslessInstanceHook(bool, int num = 0; /////////////////// PlayerJump /////////////////// -TInstanceHook(void, "?jumpFromGround@Player@@UEAAXAEBVIConstBlockSource@@@Z", Player, void* a2) { - IF_LISTENED(PlayerJumpEvent) { - PlayerJumpEvent ev{}; - ev.mPlayer = this; - ev.call(); +THook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVPlayerActionPacket@@@Z", + ServerNetworkHandler * self, NetworkIdentifier * a2, PlayerActionPacket * a3) +{ + auto pl = self->getServerPlayer(*a2); + if (pl && a3->actionType == PlayerActionType::Jump){ + IF_LISTENED(PlayerJumpEvent) { + PlayerJumpEvent ev{}; + ev.mPlayer = pl; + ev.call(); + } + IF_LISTENED_END(PlayerJumpEvent) } - IF_LISTENED_END(PlayerJumpEvent) - return original(this, a2); + original(self, a2, a3); } /////////////////// PlayerSneak /////////////////// @@ -475,6 +480,7 @@ THook(void, IF_LISTENED(PlayerSwingEvent) { PlayerSwingEvent ev{}; ev.mPlayer = serverNetworkHandler->getServerPlayer(networkIdentifier); + ev.call(); } IF_LISTENED_END(PlayerSwingEvent) } @@ -628,8 +634,8 @@ TInstanceHook(void, "?onEffectUpdated@ServerPlayer@@MEAAXAEAVMobEffectInstance@@ } /////////////////// PlayerStartDestroyBlock /////////////////// -TClasslessInstanceHook(void, "?sendBlockDestructionStarted@BlockEventCoordinator@@QEAAXAEAVPlayer@@AEBVBlockPos@@@Z", - Player* player, BlockPos* blockPosPtr) { +TClasslessInstanceHook(void, "?sendBlockDestructionStarted@BlockEventCoordinator@@QEAAXAEAVPlayer@@AEBVBlockPos@@E@Z", + Player* player, BlockPos* blockPosPtr, char a4) { if (player && blockPosPtr) { IF_LISTENED(PlayerStartDestroyBlockEvent) { PlayerStartDestroyBlockEvent ev{}; @@ -639,7 +645,7 @@ TClasslessInstanceHook(void, "?sendBlockDestructionStarted@BlockEventCoordinator } IF_LISTENED_END(PlayerStartDestroyBlockEvent) } - return original(this, player, blockPosPtr); + return original(this, player, blockPosPtr,a4); } /////////////////// PlayerPlaceBlock /////////////////// @@ -652,7 +658,31 @@ TInstanceHook(char, "?checkBlockPermissions@BlockSource@@QEAA_NAEAVActor@@AEBVBl auto player = (Player*)ac; PlayerPlaceBlockEvent ev{}; ev.mPlayer = player; - ev.mBlockInstance = this->getBlockInstance(*blockPosPtr); + int x = blockPosPtr->x; + int y = blockPosPtr->y; + int z = blockPosPtr->z; + switch (facing) { + case 0: + --y; + break; + case 1: + ++y; + break; + case 2: + --z; + break; + case 3: + ++z; + break; + case 4: + --x; + break; + case 5: + ++x; + break; + } + BlockPos pos(x, y, z); + ev.mBlockInstance = this->getBlockInstance(pos); if (!ev.call()) { // this pointer is not used. ((ItemUseInventoryTransaction*)nullptr)->resendBlocksAroundArea(*player, *blockPosPtr, facing); return false; @@ -795,7 +825,7 @@ TInstanceHook(void, "?setArmor@ServerPlayer@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z ev.mSlot = slot; ev.mArmorItem = item; if (!ev.call()) { - auto& uid = getUniqueID(); + auto& uid = getOrCreateUniqueID(); auto& plInv = getSupplies(); plInv.add(*item, 1); getArmorContainer().setItem(slot, ItemStack::EMPTY_ITEM); @@ -813,7 +843,7 @@ TInstanceHook(void, "?setArmor@ServerPlayer@@UEAAXW4ArmorSlot@@AEBVItemStack@@@Z } /////////////////// PlayerUseRespawnAnchor /////////////////// -TInstanceHook(bool, "?trySetSpawn@RespawnAnchorBlock@@CA_NAEAVPlayer@@AEBVBlockPos@@AEAVBlockSource@@AEAVLevel@@@Z", +TInstanceHook(char, "?_trySetSpawn@RespawnAnchorBlock@@CA_NAEAVPlayer@@AEBVBlockPos@@AEAVBlockSource@@AEAVLevel@@@Z", Player, BlockPos* blockPosPtr, BlockSource* blockSource, Level* a4) { IF_LISTENED(PlayerUseRespawnAnchorEvent) { PlayerUseRespawnAnchorEvent ev{}; @@ -1460,7 +1490,7 @@ struct BucketPlayerAndActor { }; // 也许这个结构体可以用偏移获取替代？ -THook(void, "::operator()", BucketPlayerAndActor* a1) { +THook(void, "::operator()", BucketPlayerAndActor* a1) { IF_LISTENED(PlayerUseBucketEvent) { BucketPlayerAndActor mBucketPlayerAndActor = *a1; if (mBucketPlayerAndActor.owner->getTypeName() == "minecraft:cow" || diff --git a/LiteLoader/src/llapi/command/CommandRegistryAPI.cpp b/LiteLoader/src/llapi/command/CommandRegistryAPI.cpp index 14b92c7406..c13343ec46 100644 --- a/LiteLoader/src/llapi/command/CommandRegistryAPI.cpp +++ b/LiteLoader/src/llapi/command/CommandRegistryAPI.cpp @@ -10,13 +10,14 @@ #include "liteloader/LiteLoader.h" using ll::logger; -static_assert(offsetof(CommandParameterData, options) == 73); +static_assert(offsetof(CommandParameterData, options) == 89); static_assert(offsetof(CommandParameterData, name) == 16); -static_assert(offsetof(CommandParameterData, unk56) == 56); +static_assert(offsetof(CommandParameterData, unk72) == 72); +static_assert(sizeof(CommandParameterData) == 96); static_assert(offsetof(CommandRegistry::Overload, versionOffset) == 40); static_assert(sizeof(CommandRegistry::Overload) == 72); -static_assert(offsetof(CommandRegistry::Signature, alt_symbol) == 96); -static_assert(sizeof(CommandRegistry::Signature) == 128); +static_assert(offsetof(CommandRegistry::Signature, alt_symbol) == 120); +static_assert(sizeof(CommandRegistry::Signature) == 152); /* void CommandRegistry::registerOverload(std::string const& name, Overload::FactoryFn factory, std::vector&& args) { @@ -242,7 +243,6 @@ inline void CommandRegistry::printSize() const { 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["mAliases "].append(fmt::format(", {:4}", mAliases.size())); log["mSemanticConstraints "].append(fmt::format(", {:4}", mSemanticConstraints.size())); log["mSemanticConstraintLookup"].append(fmt::format(", {:4}", mSemanticConstraintLookup.size())); diff --git a/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp index 42c9e5abe5..3877234535 100644 --- a/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp +++ b/LiteLoader/src/llapi/command/DynamicCommandAPI.cpp @@ -1,4 +1,4 @@ -//#define COMMAND_REGISTRY_EXTRA +// #define COMMAND_REGISTRY_EXTRA #include #include "llapi/DynamicCommandAPI.h" @@ -14,6 +14,7 @@ #include "llapi/mc/ActorDefinitionIdentifier.hpp" #include "llapi/mc/Level.hpp" #include "llapi/mc/CommandBlockName.hpp" +#include "llapi/mc/BlockStateCommandParam.hpp" #include "llapi/utils/SRWLock.h" #include "llapi/ScheduleAPI.h" #include "llapi/mc/Minecraft.hpp" @@ -25,36 +26,36 @@ using ll::logger; -#define ForEachParameterType(func) \ - func(Bool); \ - func(Int); \ - func(Float); \ - func(String); \ - func(Actor); \ - func(Player); \ - func(BlockPos); \ - func(Vec3); \ - func(RawText); \ - func(Message); \ - func(JsonValue); \ - func(Item); \ - func(Block); \ - func(Effect); \ - func(Enum); \ - func(SoftEnum); \ - func(ActorType); \ - func(Command); \ +#define ForEachParameterType(func) \ + func(Bool); \ + func(Int); \ + func(Float); \ + func(String); \ + func(Actor); \ + func(Player); \ + func(BlockPos); \ + func(Vec3); \ + func(RawText); \ + func(Message); \ + func(JsonValue); \ + func(Item); \ + func(Block); \ + func(Effect); \ + func(Enum); \ + func(SoftEnum); \ + func(ActorType); \ + func(Command); \ func(WildcardSelector); -#define CatchDynamicCommandError(func, handle) \ - catch (const seh_exception& e) { \ - OutputError("Uncaught SEH Exception Detected!", e.code(), TextEncoding::toUTF8(e.what()), func, handle); \ - } \ - catch (const std::exception& e) { \ - OutputError("Uncaught C++ Exception Detected!", errno, TextEncoding::toUTF8(e.what()), func, handle); \ - } \ - catch (...) { \ - OutputError("Uncaught Exception Detected!", -1, "", func, handle); \ +#define CatchDynamicCommandError(func, handle) \ + catch (const seh_exception& e) { \ + OutputError("Uncaught SEH Exception Detected!", e.code(), TextEncoding::toUTF8(e.what()), func, handle); \ + } \ + catch (const std::exception& e) { \ + OutputError("Uncaught C++ Exception Detected!", errno, TextEncoding::toUTF8(e.what()), func, handle); \ + } \ + catch (...) { \ + OutputError("Uncaught Exception Detected!", -1, "", func, handle); \ } // global variable and function @@ -86,6 +87,7 @@ typedef CommandMessage Message; typedef Json::Value JsonValue; typedef CommandItem Item; typedef CommandBlockName Block; +typedef std::vector BlockState; typedef MobEffect const* Effect; // typedef CommandPosition Position; #ifdef USE_PARSE_ENUM_STRING @@ -115,6 +117,7 @@ auto const ParameterSizeMap = std::unordered_map{ {ParameterType::JsonValue, std::max((size_t)8, sizeof(ParameterDataType::JsonValue))}, {ParameterType::Item, std::max((size_t)8, sizeof(ParameterDataType::Item))}, {ParameterType::Block, std::max((size_t)8, sizeof(ParameterDataType::Block))}, + {ParameterType::BlockState, std::max((size_t)8, sizeof(ParameterDataType::BlockState))}, {ParameterType::Effect, std::max((size_t)8, sizeof(ParameterDataType::Effect))}, {ParameterType::Enum, std::max((size_t)8, sizeof(ParameterDataType::Enum))}, {ParameterType::SoftEnum, std::max((size_t)8, sizeof(ParameterDataType::SoftEnum))}, @@ -146,26 +149,32 @@ template inline void initValue(void* command, size_t offset) { dAccess(command, offset) = T(); } + template <> inline void initValue(void* command, size_t offset) { dAccess(command, offset).basic_string::basic_string(); } + template <> inline void initValue(void* command, size_t offset) { dAccess(command, offset).CommandItem::CommandItem(); } + template <> inline void initValue(void* command, size_t offset) { dAccess(command, offset).CommandMessage::CommandMessage(); } + template <> inline void initValue>(void* command, size_t offset) { dAccess>(command, offset).CommandSelector::CommandSelector(); } + template <> inline void initValue>(void* command, size_t offset) { dAccess>(command, offset).CommandSelector::CommandSelector(); } + template <> inline void initValue>(void* command, size_t offset) { dAccess>(command, offset).WildcardCommandSelector::WildcardCommandSelector(); @@ -175,10 +184,7 @@ inline void initValue>(void* command, size_t offs #pragma region ParameterPtr -inline DynamicCommand::ParameterPtr::ParameterPtr(ParameterType type, size_t offset) -: type(type) -, offset(offset) { -} +inline DynamicCommand::ParameterPtr::ParameterPtr(ParameterType type, size_t offset) : type(type), offset(offset) {} inline bool DynamicCommand::ParameterPtr::isValueSet(DynamicCommand const* command) const { return dAccess(command, offset + ParameterSizeMap.at(type)); @@ -198,12 +204,10 @@ DynamicCommand::ParameterData::ParameterData(ParameterData const& right) offset = right.offset; }; -inline DynamicCommand::ParameterData::ParameterData(std::string const& name, ParameterType type, bool optional, std::string const& enumOptions, std::string const& identifier, CommandParameterOption parameterOption) -: name(name) -, type(type) -, optional(optional) -, description(enumOptions) -, option(parameterOption) { +inline DynamicCommand::ParameterData::ParameterData(std::string const& name, ParameterType type, bool optional, + std::string const& enumOptions, std::string const& identifier, + CommandParameterOption parameterOption) +: name(name), type(type), optional(optional), description(enumOptions), option(parameterOption) { if (identifier.empty()) this->identifier = description.empty() ? name : description; else @@ -217,9 +221,10 @@ inline DynamicCommand::ParameterData::ParameterData(std::string const& name, Par } } -inline DynamicCommand::ParameterData::ParameterData(std::string const& name, DynamicCommand::ParameterType type, std::string const& enumOptions, std::string const& identifier, CommandParameterOption parameterOption) -: ParameterData(name, type, false, enumOptions, identifier, parameterOption) { -} +inline DynamicCommand::ParameterData::ParameterData(std::string const& name, DynamicCommand::ParameterType type, + std::string const& enumOptions, std::string const& identifier, + CommandParameterOption parameterOption) +: ParameterData(name, type, false, enumOptions, identifier, parameterOption) {} inline CommandParameterData DynamicCommand::ParameterData::makeParameterData() const { switch (type) { @@ -249,6 +254,8 @@ inline CommandParameterData DynamicCommand::ParameterData::makeParameterData() c return makeParameterData(); case ParameterType::Block: return makeParameterData(); + case ParameterType::BlockState: + return makeParameterData(); case ParameterType::Effect: return makeParameterData(); // case ParameterType::Position: @@ -274,23 +281,17 @@ inline CommandParameterData DynamicCommand::ParameterData::makeParameterData() c #pragma region Result -inline DynamicCommand::Result::Result(ParameterPtr const* ptr, DynamicCommand const* command, CommandOrigin const* origin, DynamicCommandInstance const* instance) +inline DynamicCommand::Result::Result(ParameterPtr const* ptr, DynamicCommand const* command, + CommandOrigin const* origin, DynamicCommandInstance const* instance) : type(ptr->type) , offset(ptr->offset) , command(command) , origin(origin) , instance(instance ? instance : command->getInstance()) -, isSet(ptr->isValueSet(command)) { -} +, isSet(ptr->isValueSet(command)) {} inline DynamicCommand::Result::Result() -: type((ParameterType)-1) -, offset(-1) -, command(nullptr) -, origin(nullptr) -, instance(nullptr) -, isSet(false) { -} +: type((ParameterType)-1), offset(-1), command(nullptr), origin(nullptr), instance(nullptr), isSet(false) {} inline std::string const& DynamicCommand::Result::getEnumValue() const { if (getType() == ParameterType::Enum) { @@ -320,13 +321,17 @@ std::string DynamicCommand::Result::toDebugString() const { std::string typeName = fmt::format("{}({})", magic_enum::enum_name(type), (int)type); switch (type) { case ParameterType::Bool: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw()); case ParameterType::Int: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw()); case ParameterType::Float: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw()); case ParameterType::Actor: - // return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw>().getName()); + // return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + // getRaw>().getName()); case ParameterType::Player: { std::vector actors = get>(); std::ostringstream oss; @@ -341,34 +346,55 @@ std::string DynamicCommand::Result::toDebugString() const { return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, oss.str()); } case ParameterType::String: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw()); case ParameterType::BlockPos: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw().serialize().toSNBT()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw().serialize().toSNBT()); case ParameterType::Vec3: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw().serialize().toSNBT()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw().serialize().toSNBT()); case ParameterType::RawText: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw().getText()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw().getText()); case ParameterType::Message: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw().getMessage(*origin)); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw().getMessage(*origin)); case ParameterType::JsonValue: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw().toStyledString().substr(0, getRaw().toStyledString().size() - 1)); + return fmt::format( + "name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw().toStyledString().substr(0, getRaw().toStyledString().size() - 1)); case ParameterType::Item: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw().createInstance(1, 1, nullptr, true).value_or(ItemInstance::EMPTY_ITEM).toString()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw() + .createInstance(1, 1, nullptr, true) + .value_or(ItemInstance::EMPTY_ITEM) + .toString()); case ParameterType::Block: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, isSet ? getRaw().getDescriptionId() : "nullptr" ); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + isSet ? getRaw().getDescriptionId() : "nullptr"); + case ParameterType::BlockState: + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + isSet ? "state" : "nullptr"); case ParameterType::Effect: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, isSet ? getRaw()->getResourceName() : "nullptr"); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + isSet ? getRaw()->getResourceName() : "nullptr"); case ParameterType::Enum: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, fmt::format("{}({})", getRaw(), getRaw())); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + fmt::format("{}({})", getRaw(), getRaw())); case ParameterType::SoftEnum: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, getRaw()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + getRaw()); case ParameterType::ActorType: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, isSet ? getRaw()->getCanonicalName() : "Null"); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + isSet ? getRaw()->getCanonicalName() : "Null"); case ParameterType::Command: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, isSet ? getRaw>()->getCommandName() : "Null"); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + isSet ? getRaw>()->getCommandName() : "Null"); #ifdef ENABLE_PARAMETER_TYPE_POSTFIX case ParameterType::Postfix: - return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, get()); + return fmt::format("name: {:15s}, type: {:15s}, isSet: {:5}, value: {}", name, typeName, isSet, + get()); #endif // ENABLE_PARAMETER_TYPE_POSTFIX default: logger.error("Unknown Parameter Type {}, name: {}", typeName, name); @@ -403,9 +429,9 @@ inline char DynamicCommand::builderCallbackHanler(DCCallback* cb, DCArgs* args, } std::unique_ptr* DynamicCommand::commandBuilder(std::unique_ptr* rtn, std::string name) { -#define CaseInitBreak(type) \ - case ParameterType::type: \ - initValue(command, offset); \ +#define CaseInitBreak(type) \ + case ParameterType::type: \ + initValue(command, offset); \ break; assert(dynamicCommandInstances.count(name) == 1); @@ -434,7 +460,7 @@ DynamicCommandInstance* DynamicCommand::_setup(std::unique_ptr->findCommand(name); if (signature) { @@ -458,10 +484,11 @@ DynamicCommandInstance* DynamicCommand::_setup(std::unique_ptrsetEnum(*iter, CommandRegistry::getEnumValues(*iter)); -#endif // USE_PARSE_ENUM_STRING +#endif // USE_PARSE_ENUM_STRING } } else if (param.type == ParameterType::SoftEnum) { // add empty Soft Enum if not found in command and BDS @@ -499,7 +526,8 @@ DynamicCommandInstance* DynamicCommand::_setup(std::unique_ptr> values; size_t index = range.first; - for (auto iter = commandInstance->enumValues.begin() + range.first; iter != commandInstance->enumValues.begin() + range.first + range.second; ++iter) { + for (auto iter = commandInstance->enumValues.begin() + range.first; + iter != commandInstance->enumValues.begin() + range.first + range.second; ++iter) { values.emplace_back(*iter, index); ++index; } @@ -516,12 +544,15 @@ DynamicCommandInstance* DynamicCommand::_setup(std::unique_ptr->addSoftEnum(name, values); } - Global->registerCommand(commandInstance->name, commandInstance->description->c_str(), commandInstance->permission, commandInstance->flag, commandInstance->flag); + Global->registerCommand(commandInstance->name, commandInstance->description->c_str(), + commandInstance->permission, commandInstance->flag, + commandInstance->flag); if (!commandInstance->alias.empty()) Global->registerAlias(commandInstance->name, commandInstance->alias); auto builder = commandInstance->initCommandBuilder(); for (auto& overload : commandInstance->overloads) { - Global->registerOverload(commandInstance->name, builder, commandInstance->buildOverload(overload)); + Global->registerOverload(commandInstance->name, builder, + commandInstance->buildOverload(overload)); } // commandInstance->overloads.clear(); auto res = dynamicCommandInstances.emplace(commandInstance->name, std::move(commandInstance)); @@ -551,9 +582,9 @@ bool DynamicCommand::onServerCommandsRegister(CommandRegistry& registry) { } DynamicCommand::~DynamicCommand() { -#define CaseDestructBreak(type) \ - case ParameterType::type: \ - destruct(this, offset); \ +#define CaseDestructBreak(type) \ + case ParameterType::type: \ + destruct(this, offset); \ break; std::string commandName = getCommandName(); @@ -593,9 +624,14 @@ void DynamicCommand::execute(CommandOrigin const& origin, CommandOutput& output) CatchDynamicCommandError("DynamicCommand::execute", commandIns.handle); } -std::unique_ptr DynamicCommand::createCommand(std::string const& name, std::string const& description, CommandPermissionLevel permission, CommandFlag flag1, CommandFlag flag2, HMODULE handle) { +std::unique_ptr DynamicCommand::createCommand(std::string const& name, + std::string const& description, + CommandPermissionLevel permission, + CommandFlag flag1, CommandFlag flag2, + HMODULE handle) { return DynamicCommandInstance::create(name, description, permission, flag1 |= flag2, handle); } + #include "llapi/LLAPI.h" #include "llapi/EventAPI.h" #include "liteloader/Config.h" @@ -610,7 +646,8 @@ DynamicCommandInstance const* DynamicCommand::setup(std::unique_ptrgetCommandName()); + // logger.warn("Registering command \"{}\" after RegCmdEvent, note that this is unstable!", + // commandInstance->getCommandName()); Schedule::nextTick([instance{commandInstance.release()}]() { if (!_setup(std::unique_ptr(instance))) logger.warn("Registering command \"{}\" failed", instance->getCommandName()); @@ -619,7 +656,11 @@ DynamicCommandInstance const* DynamicCommand::setup(std::unique_ptr DynamicCommand::createCommand(std::string const& name, std::string const& description, std::unordered_map>&& enums, std::vector&& params, std::vector>&& overloads, CallBackFn callback, CommandPermissionLevel permission, CommandFlag flag1, CommandFlag flag2, HMODULE handle) { +std::unique_ptr DynamicCommand::createCommand( + std::string const& name, std::string const& description, + std::unordered_map>&& enums, std::vector&& params, + std::vector>&& overloads, CallBackFn callback, CommandPermissionLevel permission, + CommandFlag flag1, CommandFlag flag2, HMODULE handle) { auto command = createCommand(name, description, permission, flag1, flag2, handle); if (!command) return std::unique_ptr(); @@ -633,7 +674,7 @@ std::unique_ptr DynamicCommand::createCommand(std: for (auto& overload : overloads) { command->addOverload(std::move(overload)); } - }else{ + } else { command->addOverload(); } command->setCallback(std::move(callback)); @@ -689,7 +730,9 @@ DynamicCommandInstance const* DynamicCommand::getInstance(std::string const& com #pragma region DynamicCommandInstance -inline DynamicCommandInstance::DynamicCommandInstance(std::string const& name, std::string const& description, CommandPermissionLevel permission, CommandFlag flag, HMODULE handle) +inline DynamicCommandInstance::DynamicCommandInstance(std::string const& name, std::string const& description, + CommandPermissionLevel permission, CommandFlag flag, + HMODULE handle) : name(name) , description(std::make_unique(description)) , permission(permission) @@ -702,7 +745,10 @@ inline DynamicCommandInstance::~DynamicCommandInstance() { this->builder = nullptr; } -inline std::unique_ptr DynamicCommandInstance::create(std::string const& name, std::string const& description, CommandPermissionLevel permission, CommandFlag flag, HMODULE handle) { +inline std::unique_ptr DynamicCommandInstance::create(std::string const& name, + std::string const& description, + CommandPermissionLevel permission, + CommandFlag flag, HMODULE handle) { if (ll::globalRuntimeConfig.serverStatus != ll::LLServerStatus::Running) { for (auto& cmd : delaySetupCommandInstances) { if (cmd->name == name) { @@ -714,7 +760,8 @@ inline std::unique_ptr DynamicCommandInstance::create(st logger.error("Command \"{}\" already exists", name); return {}; } - return std::unique_ptr(new DynamicCommandInstance(name, description, permission, flag, handle)); + return std::unique_ptr( + new DynamicCommandInstance(name, description, permission, flag, handle)); } inline bool DynamicCommandInstance::addOverload(std::vector&& params) { @@ -725,7 +772,8 @@ inline bool DynamicCommandInstance::addOverload(std::vector const& values) { +inline std::string const& DynamicCommandInstance::setEnum(std::string const& description, + std::vector const& values) { auto& desc = enumNames.emplace_back(std::make_unique(description)); enumRanges.emplace(*desc, std::pair{enumValues.size(), values.size()}); enumValues.insert(enumValues.end(), values.begin(), values.end()); @@ -748,25 +796,32 @@ ParameterIndex DynamicCommandInstance::newParameter(DynamicCommand::ParameterDat } else { offset = iter->second.getOffset(); if (iter->second.type != data.type) - throw std::runtime_error(fmt::format("dynamic command \"{}\" register failed, Different type parameters with the same name {} are not allowed", name, data.name)); + throw std::runtime_error(fmt::format("dynamic command \"{}\" register failed, Different type parameters " + "with the same name {} are not allowed", + name, data.name)); } std::string const& identifier = data.identifier; - if (parameterDatas.end() != std::find_if(parameterDatas.begin(), parameterDatas.end(), - [&](DynamicCommand::ParameterData const& data) { return data.identifier == identifier; })) + if (parameterDatas.end() != + std::find_if(parameterDatas.begin(), parameterDatas.end(), + [&](DynamicCommand::ParameterData const& data) { return data.identifier == identifier; })) throw std::runtime_error("parameter identifier already exists"); data.offset = offset; parameterDatas.emplace_back(std::move(data)); return {this, parameterDatas.size() - 1}; } -inline ParameterIndex DynamicCommandInstance::newParameter(std::string const& name, DynamicCommand::ParameterType type, bool optional, std::string const& description, std::string const& identifier, CommandParameterOption parameterOption) { +inline ParameterIndex DynamicCommandInstance::newParameter(std::string const& name, DynamicCommand::ParameterType type, + bool optional, std::string const& description, + std::string const& identifier, + CommandParameterOption parameterOption) { return newParameter(ParameterData(name, type, optional, description, identifier, parameterOption)); } inline ParameterIndex DynamicCommandInstance::findParameterIndex(std::string const& indentifier) { size_t index = 0; for (auto& paramData : parameterDatas) { - if (paramData.identifier == indentifier || paramData.description == indentifier || paramData.name == indentifier) + if (paramData.identifier == indentifier || paramData.description == indentifier || + paramData.name == indentifier) break; ++index; } @@ -775,32 +830,45 @@ inline ParameterIndex DynamicCommandInstance::findParameterIndex(std::string con return {this, index}; } -inline ParameterIndex DynamicCommandInstance::mandatory(std::string const& name, DynamicCommand::ParameterType type, std::string const& description, std::string const& identifier, CommandParameterOption parameterOption) { +inline ParameterIndex DynamicCommandInstance::mandatory(std::string const& name, DynamicCommand::ParameterType type, + std::string const& description, std::string const& identifier, + CommandParameterOption parameterOption) { return newParameter(ParameterData(name, type, false, description, identifier, parameterOption)); } -inline ParameterIndex DynamicCommandInstance::mandatory(std::string const& name, DynamicCommand::ParameterType type, std::string const& description, CommandParameterOption parameterOption) { + +inline ParameterIndex DynamicCommandInstance::mandatory(std::string const& name, DynamicCommand::ParameterType type, + std::string const& description, + CommandParameterOption parameterOption) { return mandatory(name, type, description, "", parameterOption); }; -inline ParameterIndex DynamicCommandInstance::mandatory(std::string const& name, DynamicCommand::ParameterType type, CommandParameterOption parameterOption) { + +inline ParameterIndex DynamicCommandInstance::mandatory(std::string const& name, DynamicCommand::ParameterType type, + CommandParameterOption parameterOption) { return mandatory(name, type, "", "", parameterOption); }; -inline ParameterIndex DynamicCommandInstance::optional(std::string const& name, DynamicCommand::ParameterType type, std::string const& description, std::string const& identifier, CommandParameterOption parameterOption) { +inline ParameterIndex DynamicCommandInstance::optional(std::string const& name, DynamicCommand::ParameterType type, + std::string const& description, std::string const& identifier, + CommandParameterOption parameterOption) { return newParameter(ParameterData(name, type, true, description, identifier, parameterOption)); } -inline ParameterIndex DynamicCommandInstance::optional(std::string const& name, DynamicCommand::ParameterType type, std::string const& description, CommandParameterOption parameterOption) { +inline ParameterIndex DynamicCommandInstance::optional(std::string const& name, DynamicCommand::ParameterType type, + std::string const& description, + CommandParameterOption parameterOption) { return optional(name, type, description, "", parameterOption); } -inline ParameterIndex DynamicCommandInstance::optional(std::string const& name, DynamicCommand::ParameterType type, CommandParameterOption parameterOption) { +inline ParameterIndex DynamicCommandInstance::optional(std::string const& name, DynamicCommand::ParameterType type, + CommandParameterOption parameterOption) { return optional(name, type, "", "", parameterOption); } bool DynamicCommandInstance::addOverload(std::vector&& params) { for (auto& index : params) { if (index >= parameterDatas.size()) - throw std::runtime_error("parameter index " + std::to_string(index) + " out of range 0 ~ " + std::to_string(parameterDatas.size())); + throw std::runtime_error("parameter index " + std::to_string(index) + " out of range 0 ~ " + + std::to_string(parameterDatas.size())); } overloads.emplace_back(params); return true; @@ -831,7 +899,8 @@ inline bool DynamicCommandInstance::setAlias(std::string const& alias) { return true; } -inline std::vector DynamicCommandInstance::buildOverload(std::vector const& overload) { +inline std::vector + DynamicCommandInstance::buildOverload(std::vector const& overload) { std::vector datas; for (auto& index : overload) { auto& param = parameterDatas.at(index); @@ -854,7 +923,8 @@ inline std::vector DynamicCommandInstance::buildOverload(s // { // auto iter = softEnumValues.find(name); // if (iter != softEnumValues.end()) -// CommandSoftEnumRegistry(Global).updateSoftEnum(SoftEnumUpdateType::Set, iter->first, iter->second); +// CommandSoftEnumRegistry(Global).updateSoftEnum(SoftEnumUpdateType::Set, iter->first, +// iter->second); // else // return false; // return true; @@ -882,6 +952,7 @@ std::string DynamicCommandInstance::setSoftEnum(std::string const& name, std::ve } return name; } + bool DynamicCommandInstance::addSoftEnumValues(std::string const& name, std::vector const& values) const { if (!hasRegistered()) { auto iter = softEnums.find(name); @@ -902,15 +973,15 @@ bool DynamicCommandInstance::addSoftEnumValues(std::string const& name, std::vec } return true; }; -bool DynamicCommandInstance::removeSoftEnumValues(std::string const& name, std::vector const& values) const { + +bool DynamicCommandInstance::removeSoftEnumValues(std::string const& name, + std::vector const& values) const { if (!hasRegistered()) { auto iter = softEnums.find(name); if (iter != softEnums.end()) { - auto tmp = std::remove_if( - iter->second.begin(), iter->second.end(), - [values](std::string const& val) { - return std::find(values.begin(), values.end(), val) != values.end(); - }); + auto tmp = std::remove_if(iter->second.begin(), iter->second.end(), [values](std::string const& val) { + return std::find(values.begin(), values.end(), val) != values.end(); + }); iter->second.erase(tmp, iter->second.end()); return true; } @@ -921,9 +992,11 @@ bool DynamicCommandInstance::removeSoftEnumValues(std::string const& name, std:: } return true; } + inline std::vector DynamicCommandInstance::getSoftEnumValues(std::string const& name) { return CommandRegistry::getSoftEnumValues(name); } + inline std::vector DynamicCommandInstance::getSoftEnumNames() { return CommandRegistry::getSoftEnumNames(); } @@ -988,14 +1061,14 @@ void setupTestParamCommand() { Param JsonValueParam("testJsonValue", ParamType::JsonValue, true); Param ItemParam("testItem", ParamType::Item, true); Param BlockParam("testBlock", ParamType::Block, true); + Param BlockStateParam("testBlockState", ParamType::BlockState, true); Param ActorTypeParam("testActorType", ParamType::ActorType, true); Param EffectParam("testEffect", ParamType::Effect, true); Param CommandParam("testCommand", ParamType::Command, true); // Param posParam(ParamType::Position, "testPos", true); // Test Command: dynparam true 114 3.14 str @e @a 3 1 4 ~3 ~1 ~4 raw text msg {"a":4} stick concrete speed version DynamicCommand::setup( - "param", "dynamic command", - {}, + "param", "dynamic command", {}, { boolParam, intParam, @@ -1010,19 +1083,13 @@ void setupTestParamCommand() { JsonValueParam, ItemParam, BlockParam, + BlockStateParam, ActorTypeParam, EffectParam, CommandParam, }, {{ - "testActorType", - "testBool", - "testInt", - "testFloat", - "testStr", - "testActor", - "testPlayer", - "testBlockPos", + "testActorType", "testBool", "testInt", "testFloat", "testStr", "testActor", "testPlayer", "testBlockPos", "testVec3", //"testRawText", //"testMessage", @@ -1032,7 +1099,8 @@ void setupTestParamCommand() { //"testEffect", //"testCommand", }}, - [](DynamicCommand const& command, CommandOrigin const& origin, CommandOutput& output, std::unordered_map& results) { + [](DynamicCommand const& command, CommandOrigin const& origin, CommandOutput& output, + std::unordered_map& results) { for (auto& [name, result] : results) { output.success(result.toDebugString()); } @@ -1106,7 +1174,8 @@ void setupExampleCommand() { command->addOverload({optionsAdd, "testString"}); // dyncmd command->addOverload({"TestOperation2"}); // dyncmd - command->setCallback([](DynamicCommand const& command, CommandOrigin const& origin, CommandOutput& output, std::unordered_map& results) { + command->setCallback([](DynamicCommand const& command, CommandOrigin const& origin, CommandOutput& output, + std::unordered_map& results) { switch (do_hash(results["testEnum"].getRaw().c_str())) { case do_hash("add"): output.success(fmt::format("Add - {}", results["testString"].getRaw())); @@ -1129,41 +1198,40 @@ void setupExampleCommand() { void setupRemoveCommand() { auto command = DynamicCommand::createCommand("unregister", "unregister command", CommandPermissionLevel::Any); command->setAlias("remove"); - auto name = command->mandatory("name", ParamType::SoftEnum, - command->setSoftEnum("CommandNames", {})); + auto name = command->mandatory("name", ParamType::SoftEnum, command->setSoftEnum("CommandNames", {})); command->addOverload(name); - command->setCallback( - [](DynamicCommand const& cmd, CommandOrigin const& origin, CommandOutput& output, - std::unordered_map& results) { - auto& name = results["name"].getRaw(); - auto fullName = Global->getCommandFullName(name); - if (fullName == cmd.getCommandName()) { - output.success("Request unregister itself"); - Schedule::delay([fullName]() { + command->setCallback([](DynamicCommand const& cmd, CommandOrigin const& origin, CommandOutput& output, + std::unordered_map& results) { + auto& name = results["name"].getRaw(); + auto fullName = Global->getCommandFullName(name); + if (fullName == cmd.getCommandName()) { + output.success("Request unregister itself"); + Schedule::delay( + [fullName]() { auto res = Global->unregisterCommand(fullName); if (res) { dynamicCommandInstances.erase(fullName); logger.info("unregister command " + fullName); - ((DynamicCommandInstance*)0)->setSoftEnum("CommandNames", CommandRegistry::getEnumValues("CommandName")); + ((DynamicCommandInstance*)0) + ->setSoftEnum("CommandNames", CommandRegistry::getEnumValues("CommandName")); } else logger.error("error in unregister command " + fullName); }, - 20); - return; - } - auto res = Global->unregisterCommand(fullName); - if (res) { - dynamicCommandInstances.erase(fullName); - output.success("unregister command " + fullName); - cmd.getInstance()->setSoftEnum("CommandNames", CommandRegistry::getEnumValues("CommandName")); - } else - output.error("error in unregister command " + fullName); - }); + 20); + return; + } + auto res = Global->unregisterCommand(fullName); + if (res) { + dynamicCommandInstances.erase(fullName); + output.success("unregister command " + fullName); + cmd.getInstance()->setSoftEnum("CommandNames", CommandRegistry::getEnumValues("CommandName")); + } else + output.error("error in unregister command " + fullName); + }); command->setSoftEnum("CommandNames", CommandRegistry::getEnumValues("CommandName")); DynamicCommand::setup(std::move(command)); } - // TInstanceHook(void, "?run@Command@@QEBAXAEBVCommandOrigin@@AEAVCommandOutput@@@Z", // Command, class CommandOrigin const& origin, class CommandOutput& output) //{ @@ -1225,10 +1293,10 @@ void onEnumExecute(DynamicCommand const& cmd, CommandOrigin const& origin, Comma } void setupEnumCommand() { - auto command = DynamicCommand::createCommand("enum", "get command enum names or values", CommandPermissionLevel::Any); + auto command = + DynamicCommand::createCommand("enum", "get command enum names or values", CommandPermissionLevel::Any); command->setAlias("enums"); - auto name = command->mandatory("name", ParamType::SoftEnum, - command->setSoftEnum("EnumNameList", {})); + auto name = command->mandatory("name", ParamType::SoftEnum, command->setSoftEnum("EnumNameList", {})); command->addOverload(name); command->addOverload(); command->setCallback(onEnumExecute); @@ -1246,12 +1314,11 @@ void setupEnumCommand() { void setupEchoCommand() { auto command = DynamicCommand::createCommand("echo", "show message", CommandPermissionLevel::Any); command->addOverload(command->mandatory("text", ParamType::RawText)); - command->setCallback( - [](DynamicCommand const& cmd, CommandOrigin const& origin, CommandOutput& output, - std::unordered_map& results) { - auto& text = results["text"].getRaw(); - output.success(text); - }); + command->setCallback([](DynamicCommand const& cmd, CommandOrigin const& origin, CommandOutput& output, + std::unordered_map& results) { + auto& text = results["text"].getRaw(); + output.success(text); + }); DynamicCommand::setup(std::move(command)); } diff --git a/LiteLoader/src/llapi/mc/ActorAPI.cpp b/LiteLoader/src/llapi/mc/ActorAPI.cpp index 298ab17ae7..692b58672e 100644 --- a/LiteLoader/src/llapi/mc/ActorAPI.cpp +++ b/LiteLoader/src/llapi/mc/ActorAPI.cpp @@ -120,7 +120,7 @@ BlockInstance Actor::getBlockStandingOn() const { ActorUniqueID Actor::getActorUniqueId() const { __try { - return getUniqueID(); + return getOrCreateUniqueID(); } __except (EXCEPTION_EXECUTE_HANDLER) { return {0}; } } diff --git a/LiteLoader/src/llapi/mc/BlockAPI.cpp b/LiteLoader/src/llapi/mc/BlockAPI.cpp index b488325a26..be45dc99b8 100644 --- a/LiteLoader/src/llapi/mc/BlockAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockAPI.cpp @@ -30,8 +30,8 @@ int Block::getId() const { return getLegacyBlock().getBlockItemId(); } -std::unique_ptr Block::getNbt() { - return CompoundTag::fromBlock(this); +std::unique_ptr Block::getNbt() const { + return getSerializationId().clone(); } bool Block::setNbt(CompoundTag* nbt) { diff --git a/LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp b/LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp index 607aaa3a82..2e928b2312 100644 --- a/LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockLegacyAPI.cpp @@ -11,7 +11,7 @@ Block* BlockLegacy::toBlock(unsigned short tileData) { } string BlockLegacy::getTypeName() { - return dAccess(this); + return dAccess(this); } bool BlockLegacy::applyBoneMeal(class BlockSource* a1, class BlockPos const& a2) { diff --git a/LiteLoader/src/llapi/mc/ItemActorAPI.cpp b/LiteLoader/src/llapi/mc/ItemActorAPI.cpp index 1899017d6f..40a91787b3 100644 --- a/LiteLoader/src/llapi/mc/ItemActorAPI.cpp +++ b/LiteLoader/src/llapi/mc/ItemActorAPI.cpp @@ -2,15 +2,15 @@ #include "llapi/mc/ItemActor.hpp" ItemStack* ItemActor::getItemStack() { - return &dAccess(this); // IDA Player::take + return &dAccess(this); // IDA Player::take } int ItemActor::getDespawnTime() { - return dAccess(this); // ItemActor::postNormalTick + return dAccess(this); // ItemActor::postNormalTick } bool ItemActor::setDespawnTime(int a1) { - dAccess(this) = a1; + dAccess(this) = a1; return true; } @@ -20,5 +20,5 @@ bool ItemActor::setDespawnTime(int a1) { int ItemActor::getLatestSpawnTime() { - return dAccess(this); + return dAccess(this); } \ No newline at end of file diff --git a/LiteLoader/src/llapi/mc/LevelAPI.cpp b/LiteLoader/src/llapi/mc/LevelAPI.cpp index eef26700f7..8f2bb4ee56 100644 --- a/LiteLoader/src/llapi/mc/LevelAPI.cpp +++ b/LiteLoader/src/llapi/mc/LevelAPI.cpp @@ -169,7 +169,7 @@ CompoundTag& getServerOriginTag() { std::unique_ptr getPlayerOriginTag(Player& player) { static auto cached = CompoundTag::fromSNBT(R"({"OriginType":0b,"PlayerId":0l})"); auto tag = cached->clone(); - tag->putInt64("PlayerId", player.getUniqueID()); + tag->putInt64("PlayerId", player.getOrCreateUniqueID()); return std::move(tag); } diff --git a/LiteLoader/src/llapi/mc/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp index c7d25b8de4..159ae24488 100644 --- a/LiteLoader/src/llapi/mc/PlayerAPI.cpp +++ b/LiteLoader/src/llapi/mc/PlayerAPI.cpp @@ -81,7 +81,7 @@ enum class AbilitiesLayer; // From https://github.com/dreamguxiang/BETweaker void Player::setAbility(AbilitiesIndex index, bool value) { - ActorUniqueID uid = getUniqueID(); + ActorUniqueID uid = getOrCreateUniqueID(); auto& abilities = getAbilities(); auto flying = abilities.getAbility(AbilitiesIndex::Flying).getBool(); if (index == AbilitiesIndex::Flying && value && isOnGround()) { @@ -109,6 +109,16 @@ void Player::setAbility(AbilitiesIndex index, bool value) { sendNetworkPacket(pkt); } +float Player::getCameraOffset() { + if (isGliding()) + return -1.1f; + if (isSwimming() || getDamageNearbyMobs()) + return -1.2f; + if (isSleeping()) + return 1.0f; + return 0.0f; +} + std::string Player::getRealName() { if (isSimulatedPlayer()) return getName(); @@ -166,48 +176,13 @@ string Player::getServerAddress() { return "unknown"; } -string Player::getDeviceTypeName() { - switch ((int)getPlatform()) { - case -1: - return "Unknown"; - case 1: - return "Android"; - case 2: - return "iOS"; - case 3: - return "OSX"; - case 4: - return "Amazon"; - case 5: - return "GearVR"; - case 6: - return "Hololens"; - case 7: - return "Win10"; - case 8: - return "WIN32"; - case 9: - return "Dedicated"; - case 10: - return "TVOS"; - case 11: - return "PlayStation"; - case 12: - return "Nintendo"; - case 13: - return "Xbox"; - case 14: - return "WindowsPhone"; - case 15: - return "Linux"; - default: - return "Unknown"; - } +std::string Player::getDeviceTypeName() { + return std::string{magic_enum::enum_name(getPlatform())}; } bool Player::kick(const std::string& msg) { NetworkIdentifier* pNetworkIdentifier = getNetworkIdentifier(); - Global->disconnectClient(*pNetworkIdentifier, msg, 0); + Global->disconnectClient(*pNetworkIdentifier, Connection::DisconnectFailReason(0), msg, 0); return true; } @@ -330,7 +305,7 @@ bool Player::runcmd(const string& cmd) { } Container* Player::getEnderChestContainer() { - return dAccess(this, 3344); // IDA Player::Player() 782 + return dAccess(this, 3208); // IDA Player::Player() 782 } bool Player::transferServer(const string& address, unsigned short port) { @@ -799,7 +774,7 @@ bool Player::sendSetScorePacket(char type, const vector& data) bool Player::sendBossEventPacket(BossEvent type, string name, float percent, BossEventColour colour, int overlay) { BinaryStream wp; wp.reserve(8 + name.size()); - wp.writeVarInt64(getUniqueID() + 1145141919); + wp.writeVarInt64(getOrCreateUniqueID() + 1145141919); wp.writeUnsignedVarInt((int)type); switch (type) { case BossEvent::Show: @@ -809,7 +784,7 @@ bool Player::sendBossEventPacket(BossEvent type, string name, float percent, Bos case BossEvent::RegisterPlayer: case BossEvent::UnregisterPlayer: case BossEvent::ResendRaidBossEventData: { - wp.writeVarInt64(getUniqueID() + 1145141919); + wp.writeVarInt64(getOrCreateUniqueID() + 1145141919); break; } case BossEvent::HealthPercentage: { @@ -833,7 +808,8 @@ bool Player::sendBossEventPacket(BossEvent type, string name, float percent, Bos auto pkt = MinecraftPackets::createPacket(MinecraftPacketIds::BossEvent); pkt->read(wp); - sendAddEntityPacket(getUniqueID() + 1145141919, "player", Vec3(getPos().x, (float)-70, getPos().z), Vec2{0, 0}, 0); + sendAddEntityPacket(getOrCreateUniqueID() + 1145141919, "player", Vec3(getPos().x, (float)-70, getPos().z), + Vec2{0, 0}, 0); if (type != BossEvent::Hide) { sendBossEventPacket(BossEvent::Hide, "", 0, BossEventColour::White); } diff --git a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp index b97af394a6..d5f5ddafc5 100644 --- a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp +++ b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp @@ -79,7 +79,9 @@ Block const* mBirchWallSign; Block const* mBlackCandle; Block const* mBlackCandleCake; Block const* mBlackCarpet; +Block const* mBlackConcrete; Block const* mBlackGlazedTerracotta; +Block const* mBlackShulkerBox; Block const* mBlackWool; Block const* mBlackstone; Block const* mBlackstoneDoubleSlab; @@ -90,8 +92,10 @@ Block const* mBlastFurnace; Block const* mBlueCandle; Block const* mBlueCandleCake; Block const* mBlueCarpet; +Block const* mBlueConcrete; Block const* mBlueGlazedTerracotta; Block const* mBlueIce; +Block const* mBlueShulkerBox; Block const* mBlueWool; Block const* mBoneBlock; Block const* mBookshelf; @@ -103,9 +107,11 @@ Block const* mBrickStairs; Block const* mBrownCandle; Block const* mBrownCandleCake; Block const* mBrownCarpet; +Block const* mBrownConcrete; Block const* mBrownGlazedTerracotta; Block const* mBrownMushroom; Block const* mBrownMushroomBlock; +Block const* mBrownShulkerBox; Block const* mBrownWool; Block const* mBubbleColumn; Block const* mBubbleCoral; @@ -170,7 +176,6 @@ Block const* mColoredTorchBp; Block const* mColoredTorchRg; Block const* mCommandBlock; Block const* mComposter; -Block const* mConcrete; Block const* mConcretePowder; Block const* mConduit; Block const* mCopperBlock; @@ -211,7 +216,9 @@ Block const* mCutCopperStairs; Block const* mCyanCandle; Block const* mCyanCandleCake; Block const* mCyanCarpet; +Block const* mCyanConcrete; Block const* mCyanGlazedTerracotta; +Block const* mCyanShulkerBox; Block const* mCyanWool; Block const* mDarkOakButton; Block const* mDarkOakDoor; @@ -317,12 +324,16 @@ Block const* mGravel; Block const* mGrayCandle; Block const* mGrayCandleCake; Block const* mGrayCarpet; +Block const* mGrayConcrete; Block const* mGrayGlazedTerracotta; +Block const* mGrayShulkerBox; Block const* mGrayWool; Block const* mGreenCandle; Block const* mGreenCandleCake; Block const* mGreenCarpet; +Block const* mGreenConcrete; Block const* mGreenGlazedTerracotta; +Block const* mGreenShulkerBox; Block const* mGreenWool; Block const* mGrindstone; Block const* mHangingRoots; @@ -376,18 +387,24 @@ Block const* mLightBlock; Block const* mLightBlueCandle; Block const* mLightBlueCandleCake; Block const* mLightBlueCarpet; +Block const* mLightBlueConcrete; Block const* mLightBlueGlazedTerracotta; +Block const* mLightBlueShulkerBox; Block const* mLightBlueWool; Block const* mLightGrayCandle; Block const* mLightGrayCandleCake; Block const* mLightGrayCarpet; +Block const* mLightGrayConcrete; +Block const* mLightGrayShulkerBox; Block const* mLightGrayWool; Block const* mLightWeightedPressurePlate; Block const* mLightningRod; Block const* mLimeCandle; Block const* mLimeCandleCake; Block const* mLimeCarpet; +Block const* mLimeConcrete; Block const* mLimeGlazedTerracotta; +Block const* mLimeShulkerBox; Block const* mLimeWool; Block const* mLitBlastFurnace; Block const* mLitDeepslateRedstoneOre; @@ -401,7 +418,9 @@ Block const* mLoom; Block const* mMagentaCandle; Block const* mMagentaCandleCake; Block const* mMagentaCarpet; +Block const* mMagentaConcrete; Block const* mMagentaGlazedTerracotta; +Block const* mMagentaShulkerBox; Block const* mMagentaWool; Block const* mMagma; Block const* mMangroveButton; @@ -465,7 +484,9 @@ Block const* mOchreFroglight; Block const* mOrangeCandle; Block const* mOrangeCandleCake; Block const* mOrangeCarpet; +Block const* mOrangeConcrete; Block const* mOrangeGlazedTerracotta; +Block const* mOrangeShulkerBox; Block const* mOrangeWool; Block const* mOxidizedCopper; Block const* mOxidizedCutCopper; @@ -478,8 +499,10 @@ Block const* mPearlescentFroglight; Block const* mPinkCandle; Block const* mPinkCandleCake; Block const* mPinkCarpet; +Block const* mPinkConcrete; Block const* mPinkGlazedTerracotta; Block const* mPinkPetals; +Block const* mPinkShulkerBox; Block const* mPinkWool; Block const* mPiston; Block const* mPistonArmCollision; @@ -522,7 +545,9 @@ Block const* mPumpkinStem; Block const* mPurpleCandle; Block const* mPurpleCandleCake; Block const* mPurpleCarpet; +Block const* mPurpleConcrete; Block const* mPurpleGlazedTerracotta; +Block const* mPurpleShulkerBox; Block const* mPurpleWool; Block const* mPurpurBlock; Block const* mPurpurStairs; @@ -537,6 +562,7 @@ Block const* mRawIronBlock; Block const* mRedCandle; Block const* mRedCandleCake; Block const* mRedCarpet; +Block const* mRedConcrete; Block const* mRedFlower; Block const* mRedGlazedTerracotta; Block const* mRedMushroom; @@ -545,6 +571,7 @@ Block const* mRedNetherBrick; Block const* mRedNetherBrickStairs; Block const* mRedSandstone; Block const* mRedSandstoneStairs; +Block const* mRedShulkerBox; Block const* mRedWool; Block const* mRedstoneBlock; Block const* mRedstoneLamp; @@ -570,7 +597,6 @@ Block const* mSeaLantern; Block const* mSeaPickle; Block const* mSeagrass; Block const* mShroomlight; -Block const* mShulkerBox; Block const* mSilverGlazedTerracotta; Block const* mSkull; Block const* mSlimeBlock; @@ -720,7 +746,9 @@ Block const* mWheat; Block const* mWhiteCandle; Block const* mWhiteCandleCake; Block const* mWhiteCarpet; +Block const* mWhiteConcrete; Block const* mWhiteGlazedTerracotta; +Block const* mWhiteShulkerBox; Block const* mWhiteWool; Block const* mWitherRose; Block const* mWood; @@ -731,8 +759,10 @@ Block const* mWoodenSlab; Block const* mYellowCandle; Block const* mYellowCandleCake; Block const* mYellowCarpet; +Block const* mYellowConcrete; Block const* mYellowFlower; Block const* mYellowGlazedTerracotta; +Block const* mYellowShulkerBox; Block const* mYellowWool; #define INIT_BLOCK(x) m##x = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::x, true) @@ -807,7 +837,9 @@ void assignBlocks() { INIT_BLOCK(BlackCandle); INIT_BLOCK(BlackCandleCake); INIT_BLOCK(BlackCarpet); + INIT_BLOCK(BlackConcrete); INIT_BLOCK(BlackGlazedTerracotta); + INIT_BLOCK(BlackShulkerBox); INIT_BLOCK(BlackWool); INIT_BLOCK(Blackstone); INIT_BLOCK(BlackstoneDoubleSlab); @@ -818,8 +850,10 @@ void assignBlocks() { INIT_BLOCK(BlueCandle); INIT_BLOCK(BlueCandleCake); INIT_BLOCK(BlueCarpet); + INIT_BLOCK(BlueConcrete); INIT_BLOCK(BlueGlazedTerracotta); INIT_BLOCK(BlueIce); + INIT_BLOCK(BlueShulkerBox); INIT_BLOCK(BlueWool); INIT_BLOCK(BoneBlock); INIT_BLOCK(Bookshelf); @@ -831,9 +865,11 @@ void assignBlocks() { INIT_BLOCK(BrownCandle); INIT_BLOCK(BrownCandleCake); INIT_BLOCK(BrownCarpet); + INIT_BLOCK(BrownConcrete); INIT_BLOCK(BrownGlazedTerracotta); INIT_BLOCK(BrownMushroom); INIT_BLOCK(BrownMushroomBlock); + INIT_BLOCK(BrownShulkerBox); INIT_BLOCK(BrownWool); INIT_BLOCK(BubbleColumn); INIT_BLOCK(BubbleCoral); @@ -898,7 +934,6 @@ void assignBlocks() { INIT_BLOCK(ColoredTorchRg); INIT_BLOCK(CommandBlock); INIT_BLOCK(Composter); - INIT_BLOCK(Concrete); INIT_BLOCK(ConcretePowder); INIT_BLOCK(Conduit); INIT_BLOCK(CopperBlock); @@ -939,7 +974,9 @@ void assignBlocks() { INIT_BLOCK(CyanCandle); INIT_BLOCK(CyanCandleCake); INIT_BLOCK(CyanCarpet); + INIT_BLOCK(CyanConcrete); INIT_BLOCK(CyanGlazedTerracotta); + INIT_BLOCK(CyanShulkerBox); INIT_BLOCK(CyanWool); INIT_BLOCK(DarkOakButton); INIT_BLOCK(DarkOakDoor); @@ -1045,12 +1082,16 @@ void assignBlocks() { INIT_BLOCK(GrayCandle); INIT_BLOCK(GrayCandleCake); INIT_BLOCK(GrayCarpet); + INIT_BLOCK(GrayConcrete); INIT_BLOCK(GrayGlazedTerracotta); + INIT_BLOCK(GrayShulkerBox); INIT_BLOCK(GrayWool); INIT_BLOCK(GreenCandle); INIT_BLOCK(GreenCandleCake); INIT_BLOCK(GreenCarpet); + INIT_BLOCK(GreenConcrete); INIT_BLOCK(GreenGlazedTerracotta); + INIT_BLOCK(GreenShulkerBox); INIT_BLOCK(GreenWool); INIT_BLOCK(Grindstone); INIT_BLOCK(HangingRoots); @@ -1104,18 +1145,24 @@ void assignBlocks() { INIT_BLOCK(LightBlueCandle); INIT_BLOCK(LightBlueCandleCake); INIT_BLOCK(LightBlueCarpet); + INIT_BLOCK(LightBlueConcrete); INIT_BLOCK(LightBlueGlazedTerracotta); + INIT_BLOCK(LightBlueShulkerBox); INIT_BLOCK(LightBlueWool); INIT_BLOCK(LightGrayCandle); INIT_BLOCK(LightGrayCandleCake); INIT_BLOCK(LightGrayCarpet); + INIT_BLOCK(LightGrayConcrete); + INIT_BLOCK(LightGrayShulkerBox); INIT_BLOCK(LightGrayWool); INIT_BLOCK(LightWeightedPressurePlate); INIT_BLOCK(LightningRod); INIT_BLOCK(LimeCandle); INIT_BLOCK(LimeCandleCake); INIT_BLOCK(LimeCarpet); + INIT_BLOCK(LimeConcrete); INIT_BLOCK(LimeGlazedTerracotta); + INIT_BLOCK(LimeShulkerBox); INIT_BLOCK(LimeWool); INIT_BLOCK(LitBlastFurnace); INIT_BLOCK(LitDeepslateRedstoneOre); @@ -1129,7 +1176,9 @@ void assignBlocks() { INIT_BLOCK(MagentaCandle); INIT_BLOCK(MagentaCandleCake); INIT_BLOCK(MagentaCarpet); + INIT_BLOCK(MagentaConcrete); INIT_BLOCK(MagentaGlazedTerracotta); + INIT_BLOCK(MagentaShulkerBox); INIT_BLOCK(MagentaWool); INIT_BLOCK(Magma); INIT_BLOCK(MangroveButton); @@ -1193,7 +1242,9 @@ void assignBlocks() { INIT_BLOCK(OrangeCandle); INIT_BLOCK(OrangeCandleCake); INIT_BLOCK(OrangeCarpet); + INIT_BLOCK(OrangeConcrete); INIT_BLOCK(OrangeGlazedTerracotta); + INIT_BLOCK(OrangeShulkerBox); INIT_BLOCK(OrangeWool); INIT_BLOCK(OxidizedCopper); INIT_BLOCK(OxidizedCutCopper); @@ -1206,8 +1257,10 @@ void assignBlocks() { INIT_BLOCK(PinkCandle); INIT_BLOCK(PinkCandleCake); INIT_BLOCK(PinkCarpet); + INIT_BLOCK(PinkConcrete); INIT_BLOCK(PinkGlazedTerracotta); INIT_BLOCK(PinkPetals); + INIT_BLOCK(PinkShulkerBox); INIT_BLOCK(PinkWool); INIT_BLOCK(Piston); INIT_BLOCK(PistonArmCollision); @@ -1250,7 +1303,9 @@ void assignBlocks() { INIT_BLOCK(PurpleCandle); INIT_BLOCK(PurpleCandleCake); INIT_BLOCK(PurpleCarpet); + INIT_BLOCK(PurpleConcrete); INIT_BLOCK(PurpleGlazedTerracotta); + INIT_BLOCK(PurpleShulkerBox); INIT_BLOCK(PurpleWool); INIT_BLOCK(PurpurBlock); INIT_BLOCK(PurpurStairs); @@ -1265,6 +1320,7 @@ void assignBlocks() { INIT_BLOCK(RedCandle); INIT_BLOCK(RedCandleCake); INIT_BLOCK(RedCarpet); + INIT_BLOCK(RedConcrete); INIT_BLOCK(RedFlower); INIT_BLOCK(RedGlazedTerracotta); INIT_BLOCK(RedMushroom); @@ -1273,6 +1329,7 @@ void assignBlocks() { INIT_BLOCK(RedNetherBrickStairs); INIT_BLOCK(RedSandstone); INIT_BLOCK(RedSandstoneStairs); + INIT_BLOCK(RedShulkerBox); INIT_BLOCK(RedWool); INIT_BLOCK(RedstoneBlock); INIT_BLOCK(RedstoneLamp); @@ -1298,7 +1355,6 @@ void assignBlocks() { INIT_BLOCK(SeaPickle); INIT_BLOCK(Seagrass); INIT_BLOCK(Shroomlight); - INIT_BLOCK(ShulkerBox); INIT_BLOCK(SilverGlazedTerracotta); INIT_BLOCK(Skull); INIT_BLOCK(SlimeBlock); @@ -1448,7 +1504,9 @@ void assignBlocks() { INIT_BLOCK(WhiteCandle); INIT_BLOCK(WhiteCandleCake); INIT_BLOCK(WhiteCarpet); + INIT_BLOCK(WhiteConcrete); INIT_BLOCK(WhiteGlazedTerracotta); + INIT_BLOCK(WhiteShulkerBox); INIT_BLOCK(WhiteWool); INIT_BLOCK(WitherRose); INIT_BLOCK(Wood); @@ -1459,8 +1517,10 @@ void assignBlocks() { INIT_BLOCK(YellowCandle); INIT_BLOCK(YellowCandleCake); INIT_BLOCK(YellowCarpet); + INIT_BLOCK(YellowConcrete); INIT_BLOCK(YellowFlower); INIT_BLOCK(YellowGlazedTerracotta); + INIT_BLOCK(YellowShulkerBox); INIT_BLOCK(YellowWool); } }; // namespace StaticVanillaBlocks diff --git a/LiteLoader/src/llapi/network/PacketAPI.cpp b/LiteLoader/src/llapi/network/PacketAPI.cpp index 6e15da9362..4176e3c408 100644 --- a/LiteLoader/src/llapi/network/PacketAPI.cpp +++ b/LiteLoader/src/llapi/network/PacketAPI.cpp @@ -74,7 +74,7 @@ using ll::logger; #include "llapi/mc/SetPlayerGameTypePacket.hpp" #include "llapi/mc/PlayerListPacket.hpp" #include "llapi/mc/SimpleEventPacket.hpp" -#include "llapi/mc/EventPacket.hpp" +#include "llapi/mc/LegacyTelemetryEventPacket.hpp" #include "llapi/mc/SpawnExperienceOrbPacket.hpp" #include "llapi/mc/ClientboundMapItemDataPacket.hpp" #include "llapi/mc/MapInfoRequestPacket.hpp" @@ -125,7 +125,6 @@ using ll::logger; #include "llapi/mc/SetLocalPlayerAsInitializedPacket.hpp" #include "llapi/mc/UpdateSoftEnumPacket.hpp" #include "llapi/mc/NetworkStackLatencyPacket.hpp" -#include "llapi/mc/ScriptCustomEventPacket.hpp" #include "llapi/mc/SpawnParticleEffectPacket.hpp" #include "llapi/mc/AvailableActorIdentifiersPacket.hpp" #include "llapi/mc/LevelSoundEventPacketV2.hpp" @@ -202,13 +201,13 @@ using ll::logger; #include "llapi/mc/GameTestRequestPacket.hpp" #include "llapi/mc/GameTestResultsPacket.hpp" #include "llapi/mc/UpdateClientInputLocksPacket.hpp" -#include "llapi/mc/ClientCheatAbilityPacket.hpp" #include "llapi/mc/CameraPresetsPacket.hpp" #include "llapi/mc/UnlockedRecipesPacket.hpp" #include "llapi/mc/CameraInstructionPacket.hpp" #include "llapi/mc/CompressedBiomeDefinitionListPacket.hpp" #include "llapi/mc/TrimDataPacket.hpp" #include "llapi/mc/OpenSignPacket.hpp" +#include "llapi/mc/AgentAnimationPacket.hpp" #endif INCLUDE_ALL_PACKET @@ -291,7 +290,6 @@ using ll::logger; Func(ResourcePackChunkDataPacket); \ Func(ResourcePackChunkRequestPacket); \ Func(ResourcePackDataInfoPacket); \ - Func(ScriptCustomEventPacket); \ Func(CreatePhotoPacket); \ Func(EduUriResourcePacket); \ Func(NpcDialoguePacket); \ @@ -318,6 +316,7 @@ using ll::logger; Func(SimpleEventPacket); \ Func(AddBehaviorTreePacket); \ Func(AvailableActorIdentifiersPacket); \ + Func(LegacyTelemetryEventPacket); \ Func(AvailableCommandsPacket); \ Func(BiomeDefinitionListPacket); \ Func(CraftingDataPacket); \ @@ -360,7 +359,6 @@ using ll::logger; Func(ItemStackRequestPacket); \ Func(ItemStackResponsePacket); \ Func(BlockActorDataPacket); \ - Func(EventPacket); \ Func(SetHealthPacket); \ Func(MobEquipmentPacket); \ Func(MotionPredictionHintsPacket); \ @@ -406,13 +404,13 @@ using ll::logger; Func(GameTestRequestPacket); \ Func(GameTestResultsPacket); \ Func(UpdateClientInputLocksPacket); \ - Func(ClientCheatAbilityPacket) \ Func(CameraPresetsPacket) \ Func(UnlockedRecipesPacket) \ Func(CameraInstructionPacket) \ Func(CompressedBiomeDefinitionListPacket) \ Func(TrimDataPacket) \ - Func(OpenSignPacket) + Func(OpenSignPacket) \ + Func(AgentAnimationPacket) #define DeclearClass(packet) class packet; @@ -679,7 +677,7 @@ static_assert(sizeof(MobArmorEquipmentPacket) == 0x1B8, "size of MobArmorEquipme static_assert(sizeof(InteractPacket) == 0x50, "size of InteractPacket should be 80"); static_assert(sizeof(BlockPickRequestPacket) == 0x40, "size of BlockPickRequestPacket should be 64"); static_assert(sizeof(ActorPickRequestPacket) == 0x40, "size of ActorPickRequestPacket should be 64"); -static_assert(sizeof(PlayerActionPacket) == 0x58, "size of PlayerActionPacket should be 88"); +static_assert(sizeof(PlayerActionPacket) == 0x60, "size of PlayerActionPacket should be 96"); static_assert(sizeof(HurtArmorPacket) == 0x40, "size of HurtArmorPacket should be 64"); static_assert(sizeof(SetActorDataPacket) == 0x88, "size of SetActorDataPacket should be 136"); static_assert(sizeof(SetActorMotionPacket) == 0x48, "size of SetActorMotionPacket should be 72"); @@ -706,7 +704,7 @@ static_assert(sizeof(ChangeDimensionPacket) == 0x48, "size of ChangeDimensionPac static_assert(sizeof(SetPlayerGameTypePacket) == 0x38, "size of SetPlayerGameTypePacket should be 56"); static_assert(sizeof(PlayerListPacket) == 0x50, "size of PlayerListPacket should be 80"); static_assert(sizeof(SimpleEventPacket) == 0x38, "size of SimpleEventPacket should be 56"); -static_assert(sizeof(EventPacket) == 0x140, "size of EventPacket should be 320"); +static_assert(sizeof(Unknown(65)) == 0x140, "size of Unknown(65) should be 320"); static_assert(sizeof(SpawnExperienceOrbPacket) == 0x40, "size of SpawnExperienceOrbPacket should be 64"); static_assert(sizeof(ClientboundMapItemDataPacket) == 0xC8, "size of ClientboundMapItemDataPacket should be 200"); static_assert(sizeof(MapInfoRequestPacket) == 0x50, "size of MapInfoRequestPacket should be 80"); @@ -717,7 +715,7 @@ static_assert(sizeof(GameRulesChangedPacket) == 0x48, "size of GameRulesChangedP static_assert(sizeof(CameraPacket) == 0x40, "size of CameraPacket should be 64"); static_assert(sizeof(BossEventPacket) == 0x80, "size of BossEventPacket should be 128"); static_assert(sizeof(ShowCreditsPacket) == 0x40, "size of ShowCreditsPacket should be 64"); -static_assert(sizeof(AvailableCommandsPacket) == 0xC0, "size of AvailableCommandsPacket should be 192"); +static_assert(sizeof(AvailableCommandsPacket) == 0xF0, "size of AvailableCommandsPacket should be 240"); static_assert(sizeof(CommandRequestPacket) == 0x98, "size of CommandRequestPacket should be 152"); static_assert(sizeof(CommandBlockUpdatePacket) == 0xB0, "size of CommandBlockUpdatePacket should be 176"); static_assert(sizeof(CommandOutputPacket) == 0xA0, "size of CommandOutputPacket should be 160"); @@ -757,7 +755,6 @@ static_assert(sizeof(SetScoreboardIdentityPacket) == 0x50, "size of SetScoreboar static_assert(sizeof(SetLocalPlayerAsInitializedPacket) == 0x38, "size of SetLocalPlayerAsInitializedPacket should be 56"); static_assert(sizeof(UpdateSoftEnumPacket) == 0x70, "size of UpdateSoftEnumPacket should be 112"); static_assert(sizeof(NetworkStackLatencyPacket) == 0x40, "size of NetworkStackLatencyPacket should be 64"); -static_assert(sizeof(ScriptCustomEventPacket) == 0x60, "size of ScriptCustomEventPacket should be 96"); static_assert(sizeof(SpawnParticleEffectPacket) == 0xB0, "size of SpawnParticleEffectPacket should be 176"); static_assert(sizeof(AvailableActorIdentifiersPacket) == 0x48, "size of AvailableActorIdentifiersPacket should be 72"); static_assert(sizeof(LevelSoundEventPacketV2) == 0x70, "size of LevelSoundEventPacketV2 should be 112"); @@ -834,13 +831,13 @@ static_assert(sizeof(RequestNetworkSettingsPacket) == 0x38, "size of RequestNetw static_assert(sizeof(GameTestRequestPacket) == 0x90, "size of GameTestRequestPacket should be 144"); static_assert(sizeof(GameTestResultsPacket) == 0x78, "size of GameTestResultsPacket should be 120"); static_assert(sizeof(UpdateClientInputLocksPacket) == 0x40, "size of UpdateClientInputLocksPacket should be 64"); -static_assert(sizeof(ClientCheatAbilityPacket) == 0x58, "size of ClientCheatAbilityPacket should be 88"); static_assert(sizeof(CameraPresetsPacket) == 0x48, "size of CameraPresetsPacket should be 72"); static_assert(sizeof(UnlockedRecipesPacket) == 0x50, "size of UnlockedRecipesPacket should be 80"); static_assert(sizeof(CameraInstructionPacket) == 0x48, "size of CameraInstructionPacket should be 72"); static_assert(sizeof(CompressedBiomeDefinitionListPacket) == 0x48, "size of CompressedBiomeDefinitionListPacket should be 72"); static_assert(sizeof(TrimDataPacket) == 0x60, "size of TrimDataPacket should be 96"); static_assert(sizeof(OpenSignPacket) == 0x40, "size of OpenSignPacket should be 64"); +static_assert(sizeof(AgentAnimationPacket) == 0x40, "size of AgentAnimationPacket should be 64"); #endif // SIZE_STATIC_ASSERT @@ -880,7 +877,7 @@ static_assert(sizeof(MobArmorEquipmentPacket) == 0x1B8 || sizeof(MobArmorEquipme static_assert(sizeof(InteractPacket) == 0x50 || sizeof(InteractPacket) == 48, "size of InteractPacket should be 80 or 48(default)"); static_assert(sizeof(BlockPickRequestPacket) == 0x40 || sizeof(BlockPickRequestPacket) == 48, "size of BlockPickRequestPacket should be 64 or 48(default)"); static_assert(sizeof(ActorPickRequestPacket) == 0x40 || sizeof(ActorPickRequestPacket) == 48, "size of ActorPickRequestPacket should be 64 or 48(default)"); -static_assert(sizeof(PlayerActionPacket) == 0x58 || sizeof(PlayerActionPacket) == 48, "size of PlayerActionPacket should be 88 or 48(default)"); +static_assert(sizeof(PlayerActionPacket) == 0x60 || sizeof(PlayerActionPacket) == 48, "size of PlayerActionPacket should be 96 or 48(default)"); static_assert(sizeof(HurtArmorPacket) == 0x40 || sizeof(HurtArmorPacket) == 48, "size of HurtArmorPacket should be 64 or 48(default)"); static_assert(sizeof(SetActorDataPacket) == 0x88 || sizeof(SetActorDataPacket) == 48, "size of SetActorDataPacket should be 136 or 48(default)"); static_assert(sizeof(SetActorMotionPacket) == 0x48 || sizeof(SetActorMotionPacket) == 48, "size of SetActorMotionPacket should be 72 or 48(default)"); @@ -907,7 +904,7 @@ static_assert(sizeof(ChangeDimensionPacket) == 0x48 || sizeof(ChangeDimensionPac static_assert(sizeof(SetPlayerGameTypePacket) == 0x38 || sizeof(SetPlayerGameTypePacket) == 48, "size of SetPlayerGameTypePacket should be 56 or 48(default)"); static_assert(sizeof(PlayerListPacket) == 0x50 || sizeof(PlayerListPacket) == 48, "size of PlayerListPacket should be 80 or 48(default)"); static_assert(sizeof(SimpleEventPacket) == 0x38 || sizeof(SimpleEventPacket) == 48, "size of SimpleEventPacket should be 56 or 48(default)"); -static_assert(sizeof(EventPacket) == 0x140 || sizeof(EventPacket) == 48, "size of EventPacket should be 320 or 48(default)"); +static_assert(sizeof(LegacyTelemetryEventPacket) == 0x140 || sizeof(LegacyTelemetryEventPacket) == 48,"size of LegacyTelemetryEventPacket should be 320 or 48(default)"); static_assert(sizeof(SpawnExperienceOrbPacket) == 0x40 || sizeof(SpawnExperienceOrbPacket) == 48, "size of SpawnExperienceOrbPacket should be 64 or 48(default)"); static_assert(sizeof(ClientboundMapItemDataPacket) == 0xC8 || sizeof(ClientboundMapItemDataPacket) == 48, "size of ClientboundMapItemDataPacket should be 200 or 48(default)"); static_assert(sizeof(MapInfoRequestPacket) == 0x50 || sizeof(MapInfoRequestPacket) == 48, "size of MapInfoRequestPacket should be 80 or 48(default)"); @@ -918,7 +915,7 @@ static_assert(sizeof(GameRulesChangedPacket) == 0x48 || sizeof(GameRulesChangedP static_assert(sizeof(CameraPacket) == 0x40 || sizeof(CameraPacket) == 48, "size of CameraPacket should be 64 or 48(default)"); static_assert(sizeof(BossEventPacket) == 0x80 || sizeof(BossEventPacket) == 48, "size of BossEventPacket should be 128 or 48(default)"); static_assert(sizeof(ShowCreditsPacket) == 0x40 || sizeof(ShowCreditsPacket) == 48, "size of ShowCreditsPacket should be 64 or 48(default)"); -static_assert(sizeof(AvailableCommandsPacket) == 0xC0 || sizeof(AvailableCommandsPacket) == 48, "size of AvailableCommandsPacket should be 192 or 48(default)"); +static_assert(sizeof(AvailableCommandsPacket) == 0xF0 || sizeof(AvailableCommandsPacket) == 48, "size of AvailableCommandsPacket should be 240 or 48(default)"); static_assert(sizeof(CommandRequestPacket) == 0x98 || sizeof(CommandRequestPacket) == 48, "size of CommandRequestPacket should be 152 or 48(default)"); static_assert(sizeof(CommandBlockUpdatePacket) == 0xB0 || sizeof(CommandBlockUpdatePacket) == 48, "size of CommandBlockUpdatePacket should be 176 or 48(default)"); static_assert(sizeof(CommandOutputPacket) == 0xA0 || sizeof(CommandOutputPacket) == 48, "size of CommandOutputPacket should be 160 or 48(default)"); @@ -958,7 +955,6 @@ static_assert(sizeof(SetScoreboardIdentityPacket) == 0x50 || sizeof(SetScoreboar static_assert(sizeof(SetLocalPlayerAsInitializedPacket) == 0x38 || sizeof(SetLocalPlayerAsInitializedPacket) == 48, "size of SetLocalPlayerAsInitializedPacket should be 56 or 48(default)"); static_assert(sizeof(UpdateSoftEnumPacket) == 0x70 || sizeof(UpdateSoftEnumPacket) == 48, "size of UpdateSoftEnumPacket should be 112 or 48(default)"); static_assert(sizeof(NetworkStackLatencyPacket) == 0x40 || sizeof(NetworkStackLatencyPacket) == 48, "size of NetworkStackLatencyPacket should be 64 or 48(default)"); -static_assert(sizeof(ScriptCustomEventPacket) == 0x60 || sizeof(ScriptCustomEventPacket) == 48, "size of ScriptCustomEventPacket should be 96 or 48(default)"); static_assert(sizeof(SpawnParticleEffectPacket) == 0xB0 || sizeof(SpawnParticleEffectPacket) == 48, "size of SpawnParticleEffectPacket should be 176 or 48(default)"); static_assert(sizeof(AvailableActorIdentifiersPacket) == 0x48 || sizeof(AvailableActorIdentifiersPacket) == 48, "size of AvailableActorIdentifiersPacket should be 72 or 48(default)"); static_assert(sizeof(LevelSoundEventPacketV2) == 0x70 || sizeof(LevelSoundEventPacketV2) == 48, "size of LevelSoundEventPacketV2 should be 112 or 48(default)"); @@ -1035,12 +1031,12 @@ static_assert(sizeof(RequestNetworkSettingsPacket) == 0x38 || sizeof(RequestNetw static_assert(sizeof(GameTestRequestPacket) == 0x90 || sizeof(GameTestRequestPacket) == 48, "size of GameTestRequestPacket should be 144 or 48(default)"); static_assert(sizeof(GameTestResultsPacket) == 0x78 || sizeof(GameTestResultsPacket) == 48, "size of GameTestResultsPacket should be 120 or 48(default)"); static_assert(sizeof(UpdateClientInputLocksPacket) == 0x40 || sizeof(UpdateClientInputLocksPacket) == 48, "size of UpdateClientInputLocksPacket should be 64 or 48(default)"); -static_assert(sizeof(ClientCheatAbilityPacket) == 0x58 || sizeof(ClientCheatAbilityPacket) == 48, "size of ClientCheatAbilityPacket should be 88 or 48(default)"); static_assert(sizeof(CameraPresetsPacket) == 0x48 || sizeof(CameraPresetsPacket) == 48, "size of CameraPresetsPacket should be 72 or 48(default)"); static_assert(sizeof(UnlockedRecipesPacket) == 0x50 || sizeof(UnlockedRecipesPacket) == 48, "size of UnlockedRecipesPacket should be 80 or 48(default)"); static_assert(sizeof(CameraInstructionPacket) == 0x48 || sizeof(CameraInstructionPacket) == 48, "size of CameraInstructionPacket should be 72 or 48(default)"); static_assert(sizeof(CompressedBiomeDefinitionListPacket) == 0x48 || sizeof(CompressedBiomeDefinitionListPacket) == 48, "size of CompressedBiomeDefinitionListPacket should be 72 or 48(default)"); static_assert(sizeof(TrimDataPacket) == 0x60 || sizeof(TrimDataPacket) == 48, "size of TrimDataPacket should be 96 or 48(default)"); static_assert(sizeof(OpenSignPacket) == 0x40 || sizeof(OpenSignPacket) == 48, "size of OpenSignPacket should be 64 or 48(default)"); +static_assert(sizeof(AgentAnimationPacket) == 0x40 || sizeof(AgentAnimationPacket) == 48, "size of AgentAnimationPacket should be 64 or 48(default)"); #endif // SIZE_STATIC_ASSERT_IF_DEFINE diff --git a/LiteLoader/src/llapi/network/ReadOnlyBinaryStreamAPI.cpp b/LiteLoader/src/llapi/network/ReadOnlyBinaryStreamAPI.cpp index 477a95cded..91494bde7f 100644 --- a/LiteLoader/src/llapi/network/ReadOnlyBinaryStreamAPI.cpp +++ b/LiteLoader/src/llapi/network/ReadOnlyBinaryStreamAPI.cpp @@ -27,8 +27,9 @@ void ReadOnlyBinaryStream::setReadPointer(std::size_t size) { std::unique_ptr ReadOnlyBinaryStream::getCompoundTag() { auto tag = CompoundTag::create(); - class CompoundTag& (*rv)(class CompoundTag&, class ReadOnlyBinaryStream&); - *((void**)&rv) = dlsym("?read@?$serialize@VCompoundTag@@@@SA?AVCompoundTag@@AEAVReadOnlyBinaryStream@@@Z"); + class Bedrock::Result& (*rv)(class CompoundTag&, + class ReadOnlyBinaryStream&); + *((void**)&rv) = dlsym("?read@?$serialize@VCompoundTag@@@@SA?AV?$Result@VCompoundTag@@Verror_code@std@@@Bedrock@@AEAVReadOnlyBinaryStream@@@Z"); (*rv)(*tag, *this); return std::move(tag); } diff --git a/LiteLoader/src/llapi/scoreboard/ScoreboardAPI.cpp b/LiteLoader/src/llapi/scoreboard/ScoreboardAPI.cpp index 5a5fd18236..99a8dc65dd 100644 --- a/LiteLoader/src/llapi/scoreboard/ScoreboardAPI.cpp +++ b/LiteLoader/src/llapi/scoreboard/ScoreboardAPI.cpp @@ -96,7 +96,7 @@ LIAPI std::optional Scoreboard::queryPlayerScore(xuid_t const& xuid, std::s auto uuid = PlayerInfo::getUUIDByXuid(xuid); if (uuid.empty()) return std::nullopt; - const auto& sId = Global->getScoreboardId(uuid); + const auto& sId = Global->getScoreboardId(mce::UUID::fromString(uuid)); if (!obj || !sId.isValid() || !obj->hasScore(sId)) return std::nullopt; return obj->getPlayerScore(sId).getCount(); @@ -111,7 +111,7 @@ LIAPI bool Scoreboard::forceRemovePlayerScoreFromObjective(xuid_t const& xuid, s auto uuid = PlayerInfo::getUUIDByXuid(xuid); if (uuid.empty()) return false; - return removeFromObjective(objname, Global->getScoreboardId(uuid)); + return removeFromObjective(objname, Global->getScoreboardId(mce::UUID::fromString(uuid))); } LIAPI Objective* Scoreboard::newObjective(const std::string& objname, const std::string& displayName) { diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md deleted file mode 100644 index 7ef35e50dc..0000000000 --- a/RELEASE_NOTES.md +++ /dev/null @@ -1,14 +0,0 @@ -# Release 2.14.1 - -![BDS 1.20.0.01](https://img.shields.io/badge/BDS-1.20.0.01-blue?style=for-the-badge) ![Protocol 589](https://img.shields.io/badge/Protocol-589-orange?style=for-the-badge) - - - -## Changed - -- Remove NpcCmd event - -## Fixed - -- Fix the original PlayerDestroy event doesn't cover the full blocks #1303 (by @dofes) -- Fix isSimulatedPlayer in LLSE #1285 (by @OEOTYAN) \ No newline at end of file diff --git a/ScriptEngine/src/api/CommandAPI.cpp b/ScriptEngine/src/api/CommandAPI.cpp index 22ef749492..1bf8dea77b 100644 --- a/ScriptEngine/src/api/CommandAPI.cpp +++ b/ScriptEngine/src/api/CommandAPI.cpp @@ -12,6 +12,7 @@ #include "engine/EngineOwnData.h" #include #include +#include #include #include #include diff --git a/ScriptEngine/src/api/DeviceAPI.cpp b/ScriptEngine/src/api/DeviceAPI.cpp index 83e18b1c78..a4082ddb6e 100644 --- a/ScriptEngine/src/api/DeviceAPI.cpp +++ b/ScriptEngine/src/api/DeviceAPI.cpp @@ -36,7 +36,7 @@ Local DeviceClass::newDevice(Player* p) { //成员函数 void DeviceClass::setPlayer(Player* player) { __try { - id = player->getUniqueID(); + id = player->getOrCreateUniqueID(); } __except (EXCEPTION_EXECUTE_HANDLER) { isValid = false; } diff --git a/ScriptEngine/src/api/EntityAPI.cpp b/ScriptEngine/src/api/EntityAPI.cpp index cba0d200c6..4ee6ccb9dc 100644 --- a/ScriptEngine/src/api/EntityAPI.cpp +++ b/ScriptEngine/src/api/EntityAPI.cpp @@ -197,7 +197,7 @@ std::optional EntityClass::tryExtractActor(Local v) { // 成员函数 void EntityClass::set(Actor* actor) { __try { - id = actor->getUniqueID(); + id = actor->getOrCreateUniqueID(); } __except (EXCEPTION_EXECUTE_HANDLER) { isValid = false; } } @@ -225,7 +225,7 @@ Local EntityClass::getUniqueID() { if (!entity) return Local(); else - return String::newString(std::to_string(entity->getUniqueID().id)); + return String::newString(std::to_string(entity->getOrCreateUniqueID().id)); } CATCH("Fail in getUniqueID!") } diff --git a/ScriptEngine/src/api/PacketAPI.cpp b/ScriptEngine/src/api/PacketAPI.cpp index 3d39e2f707..174c88bf6f 100644 --- a/ScriptEngine/src/api/PacketAPI.cpp +++ b/ScriptEngine/src/api/PacketAPI.cpp @@ -8,7 +8,6 @@ #include "api/NbtAPI.h" #include "api/NativeAPI.h" #include -#include #include "api/PacketAPI.h" #include diff --git a/ScriptEngine/src/api/PlayerAPI.cpp b/ScriptEngine/src/api/PlayerAPI.cpp index 2e2f49cfc8..9daaba5c44 100644 --- a/ScriptEngine/src/api/PlayerAPI.cpp +++ b/ScriptEngine/src/api/PlayerAPI.cpp @@ -423,7 +423,7 @@ Local McClass::getPlayer(const Arguments& args) { Player* found = nullptr; for (Player* p : playerList) { - if (p->getXuid() == target || std::to_string(p->getUniqueID().id) == target) + if (p->getXuid() == target || std::to_string(p->getOrCreateUniqueID().id) == target) return PlayerClass::newPlayer(p); string pName = p->getName(); @@ -477,7 +477,7 @@ Local McClass::broadcast(const Arguments& args) { // 成员函数 void PlayerClass::set(Player* player) { __try { - id = player->getUniqueID(); + id = player->getOrCreateUniqueID(); } __except (EXCEPTION_EXECUTE_HANDLER) { isValid = false; } } @@ -895,7 +895,7 @@ Local PlayerClass::getUniqueID() { if (!player) return Local(); else - return String::newString(std::to_string(player->getUniqueID().id)); + return String::newString(std::to_string(player->getOrCreateUniqueID().id)); } CATCH("Fail in getUniqueID!") } @@ -1278,7 +1278,7 @@ Local PlayerClass::setPermLevel(const Arguments& args) { } else { player->getAbilities().setPlayerPermissions(PlayerPermissionLevel::Member); } - UpdateAbilitiesPacket uPkt(player->getUniqueID(), player->getAbilities()); + UpdateAbilitiesPacket uPkt(player->getOrCreateUniqueID(), player->getAbilities()); player->sendNetworkPacket(uPkt); res = true; } @@ -2016,7 +2016,7 @@ Local PlayerClass::sendSimpleForm(const Arguments& args) { } player->sendSimpleFormPacket(args[0].toStr(), args[1].toStr(), texts, images, - [id{player->getUniqueID()}, engine{EngineScope::currentEngine()}, + [id{player->getOrCreateUniqueID()}, engine{EngineScope::currentEngine()}, callback{script::Global(args[4].asFunction())}](int chosen) { if (ll::isServerStopping()) return; @@ -2055,7 +2055,7 @@ Local PlayerClass::sendModalForm(const Arguments& args) { return Local(); player->sendModalFormPacket(args[0].toStr(), args[1].toStr(), args[2].toStr(), args[3].toStr(), - [id{player->getUniqueID()}, engine{EngineScope::currentEngine()}, + [id{player->getOrCreateUniqueID()}, engine{EngineScope::currentEngine()}, callback{script::Global(args[4].asFunction())}](bool chosen) { if (ll::isServerStopping()) return; @@ -2092,7 +2092,7 @@ Local PlayerClass::sendCustomForm(const Arguments& args) { string data = fifo_json::parse(args[0].toStr()).dump(); - player->sendCustomFormPacket(data, [id{player->getUniqueID()}, engine{EngineScope::currentEngine()}, + player->sendCustomFormPacket(data, [id{player->getOrCreateUniqueID()}, engine{EngineScope::currentEngine()}, callback{script::Global(args[1].asFunction())}](string result) { if (ll::isServerStopping()) return; diff --git a/scripts/LINK.txt b/scripts/LINK.txt index f01f4f4f63..2a223bcf0e 100644 --- a/scripts/LINK.txt +++ b/scripts/LINK.txt @@ -1 +1 @@ -https://minecraft.azureedge.net/bin-win/bedrock-server-1.20.0.01.zip \ No newline at end of file +https://minecraft.azureedge.net/bin-win/bedrock-server-1.20.11.01.zip \ No newline at end of file diff --git a/scripts/install.sh b/scripts/install.sh index e017fd1760..5491219828 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,18 +1,16 @@ #!/bin/bash -lip_version=0.14.0 +lip_version=0.14.2 # Install Lip -wget https://github.com/LiteLDev/Lip/releases/download/v${lip_version}/lip-${lip_version}-linux-amd64.tar.gz -tar -xvf lip-${lip_version}-linux-amd64.tar.gz -chmod +x lip-${lip_version}-linux-amd64/lip +wget https://github.com/LipPkg/Lip/releases/download/v${lip_version}/lip-linux-amd64.tar.gz +mkdir lip +tar -xvf lip-linux-amd64.tar.gz -C lip +chmod +x lip/lip -# Install BDS +# Install LiteLoaderBDS mkdir bedrock_server cd bedrock_server -./../lip-${lip_version}-linux-amd64/lip install -y bds - -# Install LiteLoaderBDS -./../lip-${lip_version}-linux-amd64/lip install ll -WINEDEBUG=-all wine LLPeEditor.exe +./../lip/lip install ll +WINEDEBUG=-all wine PeEditor.exe echo Done!